/[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.61 by jmc, Tue Nov 27 20:20:26 2007 UTC revision 1.63 by jmc, Tue Mar 16 00:16:50 2010 UTC
# Line 537  C- jmc: change it to keep the Coriolis t Line 537  C- jmc: change it to keep the Coriolis t
537    
538        IF (momAdvection) THEN        IF (momAdvection) THEN
539  C--   Horizontal advection of relative (or absolute) vorticity  C--   Horizontal advection of relative (or absolute) vorticity
540         IF (highOrderVorticity.AND.useAbsVorticity) THEN         IF ( (highOrderVorticity.OR.upwindVorticity)
541         &     .AND.useAbsVorticity ) THEN
542          CALL MOM_VI_U_CORIOLIS_C4(bi,bj,k,vFld,omega3,r_hFacZ,          CALL MOM_VI_U_CORIOLIS_C4(bi,bj,k,vFld,omega3,r_hFacZ,
543       &                         uCf,myThid)       &                         uCf,myThid)
544         ELSEIF (highOrderVorticity) THEN         ELSEIF ( (highOrderVorticity.OR.upwindVorticity) ) THEN
545          CALL MOM_VI_U_CORIOLIS_C4(bi,bj,k,vFld,vort3, r_hFacZ,          CALL MOM_VI_U_CORIOLIS_C4(bi,bj,k,vFld,vort3, r_hFacZ,
546       &                         uCf,myThid)       &                         uCf,myThid)
547         ELSEIF (useAbsVorticity) THEN         ELSEIF ( useAbsVorticity ) THEN
548          CALL MOM_VI_U_CORIOLIS(bi,bj,K,vFld,omega3,hFacZ,r_hFacZ,          CALL MOM_VI_U_CORIOLIS(bi,bj,K,vFld,omega3,hFacZ,r_hFacZ,
549       &                         uCf,myThid)       &                         uCf,myThid)
550         ELSE         ELSE
# Line 555  C--   Horizontal advection of relative ( Line 556  C--   Horizontal advection of relative (
556           gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)+uCf(i,j)           gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)+uCf(i,j)
557          ENDDO          ENDDO
558         ENDDO         ENDDO
559         IF (highOrderVorticity.AND.useAbsVorticity) THEN         IF ( (highOrderVorticity.OR.upwindVorticity)
560         &     .AND.useAbsVorticity ) THEN
561          CALL MOM_VI_V_CORIOLIS_C4(bi,bj,K,uFld,omega3,r_hFacZ,          CALL MOM_VI_V_CORIOLIS_C4(bi,bj,K,uFld,omega3,r_hFacZ,
562       &                         vCf,myThid)       &                         vCf,myThid)
563         ELSEIF (highOrderVorticity) THEN         ELSEIF ( (highOrderVorticity.OR.upwindVorticity) ) THEN
564          CALL MOM_VI_V_CORIOLIS_C4(bi,bj,K,uFld,vort3, r_hFacZ,          CALL MOM_VI_V_CORIOLIS_C4(bi,bj,K,uFld,vort3, r_hFacZ,
565       &                         vCf,myThid)       &                         vCf,myThid)
566         ELSEIF (useAbsVorticity) THEN         ELSEIF ( useAbsVorticity ) THEN
567          CALL MOM_VI_V_CORIOLIS(bi,bj,K,uFld,omega3,hFacZ,r_hFacZ,          CALL MOM_VI_V_CORIOLIS(bi,bj,K,uFld,omega3,hFacZ,r_hFacZ,
568       &                         vCf,myThid)       &                         vCf,myThid)
569         ELSE         ELSE
# Line 657  C--   Bernoulli term Line 659  C--   Bernoulli term
659  C--   end if momAdvection  C--   end if momAdvection
660        ENDIF        ENDIF
661    
662  C--   3.D Coriolis term (horizontal momentum, Eastward component: -f'*w)  C--   3.D Coriolis term (horizontal momentum, Eastward component: -fprime*w)
663        IF ( use3dCoriolis ) THEN        IF ( use3dCoriolis ) THEN
664          CALL MOM_U_CORIOLIS_NH(bi,bj,k,wVel,uCf,myThid)          CALL MOM_U_CORIOLIS_NH(bi,bj,k,wVel,uCf,myThid)
665          DO j=jMin,jMax          DO j=jMin,jMax
Legend:
Removed from v.1.61  
changed lines
  Added in v.1.63
  ViewVC Help
Powered by ViewVC 1.1.22