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

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

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

revision 1.2 by adcroft, Tue May 29 14:01:39 2001 UTC revision 1.3 by heimbach, Wed Sep 5 17:46:03 2001 UTC
# Line 47  c        vort3u=0.5*(omega3(i,j)+omega3( Line 47  c        vort3u=0.5*(omega3(i,j)+omega3(
47           vort3u=0.5*(omega3(i,j)*r_hFacZ(i,j)           vort3u=0.5*(omega3(i,j)*r_hFacZ(i,j)
48       &              +omega3(i,j+1)*r_hFacZ(i,j+1))       &              +omega3(i,j+1)*r_hFacZ(i,j+1))
49           uCoriolisTerm(i,j)=           uCoriolisTerm(i,j)=
 C high order vorticity advection term  
 c    &   +vort3u*vBarXY*recip_dxc(i,j,bi,bj)  
 C linear Coriolis term (enstrophy conserving)  
50       &   +0.5*(fCoriG(i,j,bi,bj)*r_hFacZ(i,j)       &   +0.5*(fCoriG(i,j,bi,bj)*r_hFacZ(i,j)
51       &        +fCoriG(i,j+1,bi,bj)*r_hFacZ(i,j+1))*vBarXY       &        +fCoriG(i,j+1,bi,bj)*r_hFacZ(i,j+1))*vBarXY
52       *        *recip_dxc(i,j,bi,bj)       *        *recip_dxc(i,j,bi,bj)
53         &   *_maskW(I,J,K,bi,bj)
54    cph *note* put these comments after end of continued line
55    cph        to ensure TAMC compatibility
56    C high order vorticity advection term
57    c    &   +vort3u*vBarXY*recip_dxc(i,j,bi,bj)
58    C linear Coriolis term (enstrophy conserving)
59    c    &   ...
60  C full nonlinear Coriolis term  C full nonlinear Coriolis term
61  c    &   +0.5*(omega3(i,j)+omega3(i,j+1))*vBarXY  c    &   +0.5*(omega3(i,j)+omega3(i,j+1))*vBarXY
62  C correct energy conserving form of Coriolis term  C correct energy conserving form of Coriolis term
# Line 60  c    &   +0.25*( fCori( i ,j,bi,bj)*(vFl Line 64  c    &   +0.25*( fCori( i ,j,bi,bj)*(vFl
64  c    &           fCori(i-1,j,bi,bj)*(vFld(i-1,j)+vFld(i-1,j+1)) )  c    &           fCori(i-1,j,bi,bj)*(vFld(i-1,j)+vFld(i-1,j+1)) )
65  C original form of Coriolis term (copied from calc_mom_rhs)  C original form of Coriolis term (copied from calc_mom_rhs)
66  c    &   +0.5*(fCori(i,j,bi,bj)+fCori(i-1,j,bi,bj))*vBarXY  c    &   +0.5*(fCori(i,j,bi,bj)+fCori(i-1,j,bi,bj))*vBarXY
      &   *_maskW(I,J,K,bi,bj)  
67          ENDDO          ENDDO
68         ENDDO         ENDDO
69    
# Line 77  c        vort3v=0.5*(omega3(i,j)+omega3( Line 80  c        vort3v=0.5*(omega3(i,j)+omega3(
80           vort3v=0.5*(omega3(i,j)*r_hFacZ(i,j)           vort3v=0.5*(omega3(i,j)*r_hFacZ(i,j)
81       &              +omega3(i+1,j)*r_hFacZ(i+1,j))       &              +omega3(i+1,j)*r_hFacZ(i+1,j))
82           vCoriolisTerm(i,j)=           vCoriolisTerm(i,j)=
 C high order vorticity advection term  
 c    &   -vort3v*uBarXY*recip_dyc(i,j,bi,bj)  
 C linear Coriolis term (enstrophy conserving)  
83       &   -0.5 *(fCoriG(i,j,bi,bj)*r_hFacZ(i,j)       &   -0.5 *(fCoriG(i,j,bi,bj)*r_hFacZ(i,j)
84       &         +fCoriG(i+1,j,bi,bj)*r_hFacZ(i+1,j))*uBarXY       &         +fCoriG(i+1,j,bi,bj)*r_hFacZ(i+1,j))*uBarXY
85       &         *recip_dyc(i,j,bi,bj)       &         *recip_dyc(i,j,bi,bj)
86         &   *_maskS(I,J,K,bi,bj)
87    cph *note* put these comments after end of continued line
88    cph        to ensure TAMC compatibility
89    C high order vorticity advection term
90    c    &   -vort3v*uBarXY*recip_dyc(i,j,bi,bj)
91    C linear Coriolis term (enstrophy conserving)
92    c    &   ...
93  C full nonlinear Coriolis term  C full nonlinear Coriolis term
94  c    &   -0.5*(omega3(i,j)+omega3(i+1,j))*uBarXY  c    &   -0.5*(omega3(i,j)+omega3(i+1,j))*uBarXY
95  C correct energy conserving form of Coriolis term  C correct energy conserving form of Coriolis term
# Line 90  c    &   -0.25*( fCori(i,j  ,bi,bj)*(uFl Line 97  c    &   -0.25*( fCori(i,j  ,bi,bj)*(uFl
97  c    &           fCori(i,j-1,bi,bj)*(uFld(i,j-1)+uFld(i+1,j)) )  c    &           fCori(i,j-1,bi,bj)*(uFld(i,j-1)+uFld(i+1,j)) )
98  C original form of Coriolis term (copied from calc_mom_rhs)  C original form of Coriolis term (copied from calc_mom_rhs)
99  c    &   -0.5*(fCori(i,j,bi,bj)+fCori(i,j-1,bi,bj))*uBarXY  c    &   -0.5*(fCori(i,j,bi,bj)+fCori(i,j-1,bi,bj))*uBarXY
      &   *_maskS(I,J,K,bi,bj)  
100          ENDDO          ENDDO
101         ENDDO         ENDDO
102    
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3
  ViewVC Help
Powered by ViewVC 1.1.22