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

Diff of /MITgcm/pkg/mom_fluxform/mom_fluxform.F

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

revision 1.42 by jmc, Tue Mar 16 00:16:50 2010 UTC revision 1.43 by jmc, Fri Mar 16 21:35:09 2012 UTC
# Line 284  C     anelastic: transports are scaled b Line 284  C     anelastic: transports are scaled b
284          CALL MOM_CALC_RELVORT3(bi,bj,k,uFld,vFld,hFacZ,vort3,myThid)          CALL MOM_CALC_RELVORT3(bi,bj,k,uFld,vFld,hFacZ,vort3,myThid)
285          CALL MOM_CALC_TENSION(bi,bj,k,uFld,vFld,tension,myThid)          CALL MOM_CALC_TENSION(bi,bj,k,uFld,vFld,tension,myThid)
286          CALL MOM_CALC_STRAIN(bi,bj,k,uFld,vFld,hFacZ,strain,myThid)          CALL MOM_CALC_STRAIN(bi,bj,k,uFld,vFld,hFacZ,strain,myThid)
287          DO j=1-Oly,sNy+Oly          DO j=1-OLy,sNy+OLy
288           DO i=1-Olx,sNx+Olx           DO i=1-OLx,sNx+OLx
289             IF ( hFacZ(i,j).EQ.0. ) THEN             IF ( hFacZ(i,j).EQ.0. ) THEN
290               vort3(i,j)  = sideMaskFac*vort3(i,j)               vort3(i,j)  = sideMaskFac*vort3(i,j)
291               strain(i,j) = sideMaskFac*strain(i,j)               strain(i,j) = sideMaskFac*strain(i,j)
# Line 421  C--   Tendency is minus divergence of th Line 421  C--   Tendency is minus divergence of th
421          IF ( useDiagnostics ) THEN          IF ( useDiagnostics ) THEN
422            CALL DIAGNOSTICS_FILL(fZon,'ADVx_Um ',k,1,2,bi,bj,myThid)            CALL DIAGNOSTICS_FILL(fZon,'ADVx_Um ',k,1,2,bi,bj,myThid)
423            CALL DIAGNOSTICS_FILL(fMer,'ADVy_Um ',k,1,2,bi,bj,myThid)            CALL DIAGNOSTICS_FILL(fMer,'ADVy_Um ',k,1,2,bi,bj,myThid)
424            CALL DIAGNOSTICS_FILL(fVerU(1-Olx,1-Oly,kUp),            CALL DIAGNOSTICS_FILL(fVerU(1-OLx,1-OLy,kUp),
425       &                               'ADVrE_Um',k,1,2,bi,bj,myThid)       &                               'ADVrE_Um',k,1,2,bi,bj,myThid)
426          ENDIF          ENDIF
427  #endif  #endif
# Line 449  C-- account for 3.D divergence of the fl Line 449  C-- account for 3.D divergence of the fl
449  # endif /* DISABLE_RSTAR_CODE */  # endif /* DISABLE_RSTAR_CODE */
450  #endif /* NONLIN_FRSURF */  #endif /* NONLIN_FRSURF */
451    
452    #ifdef ALLOW_ADDFLUID
453            IF ( selectAddFluid.GE.1 ) THEN
454             DO j=jMin,jMax
455              DO i=iMin,iMax
456               gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)
457         &     + uVel(i,j,k,bi,bj)*mass2rUnit*0.5 _d 0
458         &      *( addMass(i-1,j,k,bi,bj) + addMass(i,j,k,bi,bj) )
459         &      *_recip_hFacW(i,j,k,bi,bj)*recip_drF(k)*recip_rhoFacC(k)
460         &      * recip_rAw(i,j,bi,bj)*recip_deepFac2C(k)
461              ENDDO
462             ENDDO
463            ENDIF
464    #endif /* ALLOW_ADDFLUID */
465    
466        ELSE        ELSE
467  C-    if momAdvection / else  C-    if momAdvection / else
468          DO j=1-OLy,sNy+OLy          DO j=1-OLy,sNy+OLy
# Line 637  C--   Tendency is minus divergence of th Line 651  C--   Tendency is minus divergence of th
651          IF ( useDiagnostics ) THEN          IF ( useDiagnostics ) THEN
652            CALL DIAGNOSTICS_FILL(fZon,'ADVx_Vm ',k,1,2,bi,bj,myThid)            CALL DIAGNOSTICS_FILL(fZon,'ADVx_Vm ',k,1,2,bi,bj,myThid)
653            CALL DIAGNOSTICS_FILL(fMer,'ADVy_Vm ',k,1,2,bi,bj,myThid)            CALL DIAGNOSTICS_FILL(fMer,'ADVy_Vm ',k,1,2,bi,bj,myThid)
654            CALL DIAGNOSTICS_FILL(fVerV(1-Olx,1-Oly,kUp),            CALL DIAGNOSTICS_FILL(fVerV(1-OLx,1-OLy,kUp),
655       &                               'ADVrE_Vm',k,1,2,bi,bj,myThid)       &                               'ADVrE_Vm',k,1,2,bi,bj,myThid)
656          ENDIF          ENDIF
657  #endif  #endif
# Line 665  C-- account for 3.D divergence of the fl Line 679  C-- account for 3.D divergence of the fl
679  # endif /* DISABLE_RSTAR_CODE */  # endif /* DISABLE_RSTAR_CODE */
680  #endif /* NONLIN_FRSURF */  #endif /* NONLIN_FRSURF */
681    
682    #ifdef ALLOW_ADDFLUID
683            IF ( selectAddFluid.GE.1 ) THEN
684             DO j=jMin,jMax
685              DO i=iMin,iMax
686               gV(i,j,k,bi,bj) = gV(i,j,k,bi,bj)
687         &     + vVel(i,j,k,bi,bj)*mass2rUnit*0.5 _d 0
688         &      *( addMass(i,j-1,k,bi,bj) + addMass(i,j,k,bi,bj) )
689         &      *_recip_hFacS(i,j,k,bi,bj)*recip_drF(k)*recip_rhoFacC(k)
690         &      * recip_rAs(i,j,bi,bj)*recip_deepFac2C(k)
691              ENDDO
692             ENDDO
693            ENDIF
694    #endif /* ALLOW_ADDFLUID */
695    
696        ELSE        ELSE
697  C-    if momAdvection / else  C-    if momAdvection / else
698          DO j=1-OLy,sNy+OLy          DO j=1-OLy,sNy+OLy
# Line 862  C--   Set du/dt & dv/dt on boundaries to Line 890  C--   Set du/dt & dv/dt on boundaries to
890  #ifdef ALLOW_DIAGNOSTICS  #ifdef ALLOW_DIAGNOSTICS
891        IF ( useDiagnostics ) THEN        IF ( useDiagnostics ) THEN
892          CALL DIAGNOSTICS_FILL(KE,    'momKE   ',k,1,2,bi,bj,myThid)          CALL DIAGNOSTICS_FILL(KE,    'momKE   ',k,1,2,bi,bj,myThid)
893          CALL DIAGNOSTICS_FILL(gU(1-Olx,1-Oly,k,bi,bj),          CALL DIAGNOSTICS_FILL(gU(1-OLx,1-OLy,k,bi,bj),
894       &                               'Um_Advec',k,1,2,bi,bj,myThid)       &                               'Um_Advec',k,1,2,bi,bj,myThid)
895          CALL DIAGNOSTICS_FILL(gV(1-Olx,1-Oly,k,bi,bj),          CALL DIAGNOSTICS_FILL(gV(1-OLx,1-OLy,k,bi,bj),
896       &                               'Vm_Advec',k,1,2,bi,bj,myThid)       &                               'Vm_Advec',k,1,2,bi,bj,myThid)
897         IF (momViscosity) THEN         IF (momViscosity) THEN
898          CALL DIAGNOSTICS_FILL(guDiss,'Um_Diss ',k,1,2,bi,bj,myThid)          CALL DIAGNOSTICS_FILL(guDiss,'Um_Diss ',k,1,2,bi,bj,myThid)
Legend:
Removed from v.1.42  
changed lines
  Added in v.1.43
  ViewVC Help
Powered by ViewVC 1.1.22