/[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.126 by heimbach, Thu Dec 8 15:44:33 2005 UTC revision 1.129 by heimbach, Sat Feb 25 16:20:01 2006 UTC
# Line 368  CADJ STORE theta (:,:,k,bi,bj) Line 368  CADJ STORE theta (:,:,k,bi,bj)
368  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
369  CADJ STORE salt  (:,:,k,bi,bj)  CADJ STORE salt  (:,:,k,bi,bj)
370  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
371    CADJ STORE gt(:,:,k,bi,bj)
372    CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
373    CADJ STORE gs(:,:,k,bi,bj)
374    CADJ &     = comlev1_bibj_k, key=kkey, byte=isbyte
375  # ifdef NONLIN_FRSURF  # ifdef NONLIN_FRSURF
376  cph-test  cph-test
377  CADJ STORE  phiHydC (:,:)  CADJ STORE  phiHydC (:,:)
# Line 405  CADJ &     = comlev1_bibj_k, key=kkey, b Line 409  CADJ &     = comlev1_bibj_k, key=kkey, b
409    
410  C--      Integrate hydrostatic balance for phiHyd with BC of  C--      Integrate hydrostatic balance for phiHyd with BC of
411  C        phiHyd(z=0)=0  C        phiHyd(z=0)=0
412           CALL CALC_PHI_HYD(           IF ( implicitIntGravWave ) THEN
413               CALL CALC_PHI_HYD(
414         I        bi,bj,iMin,iMax,jMin,jMax,k,
415         I        gT, gS,
416         U        phiHydF,
417         O        phiHydC, dPhiHydX, dPhiHydY,
418         I        myTime, myIter, myThid )
419             ELSE
420               CALL CALC_PHI_HYD(
421       I        bi,bj,iMin,iMax,jMin,jMax,k,       I        bi,bj,iMin,iMax,jMin,jMax,k,
422       I        theta, salt,       I        theta, salt,
423       U        phiHydF,       U        phiHydF,
424       O        phiHydC, dPhiHydX, dPhiHydY,       O        phiHydC, dPhiHydX, dPhiHydY,
425       I        myTime, myIter, myThid )       I        myTime, myIter, myThid )
426             ENDIF
427    
428  C--      Calculate accelerations in the momentum equations (gU, gV, ...)  C--      Calculate accelerations in the momentum equations (gU, gV, ...)
429  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 550  C---+----1----+----2----+----3----+----4
550    
551  #ifdef ALLOW_NONHYDROSTATIC  #ifdef ALLOW_NONHYDROSTATIC
552  C--   Step forward W field in N-H algorithm  C--   Step forward W field in N-H algorithm
553        IF ( momStepping .AND. nonHydrostatic ) THEN        IF ( nonHydrostatic ) THEN
554  #ifdef ALLOW_DEBUG  #ifdef ALLOW_DEBUG
555           IF ( debugLevel .GE. debLevB )           IF ( debugLevel .GE. debLevB )
556       &     CALL DEBUG_CALL('CALC_GW', myThid )       &     CALL DEBUG_CALL('CALC_GW', myThid )
557  #endif  #endif
558           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)           CALL TIMER_START('CALC_GW          [DYNAMICS]',myThid)
559           CALL CALC_GW( myTime, myIter, myThid )           CALL CALC_GW( myTime, myIter, myThid )
          CALL TIMER_STOP ('CALC_GW          [DYNAMICS]',myThid)  
560        ENDIF        ENDIF
561          IF ( nonHydrostatic.OR.implicitIntGravWave )
562         &   CALL TIMESTEP_WVEL( myTime, myIter, myThid )
563          IF ( nonHydrostatic )
564         &   CALL TIMER_STOP ('CALC_GW          [DYNAMICS]',myThid)
565  #endif  #endif
566    
567  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|  C---+----1----+----2----+----3----+----4----+----5----+----6----+----7-|--+----|
Legend:
Removed from v.1.126  
changed lines
  Added in v.1.129
  ViewVC Help
Powered by ViewVC 1.1.22