/[MITgcm]/MITgcm_contrib/jscott/code_rafmod/calc_gs.F
ViewVC logotype

Diff of /MITgcm_contrib/jscott/code_rafmod/calc_gs.F

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

revision 1.1 by jscott, Tue Aug 21 16:34:17 2007 UTC revision 1.2 by jscott, Thu Sep 3 20:40:01 2009 UTC
# Line 1  Line 1 
1  C $Header$  C $Header$
2  C $Name$  C $Name$
3    C inserted mods in 1.51 7/10/09
4    
5  #include "PACKAGES_CONFIG.h"  #include "PACKAGES_CONFIG.h"
6  #include "CPP_OPTIONS.h"  #include "CPP_OPTIONS.h"
# Line 49  C     == GLobal variables == Line 50  C     == GLobal variables ==
50  #include "DYNVARS.h"  #include "DYNVARS.h"
51  #include "EEPARAMS.h"  #include "EEPARAMS.h"
52  #include "PARAMS.h"  #include "PARAMS.h"
53    #include "RESTART.h"
54  #ifdef ALLOW_GENERIC_ADVDIFF  #ifdef ALLOW_GENERIC_ADVDIFF
55  #include "GAD.h"  #include "GAD.h"
56  #endif  #endif
# Line 131  C--   the kDown is still required Line 133  C--   the kDown is still required
133        fVerS(1,1,kDown) = fVerS(1,1,kDown)        fVerS(1,1,kDown) = fVerS(1,1,kDown)
134  # ifdef NONLIN_FRSURF  # ifdef NONLIN_FRSURF
135  CADJ STORE fVerS(:,:,:) =  CADJ STORE fVerS(:,:,:) =
136  CADJ &     comlev1_bibj_k, key=kkey, byte=isbyte  CADJ &     comlev1_bibj_k, key=kkey, byte=isbyte,
137  CADJ STORE gsNm1(:,:,k,bi,bj) =  CADJ &     kind = isbyte
138  CADJ &     comlev1_bibj_k, key=kkey, byte=isbyte  CADJ STORE gsNm1(:,:,k,bi,bj) =
139    CADJ &     comlev1_bibj_k, key=kkey, byte=isbyte,
140    CADJ &     kind = isbyte
141  # endif  # endif
142  #endif  #endif
143    
# Line 151  C---+----1----+----2----+----3----+----4 Line 155  C---+----1----+----2----+----3----+----4
155       I           xA, yA, maskUp, uFld, vFld, wFld,       I           xA, yA, maskUp, uFld, vFld, wFld,
156       I           uTrans, vTrans, rTrans, rTransKp1,       I           uTrans, vTrans, rTrans, rTransKp1,
157       I           diffKhS, diffK4S, KappaRS,       I           diffKhS, diffK4S, KappaRS,
158       I           gsNm(1-Olx,1-Oly,1,1,1,m2), salt,       I           gsNm(1-Olx,1-Oly,1,1,1,m2), salt, dTtracerLev,
159       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,
160       I           calcAdvection, saltImplVertAdv, AdamsBashforth_S,       I           calcAdvection, saltImplVertAdv, AdamsBashforth_S,
161         I           useGMRedi, useKPP,
162       U           fVerS, gS,       U           fVerS, gS,
163       I           myTime, myIter, myThid )       I           myTime, myIter, myThid )
164  #else /* ALLOW_ADAMSBASHFORTH_3 */  #else /* ALLOW_ADAMSBASHFORTH_3 */
# Line 162  C---+----1----+----2----+----3----+----4 Line 167  C---+----1----+----2----+----3----+----4
167       I           xA, yA, maskUp, uFld, vFld, wFld,       I           xA, yA, maskUp, uFld, vFld, wFld,
168       I           uTrans, vTrans, rTrans, rTransKp1,       I           uTrans, vTrans, rTrans, rTransKp1,
169       I           diffKh3d_x, diffKh3d_y,       I           diffKh3d_x, diffKh3d_y,
170       I           diffK4S, KappaRS, gsNm1, salt,       I           diffK4S, KappaRS, gsNm1, salt, dTtracerLev,
171       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,       I           GAD_SALINITY, saltAdvScheme, saltVertAdvScheme,
172       I           calcAdvection, saltImplVertAdv, AdamsBashforth_S,       I           calcAdvection, saltImplVertAdv, AdamsBashforth_S,
173         I           useGMRedi, useKPP,
174       U           fVerS, gS,       U           fVerS, gS,
175       I           myTime, myIter, myThid )       I           myTime, myIter, myThid )
176  #endif /* ALLOW_ADAMSBASHFORTH_3 */  #endif /* ALLOW_ADAMSBASHFORTH_3 */
# Line 185  C--   External salinity forcing term(s) Line 191  C--   External salinity forcing term(s)
191          CALL ADAMS_BASHFORTH2(          CALL ADAMS_BASHFORTH2(
192       I                        bi, bj, k,       I                        bi, bj, k,
193       U                        gS, gsNm1,       U                        gS, gsNm1,
194       I                        iterNb, myThid )       I                        saltStartAB, iterNb, myThid )
195  #endif  #endif
196        ENDIF        ENDIF
197    
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
  ViewVC Help
Powered by ViewVC 1.1.22