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

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

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

revision 1.127 by jmc, Thu Dec 15 21:09:00 2005 UTC revision 1.128 by jmc, Thu Feb 23 20:55:48 2006 UTC
# Line 405  CADJ &     = comlev1_bibj_k, key=kkey, b Line 405  CADJ &     = comlev1_bibj_k, key=kkey, b
405    
406  C--      Integrate hydrostatic balance for phiHyd with BC of  C--      Integrate hydrostatic balance for phiHyd with BC of
407  C        phiHyd(z=0)=0  C        phiHyd(z=0)=0
408           CALL CALC_PHI_HYD(           IF ( implicitIntGravWave ) THEN
409               CALL CALC_PHI_HYD(
410         I        bi,bj,iMin,iMax,jMin,jMax,k,
411         I        gT, gS,
412         U        phiHydF,
413         O        phiHydC, dPhiHydX, dPhiHydY,
414         I        myTime, myIter, myThid )
415             ELSE
416               CALL CALC_PHI_HYD(
417       I        bi,bj,iMin,iMax,jMin,jMax,k,       I        bi,bj,iMin,iMax,jMin,jMax,k,
418       I        theta, salt,       I        theta, salt,
419       U        phiHydF,       U        phiHydF,
420       O        phiHydC, dPhiHydX, dPhiHydY,       O        phiHydC, dPhiHydX, dPhiHydY,
421       I        myTime, myIter, myThid )       I        myTime, myIter, myThid )
422             ENDIF
423    
424  C--      Calculate accelerations in the momentum equations (gU, gV, ...)  C--      Calculate accelerations in the momentum equations (gU, gV, ...)
425  C        and step forward storing the result in gU, gV, etc...  C        and step forward storing the result in gU, gV, etc...
# Line 537  C---+----1----+----2----+----3----+----4 Line 546  C---+----1----+----2----+----3----+----4
546    
547  #ifdef ALLOW_NONHYDROSTATIC  #ifdef ALLOW_NONHYDROSTATIC
548  C--   Step forward W field in N-H algorithm  C--   Step forward W field in N-H algorithm
549        IF ( momStepping .AND. nonHydrostatic ) THEN        IF ( nonHydrostatic ) THEN
550  #ifdef ALLOW_DEBUG  #ifdef ALLOW_DEBUG
551           IF ( debugLevel .GE. debLevB )           IF ( debugLevel .GE. debLevB )
552       &     CALL DEBUG_CALL('CALC_GW', myThid )       &     CALL DEBUG_CALL('CALC_GW', myThid )
553  #endif  #endif
554           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)
555           CALL CALC_GW( myTime, myIter, myThid )           CALL CALC_GW( myTime, myIter, myThid )
          CALL TIMESTEP_WVEL( myTime, myIter, myThid )  
          CALL TIMER_STOP ('CALC_GW          [DYNAMICS]',myThid)  
556        ENDIF        ENDIF
557          IF ( nonHydrostatic.OR.implicitIntGravWave )
558         &   CALL TIMESTEP_WVEL( myTime, myIter, myThid )
559          IF ( nonHydrostatic )
560         &   CALL TIMER_STOP ('CALC_GW          [DYNAMICS]',myThid)
561  #endif  #endif
562    
563  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
Legend:
Removed from v.1.127  
changed lines
  Added in v.1.128
  ViewVC Help
Powered by ViewVC 1.1.22