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

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

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

revision 1.43 by jmc, Sun Feb 26 01:57:24 2006 UTC revision 1.46 by jmc, Tue Mar 7 15:28:02 2006 UTC
# Line 114  C--   only the kUp part of fverS is set Line 114  C--   only the kUp part of fverS is set
114  C--   the kDown is still required  C--   the kDown is still required
115        fVerS(1,1,kDown) = fVerS(1,1,kDown)        fVerS(1,1,kDown) = fVerS(1,1,kDown)
116  # ifdef NONLIN_FRSURF  # ifdef NONLIN_FRSURF
117  CADJ STORE fVerS(:,:,:) = comlev1_bibj_k, key=kkey, byte=isbyte  CADJ STORE fVerS(:,:,:) =
118    CADJ &     comlev1_bibj_k, key=kkey, byte=isbyte
119    CADJ STORE gsNm1(:,:,k,bi,bj) =
120    CADJ &     comlev1_bibj_k, key=kkey, byte=isbyte
121  # endif  # endif
122  #endif  #endif
123    
# Line 125  C---+----1----+----2----+----3----+----4 Line 128  C---+----1----+----2----+----3----+----4
128        IF (staggerTimeStep) iterNb = myIter - 1        IF (staggerTimeStep) iterNb = myIter - 1
129    
130  #ifdef ALLOW_ADAMSBASHFORTH_3  #ifdef ALLOW_ADAMSBASHFORTH_3
       IF ( AdamsBashforth_S ) THEN  
131          m1 = 1 + MOD(iterNb+1,2)          m1 = 1 + MOD(iterNb+1,2)
132          m2 = 1 + MOD( iterNb ,2)          m2 = 1 + MOD( iterNb ,2)
133          CALL GAD_CALC_RHS(          CALL GAD_CALC_RHS(
# Line 135  C---+----1----+----2----+----3----+----4 Line 137  C---+----1----+----2----+----3----+----4
137       I           diffKhS, diffK4S, KappaRS,       I           diffKhS, diffK4S, KappaRS,
138       I           gsNm(1-Olx,1-Oly,1,1,1,m2), salt,       I           gsNm(1-Olx,1-Oly,1,1,1,m2), salt,
139       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,
140       I           calcAdvection, saltImplVertAdv,       I           calcAdvection, saltImplVertAdv, AdamsBashforth_S,
141       U           fVerS, gS,       U           fVerS, gS,
142       I           myTime, myIter, myThid )       I           myTime, myIter, myThid )
       ELSE  
         CALL GAD_CALC_RHS(  
      I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,  
      I           xA,yA,uTrans,vTrans,rTrans,rTransKp1,maskUp,  
      I           uVel, vVel, wVel,  
      I           diffKhS, diffK4S, KappaRS, salt, salt,  
      I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,  
      I           calcAdvection, saltImplVertAdv,  
      U           fVerS, gS,  
      I           myTime, myIter, myThid )  
       ENDIF  
143  #else /* ALLOW_ADAMSBASHFORTH_3 */  #else /* ALLOW_ADAMSBASHFORTH_3 */
144          CALL GAD_CALC_RHS(          CALL GAD_CALC_RHS(
145       I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,       I           bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown,
# Line 156  C---+----1----+----2----+----3----+----4 Line 147  C---+----1----+----2----+----3----+----4
147       I           uVel, vVel, wVel,       I           uVel, vVel, wVel,
148       I           diffKhS, diffK4S, KappaRS, gsNm1, salt,       I           diffKhS, diffK4S, KappaRS, gsNm1, salt,
149       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,
150       I           calcAdvection, saltImplVertAdv,       I           calcAdvection, saltImplVertAdv, AdamsBashforth_S,
151       U           fVerS, gS,       U           fVerS, gS,
152       I           myTime, myIter, myThid )       I           myTime, myIter, myThid )
153  #endif /* ALLOW_ADAMSBASHFORTH_3 */  #endif /* ALLOW_ADAMSBASHFORTH_3 */
154    
155  C--   External salinity forcing term(s) inside Adams-Bashforth:  C--   External salinity forcing term(s) inside Adams-Bashforth:
156        IF ( saltForcing .AND. forcing_In_AB )        IF ( saltForcing .AND. tracForcingOutAB.NE.1 )
157       & CALL EXTERNAL_FORCING_S(       & CALL EXTERNAL_FORCING_S(
158       I     iMin,iMax,jMin,jMax,bi,bj,k,       I     iMin,iMax,jMin,jMax,bi,bj,k,
159       I     myTime,myThid)       I     myTime,myThid)
# Line 182  C--   External salinity forcing term(s) Line 173  C--   External salinity forcing term(s)
173        ENDIF        ENDIF
174    
175  C--   External salinity forcing term(s) outside Adams-Bashforth:  C--   External salinity forcing term(s) outside Adams-Bashforth:
176        IF ( saltForcing .AND. .NOT.forcing_In_AB )        IF ( saltForcing .AND. tracForcingOutAB.EQ.1 )
177       & CALL EXTERNAL_FORCING_S(       & CALL EXTERNAL_FORCING_S(
178       I     iMin,iMax,jMin,jMax,bi,bj,k,       I     iMin,iMax,jMin,jMax,bi,bj,k,
179       I     myTime,myThid)       I     myTime,myThid)
Legend:
Removed from v.1.43  
changed lines
  Added in v.1.46
  ViewVC Help
Powered by ViewVC 1.1.22