/[MITgcm]/MITgcm/model/src/solve_for_pressure.F
ViewVC logotype

Diff of /MITgcm/model/src/solve_for_pressure.F

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.55 by ce107, Tue May 9 16:07:52 2006 UTC revision 1.56 by heimbach, Wed Jun 7 01:55:13 2006 UTC
# Line 283  C     see CG2D.h for the interface to th Line 283  C     see CG2D.h for the interface to th
283        lastResidual=0.        lastResidual=0.
284        numIters=cg2dMaxIters        numIters=cg2dMaxIters
285  c     CALL TIMER_START('CG2D   [SOLVE_FOR_PRESSURE]',myThid)  c     CALL TIMER_START('CG2D   [SOLVE_FOR_PRESSURE]',myThid)
286    #ifdef ALLOW_CG2D_NSA
287    C--   Call the not-self-adjoint version of cg2d
288          CALL CG2D_NSA(
289         U           cg2d_b,
290         U           cg2d_x,
291         O           firstResidual,
292         O           lastResidual,
293         U           numIters,
294         I           myThid )
295    #else /* not ALLOW_CG2D_NSA = default */
296        CALL CG2D(        CALL CG2D(
297       U           cg2d_b,       U           cg2d_b,
298       U           cg2d_x,       U           cg2d_x,
# Line 290  c     CALL TIMER_START('CG2D   [SOLVE_FO Line 300  c     CALL TIMER_START('CG2D   [SOLVE_FO
300       O           lastResidual,       O           lastResidual,
301       U           numIters,       U           numIters,
302       I           myThid )       I           myThid )
303    #endif /* ALLOW_CG2D_NSA */
304        _EXCH_XY_R8(cg2d_x, myThid )        _EXCH_XY_R8(cg2d_x, myThid )
305  c     CALL TIMER_STOP ('CG2D   [SOLVE_FOR_PRESSURE]',myThid)  c     CALL TIMER_STOP ('CG2D   [SOLVE_FOR_PRESSURE]',myThid)
306    
# Line 391  C-       Other than Z coordinate: no ass Line 402  C-       Other than Z coordinate: no ass
402           DO j=1,sNy           DO j=1,sNy
403            DO i=1,sNx            DO i=1,sNx
404              cg3d_b(i,j,k,bi,bj) = cg3d_b(i,j,k,bi,bj)              cg3d_b(i,j,k,bi,bj) = cg3d_b(i,j,k,bi,bj)
405       &       +drF(K)*dyG(i+1,j,bi,bj)*hFacW(i+1,j,k,bi,bj)*uf(i+1,j)       &       +drF(K)*dyG(i+1,j,bi,bj)*_hFacW(i+1,j,k,bi,bj)*uf(i+1,j)
406       &       -drF(K)*dyG( i ,j,bi,bj)*hFacW( i ,j,k,bi,bj)*uf( i ,j)       &       -drF(K)*dyG( i ,j,bi,bj)*_hFacW( i ,j,k,bi,bj)*uf( i ,j)
407       &       +drF(K)*dxG(i,j+1,bi,bj)*hFacS(i,j+1,k,bi,bj)*vf(i,j+1)       &       +drF(K)*dxG(i,j+1,bi,bj)*_hFacS(i,j+1,k,bi,bj)*vf(i,j+1)
408       &       -drF(K)*dxG(i, j ,bi,bj)*hFacS(i, j ,k,bi,bj)*vf(i, j )       &       -drF(K)*dxG(i, j ,bi,bj)*_hFacS(i, j ,k,bi,bj)*vf(i, j )
409       &       +( tmpFac*etaN(i,j,bi,bj)/deltaTfreesurf       &       +( tmpFac*etaN(i,j,bi,bj)/deltaTfreesurf
410       &         -wVel(i,j,kp1,bi,bj)*maskKp1       &         -wVel(i,j,kp1,bi,bj)*maskKp1
411       &        )*_rA(i,j,bi,bj)/deltaTmom       &        )*_rA(i,j,bi,bj)/deltaTmom
# Line 407  C-       Other than Z coordinate: no ass Line 418  C-       Other than Z coordinate: no ass
418            DO j=1,sNy            DO j=1,sNy
419             DO i=1,sNx             DO i=1,sNx
420              cg3d_b(i,j,k,bi,bj) = cg3d_b(i,j,k,bi,bj)              cg3d_b(i,j,k,bi,bj) = cg3d_b(i,j,k,bi,bj)
421       &       +drF(K)*dyG(i+1,j,bi,bj)*hFacW(i+1,j,k,bi,bj)*uf(i+1,j)       &       +drF(K)*dyG(i+1,j,bi,bj)*_hFacW(i+1,j,k,bi,bj)*uf(i+1,j)
422       &       -drF(K)*dyG( i ,j,bi,bj)*hFacW( i ,j,k,bi,bj)*uf( i ,j)       &       -drF(K)*dyG( i ,j,bi,bj)*_hFacW( i ,j,k,bi,bj)*uf( i ,j)
423       &       +drF(K)*dxG(i,j+1,bi,bj)*hFacS(i,j+1,k,bi,bj)*vf(i,j+1)       &       +drF(K)*dxG(i,j+1,bi,bj)*_hFacS(i,j+1,k,bi,bj)*vf(i,j+1)
424       &       -drF(K)*dxG(i, j ,bi,bj)*hFacS(i, j ,k,bi,bj)*vf(i, j )       &       -drF(K)*dxG(i, j ,bi,bj)*_hFacS(i, j ,k,bi,bj)*vf(i, j )
425       &       +( wVel(i,j,k  ,bi,bj)*maskC(i,j,k-1,bi,bj)       &       +( wVel(i,j,k  ,bi,bj)*maskC(i,j,k-1,bi,bj)
426       &         -wVel(i,j,kp1,bi,bj)*maskKp1       &         -wVel(i,j,kp1,bi,bj)*maskKp1
427       &        )*_rA(i,j,bi,bj)/deltaTmom       &        )*_rA(i,j,bi,bj)/deltaTmom
Legend:
Removed from v.1.55  
changed lines
  Added in v.1.56
  ViewVC Help
Powered by ViewVC 1.1.22