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

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

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

revision 1.43 by jmc, Tue Dec 13 21:07:13 2005 UTC revision 1.45 by jmc, Tue Mar 7 15:28:02 2006 UTC
# Line 49  C     gvDissip :: dissipation tendency ( Line 49  C     gvDissip :: dissipation tendency (
49    
50  C     !LOCAL VARIABLES:  C     !LOCAL VARIABLES:
51  C     == Local variables ==  C     == Local variables ==
       LOGICAL momForcing_In_AB  
       LOGICAL momDissip_In_AB  
52        LOGICAL momStartAB        LOGICAL momStartAB
53        INTEGER i,j        INTEGER i,j
54        _RL phxFac,phyFac, psFac        _RL phxFac,phyFac, psFac
# Line 80  C--  factors for gradient (X & Y directi Line 78  C--  factors for gradient (X & Y directi
78        phxFac = pfFacMom        phxFac = pfFacMom
79        phyFac = pfFacMom        phyFac = pfFacMom
80    
 C-- including or excluding momentum forcing from Adams-Bashforth:  
       momForcing_In_AB = forcing_In_AB  
       momForcing_In_AB = .TRUE.  
       momDissip_In_AB  = .TRUE.  
   
81  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
82        externForcDiagIsOn = useDiagnostics .AND. momForcing        externForcDiagIsOn = useDiagnostics .AND. momForcing
83        IF ( externForcDiagIsOn ) THEN        IF ( externForcDiagIsOn ) THEN
# Line 107  C-    Initialize local arrays (not reall Line 100  C-    Initialize local arrays (not reall
100         ENDDO         ENDDO
101        ENDDO        ENDDO
102    
103        IF ( .NOT.staggerTimeStep ) THEN        IF ( .NOT.staggerTimeStep .AND. .NOT. implicitIntGravWave ) THEN
104  C--   Synchronous time step: add grad Phi_Hyp to gU,gV before doing Adams-Bashforth  C--   Synchronous time step: add grad Phi_Hyp to gU,gV before doing Adams-Bashforth
105          DO j=jMin,jMax          DO j=jMin,jMax
106           DO i=iMin,iMax           DO i=iMin,iMax
# Line 132  C--   Dissipation term inside the Adams- Line 125  C--   Dissipation term inside the Adams-
125        ENDIF        ENDIF
126    
127  C--   Forcing term inside the Adams-Bashforth:  C--   Forcing term inside the Adams-Bashforth:
128        IF (momForcing .AND. momForcing_In_AB) THEN        IF ( momForcing .AND. momForcingOutAB.NE.1 ) THEN
129  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
130          IF ( useDiagnostics .AND. externForcDiagIsOn ) THEN          IF ( useDiagnostics .AND. externForcDiagIsOn ) THEN
131           DO j=1,sNy+1           DO j=1,sNy+1
# Line 206  C     and save gU,gV_[n] into guNm1,gvNm Line 199  C     and save gU,gV_[n] into guNm1,gvNm
199                
200  C--   Forcing term outside the Adams-Bashforth:  C--   Forcing term outside the Adams-Bashforth:
201  C     (not recommended with CD-scheme ON)  C     (not recommended with CD-scheme ON)
202        IF (momForcing .AND. .NOT.momForcing_In_AB) THEN        IF ( momForcing .AND. momForcingOutAB.EQ.1 ) THEN
203         IF (useCDscheme) THEN         IF (useCDscheme) THEN
204          DO j=jMin,jMax          DO j=jMin,jMax
205           DO i=iMin,iMax           DO i=iMin,iMax
Legend:
Removed from v.1.43  
changed lines
  Added in v.1.45
  ViewVC Help
Powered by ViewVC 1.1.22