78 |
|
|
79 |
CEOP |
CEOP |
80 |
|
|
81 |
|
C === Local variables === |
82 |
|
LOGICAL calcAdvection |
83 |
|
|
84 |
#ifdef ALLOW_AUTODIFF_TAMC |
#ifdef ALLOW_AUTODIFF_TAMC |
85 |
C-- only the kUp part of fverS is set in this subroutine |
C-- only the kUp part of fverS is set in this subroutine |
86 |
C-- the kDown is still required |
C-- the kDown is still required |
87 |
fVerS(1,1,kDown) = fVerS(1,1,kDown) |
fVerS(1,1,kDown) = fVerS(1,1,kDown) |
88 |
#endif |
#endif |
89 |
|
|
90 |
|
calcAdvection = saltAdvection .AND. .NOT.saltMultiDimAdvec |
91 |
CALL GAD_CALC_RHS( |
CALL GAD_CALC_RHS( |
92 |
I bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown, |
I bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown, |
93 |
I xA,yA,uTrans,vTrans,rTrans,maskUp, |
I xA,yA,uTrans,vTrans,rTrans,maskUp, |
94 |
I diffKhS, diffK4S, KappaRS, Salt, |
I diffKhS, diffK4S, KappaRS, Salt, |
95 |
I GAD_SALINITY, saltAdvScheme, |
I GAD_SALINITY, saltAdvScheme, calcAdvection, |
96 |
U fVerS, gS, |
U fVerS, gS, |
97 |
I myThid ) |
I myThid ) |
98 |
|
|
99 |
C-- External forcing term(s) |
C-- External salinity forcing term(s) inside Adams-Bashforth: |
100 |
CALL EXTERNAL_FORCING_S( |
IF ( saltForcing .AND. forcing_In_AB ) |
101 |
|
& CALL EXTERNAL_FORCING_S( |
102 |
I iMin,iMax,jMin,jMax,bi,bj,k, |
I iMin,iMax,jMin,jMax,bi,bj,k, |
103 |
I myTime,myThid) |
I myTime,myThid) |
104 |
|
|
105 |
IF ( saltAdvScheme.EQ.ENUM_CENTERED_2ND |
IF ( saltAdamsBashforth ) THEN |
|
& .OR.saltAdvScheme.EQ.ENUM_UPWIND_3RD |
|
|
& .OR.saltAdvScheme.EQ.ENUM_CENTERED_4TH ) THEN |
|
106 |
CALL ADAMS_BASHFORTH2( |
CALL ADAMS_BASHFORTH2( |
107 |
I bi, bj, K, |
I bi, bj, K, |
108 |
U gS, gSnm1, |
U gS, gSnm1, |
109 |
I myIter, myThid ) |
I myIter, myThid ) |
110 |
ENDIF |
ENDIF |
111 |
|
|
112 |
|
C-- External salinity forcing term(s) outside Adams-Bashforth: |
113 |
|
IF ( saltForcing .AND. .NOT.forcing_In_AB ) |
114 |
|
& CALL EXTERNAL_FORCING_S( |
115 |
|
I iMin,iMax,jMin,jMax,bi,bj,k, |
116 |
|
I myTime,myThid) |
117 |
|
|
118 |
#ifdef NONLIN_FRSURF |
#ifdef NONLIN_FRSURF |
119 |
IF (nonlinFreeSurf.GT.0) THEN |
IF (nonlinFreeSurf.GT.0) THEN |
120 |
CALL FREESURF_RESCALE_G( |
CALL FREESURF_RESCALE_G( |