--- MITgcm/model/src/calc_gs.F 2006/02/26 01:57:24 1.43 +++ MITgcm/model/src/calc_gs.F 2006/03/01 03:08:50 1.44 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/Attic/calc_gs.F,v 1.43 2006/02/26 01:57:24 jmc Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/src/Attic/calc_gs.F,v 1.44 2006/03/01 03:08:50 jmc Exp $ C $Name: $ #include "PACKAGES_CONFIG.h" @@ -125,7 +125,6 @@ IF (staggerTimeStep) iterNb = myIter - 1 #ifdef ALLOW_ADAMSBASHFORTH_3 - IF ( AdamsBashforth_S ) THEN m1 = 1 + MOD(iterNb+1,2) m2 = 1 + MOD( iterNb ,2) CALL GAD_CALC_RHS( @@ -135,20 +134,9 @@ I diffKhS, diffK4S, KappaRS, I gsNm(1-Olx,1-Oly,1,1,1,m2), salt, I GAD_SALINITY, saltAdvScheme, saltVertAdvScheme, - I calcAdvection, saltImplVertAdv, + I calcAdvection, saltImplVertAdv, AdamsBashforth_S, U fVerS, gS, 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 #else /* ALLOW_ADAMSBASHFORTH_3 */ CALL GAD_CALC_RHS( I bi,bj,iMin,iMax,jMin,jMax,k,kM1,kUp,kDown, @@ -156,7 +144,7 @@ I uVel, vVel, wVel, I diffKhS, diffK4S, KappaRS, gsNm1, salt, I GAD_SALINITY, saltAdvScheme, saltVertAdvScheme, - I calcAdvection, saltImplVertAdv, + I calcAdvection, saltImplVertAdv, AdamsBashforth_S, U fVerS, gS, I myTime, myIter, myThid ) #endif /* ALLOW_ADAMSBASHFORTH_3 */