125 |
IF (staggerTimeStep) iterNb = myIter - 1 |
IF (staggerTimeStep) iterNb = myIter - 1 |
126 |
|
|
127 |
#ifdef ALLOW_ADAMSBASHFORTH_3 |
#ifdef ALLOW_ADAMSBASHFORTH_3 |
|
IF ( AdamsBashforth_S ) THEN |
|
128 |
m1 = 1 + MOD(iterNb+1,2) |
m1 = 1 + MOD(iterNb+1,2) |
129 |
m2 = 1 + MOD( iterNb ,2) |
m2 = 1 + MOD( iterNb ,2) |
130 |
CALL GAD_CALC_RHS( |
CALL GAD_CALC_RHS( |
134 |
I diffKhS, diffK4S, KappaRS, |
I diffKhS, diffK4S, KappaRS, |
135 |
I gsNm(1-Olx,1-Oly,1,1,1,m2), salt, |
I gsNm(1-Olx,1-Oly,1,1,1,m2), salt, |
136 |
I GAD_SALINITY, saltAdvScheme, saltVertAdvScheme, |
I GAD_SALINITY, saltAdvScheme, saltVertAdvScheme, |
137 |
I calcAdvection, saltImplVertAdv, |
I calcAdvection, saltImplVertAdv, AdamsBashforth_S, |
138 |
U fVerS, gS, |
U fVerS, gS, |
139 |
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 |
|
140 |
#else /* ALLOW_ADAMSBASHFORTH_3 */ |
#else /* ALLOW_ADAMSBASHFORTH_3 */ |
141 |
CALL GAD_CALC_RHS( |
CALL GAD_CALC_RHS( |
142 |
I bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown, |
I bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown, |
144 |
I uVel, vVel, wVel, |
I uVel, vVel, wVel, |
145 |
I diffKhS, diffK4S, KappaRS, gsNm1, salt, |
I diffKhS, diffK4S, KappaRS, gsNm1, salt, |
146 |
I GAD_SALINITY, saltAdvScheme, saltVertAdvScheme, |
I GAD_SALINITY, saltAdvScheme, saltVertAdvScheme, |
147 |
I calcAdvection, saltImplVertAdv, |
I calcAdvection, saltImplVertAdv, AdamsBashforth_S, |
148 |
U fVerS, gS, |
U fVerS, gS, |
149 |
I myTime, myIter, myThid ) |
I myTime, myIter, myThid ) |
150 |
#endif /* ALLOW_ADAMSBASHFORTH_3 */ |
#endif /* ALLOW_ADAMSBASHFORTH_3 */ |