/[MITgcm]/MITgcm/pkg/mom_vecinv/mom_vecinv.F
ViewVC logotype

Diff of /MITgcm/pkg/mom_vecinv/mom_vecinv.F

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

revision 1.32 by dimitri, Sat Dec 4 05:59:50 2004 UTC revision 1.38 by jmc, Sun May 15 03:04:56 2005 UTC
# Line 114  C--   (at least in part) Line 114  C--   (at least in part)
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
121          IF ((bi .EQ. 1).AND.(bj .EQ. 1).AND.(k .EQ. 1)) THEN          IF ((bi .EQ. 1).AND.(bj .EQ. 1).AND.(k .EQ. 1)) THEN
122            CALL MNC_CW_SET_UDIM('mom_vi', -1, myThid)            CALL MNC_CW_SET_UDIM('mom_vi', -1, myThid)
123            CALL MNC_CW_I_W_S('I','mom_vi',0,0,'iter',myIter,myThid)            CALL MNC_CW_I_W_S('I','mom_vi',0,0,'T',myIter,myThid)
124            CALL MNC_CW_SET_UDIM('mom_vi', 0, myThid)            CALL MNC_CW_SET_UDIM('mom_vi', 0, myThid)
125          ENDIF          ENDIF
126          DO i = 1,9          DO i = 1,9
# Line 210  C      Calculate del^2 u and del^2 v for Line 209  C      Calculate del^2 u and del^2 v for
209       &     .OR. viscA4D.NE.0. .OR. viscA4Z.NE.0.       &     .OR. viscA4D.NE.0. .OR. viscA4Z.NE.0.
210       &     .OR. viscA4Grid.NE.0.       &     .OR. viscA4Grid.NE.0.
211       &     .OR. viscC4leith.NE.0.       &     .OR. viscC4leith.NE.0.
212         &     .OR. viscC4leithD.NE.0.
213       &    ) THEN       &    ) THEN
214           CALL MOM_VI_DEL2UV(bi,bj,k,hDiv,vort3,hFacZ,           CALL MOM_VI_DEL2UV(bi,bj,k,hDiv,vort3,hFacZ,
215       O                      del2u,del2v,       O                      del2u,del2v,
# Line 224  C      in terms of vorticity and diverge Line 224  C      in terms of vorticity and diverge
224       &    .OR. viscA4D.NE.0. .OR. viscA4Z.NE.0.       &    .OR. viscA4D.NE.0. .OR. viscA4Z.NE.0.
225       &    .OR. viscAhGrid.NE.0. .OR. viscA4Grid.NE.0.       &    .OR. viscAhGrid.NE.0. .OR. viscA4Grid.NE.0.
226       &    .OR. viscC2leith.NE.0. .OR. viscC4leith.NE.0.       &    .OR. viscC2leith.NE.0. .OR. viscC4leith.NE.0.
227         &    .OR. viscC2leithD.NE.0. .OR. viscC4leithD.NE.0.
228       &    ) THEN       &    ) THEN
229           CALL MOM_VI_HDISSIP(bi,bj,k,hDiv,vort3,hFacZ,dStar,zStar,           CALL MOM_VI_HDISSIP(bi,bj,k,hDiv,vort3,hFacZ,dStar,zStar,
230       O                       guDiss,gvDiss,       O                       guDiss,gvDiss,
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)
# Line 367  c      ENDDO Line 369  c      ENDDO
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)
Legend:
Removed from v.1.32  
changed lines
  Added in v.1.38
  ViewVC Help
Powered by ViewVC 1.1.22