114 |
fVerV(1,1,kUp) = fVerV(1,1,kUp) |
fVerV(1,1,kUp) = fVerV(1,1,kUp) |
115 |
#endif |
#endif |
116 |
|
|
117 |
writeDiag = DIFFERENT_MULTIPLE(diagFreq, myTime, |
writeDiag = DIFFERENT_MULTIPLE(diagFreq, myTime, deltaTClock) |
|
& myTime-deltaTClock) |
|
118 |
|
|
119 |
#ifdef ALLOW_MNC |
#ifdef ALLOW_MNC |
120 |
IF (useMNC .AND. snapshot_mnc .AND. writeDiag) THEN |
IF (useMNC .AND. snapshot_mnc .AND. writeDiag) THEN |
231 |
& myThid) |
& myThid) |
232 |
ENDIF |
ENDIF |
233 |
C or in terms of tension and strain |
C or in terms of tension and strain |
234 |
IF (viscAstrain.NE.0. .OR. viscAtension.NE.0.) THEN |
IF (viscAstrain.NE.0. .OR. viscAtension.NE.0. |
235 |
|
O .OR. viscC2smag.ne.0) THEN |
236 |
CALL MOM_CALC_TENSION(bi,bj,k,uFld,vFld, |
CALL MOM_CALC_TENSION(bi,bj,k,uFld,vFld, |
237 |
O tension, |
O tension, |
238 |
I myThid) |
I myThid) |
369 |
c ENDIF |
c ENDIF |
370 |
|
|
371 |
C-- Horizontal Coriolis terms |
C-- Horizontal Coriolis terms |
372 |
IF (useCoriolis .AND. .NOT.useCDscheme |
c IF (useCoriolis .AND. .NOT.useCDscheme |
373 |
& .AND. .NOT. useAbsVorticity) THEN |
c & .AND. .NOT. useAbsVorticity) THEN |
374 |
CALL MOM_VI_CORIOLIS(bi,bj,k,uFld,vFld,hFacZ,r_hFacZ, |
C- jmc: change it to keep the Coriolis terms when useAbsVorticity=T & momAdvection=F |
375 |
& uCf,vCf,myThid) |
IF ( useCoriolis .AND. |
376 |
|
& .NOT.( useCDscheme .OR. useAbsVorticity.AND.momAdvection ) |
377 |
|
& ) THEN |
378 |
|
IF (useAbsVorticity) THEN |
379 |
|
CALL MOM_VI_U_CORIOLIS(bi,bj,K,vFld,omega3,hFacZ,r_hFacZ, |
380 |
|
& uCf,myThid) |
381 |
|
CALL MOM_VI_V_CORIOLIS(bi,bj,K,uFld,omega3,hFacZ,r_hFacZ, |
382 |
|
& vCf,myThid) |
383 |
|
ELSE |
384 |
|
CALL MOM_VI_CORIOLIS(bi,bj,k,uFld,vFld,hFacZ,r_hFacZ, |
385 |
|
& uCf,vCf,myThid) |
386 |
|
ENDIF |
387 |
DO j=jMin,jMax |
DO j=jMin,jMax |
388 |
DO i=iMin,iMax |
DO i=iMin,iMax |
389 |
gU(i,j,k,bi,bj) = uCf(i,j) - phxFac*dPhiHydX(i,j) |
gU(i,j,k,bi,bj) = uCf(i,j) - phxFac*dPhiHydX(i,j) |