--- MITgcm/pkg/mom_fluxform/mom_fluxform.F	2001/09/26 19:05:21	1.3
+++ MITgcm/pkg/mom_fluxform/mom_fluxform.F	2002/11/05 19:58:21	1.6
@@ -1,11 +1,10 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_fluxform/mom_fluxform.F,v 1.3 2001/09/26 19:05:21 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_fluxform/mom_fluxform.F,v 1.6 2002/11/05 19:58:21 adcroft Exp $
 C $Name:  $
 
 CBOI
 C !TITLE: pkg/mom\_advdiff
 C !AUTHORS: adcroft@mit.edu
-C !INTRODUCTION:
-C \section{Flux-form Momentum Equations Package}
+C !INTRODUCTION: Flux-form Momentum Equations Package
 C
 C Package "mom\_fluxform" provides methods for calculating explicit terms
 C in the momentum equation cast in flux-form:
@@ -375,14 +374,16 @@
      I     myCurrentTime,myThid)
 
 C--   Metric terms for curvilinear grid systems
-      IF (usingSphericalPolarMTerms) THEN
-C      o Spherical polar grid metric terms
+      IF (useNHMTerms) THEN
+C      o Non-hydrosatic metric terms
        CALL MOM_U_METRIC_NH(bi,bj,k,uFld,wVel,mT,myThid)
        DO j=jMin,jMax
         DO i=iMin,iMax
          gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)+mTFacU*mT(i,j)
         ENDDO
        ENDDO
+      ENDIF
+      IF (usingSphericalPolarMTerms) THEN
        CALL MOM_U_METRIC_SPHERE(bi,bj,k,uFld,vFld,mT,myThid)
        DO j=jMin,jMax
         DO i=iMin,iMax
@@ -523,7 +524,7 @@
      I     myCurrentTime,myThid)
 
 C--   Metric terms for curvilinear grid systems
-      IF (usingSphericalPolarMTerms) THEN
+      IF (useNHMTerms) THEN
 C      o Spherical polar grid metric terms
        CALL MOM_V_METRIC_NH(bi,bj,k,vFld,wVel,mT,myThid)
        DO j=jMin,jMax
@@ -531,6 +532,8 @@
          gV(i,j,k,bi,bj) = gV(i,j,k,bi,bj)+mTFacV*mT(i,j)
         ENDDO
        ENDDO
+      ENDIF
+      IF (usingSphericalPolarMTerms) THEN
        CALL MOM_V_METRIC_SPHERE(bi,bj,k,uFld,mT,myThid)
        DO j=jMin,jMax
         DO i=iMin,iMax
@@ -564,6 +567,14 @@
        ENDDO
       ENDDO
 #endif /* INCLUDE_CD_CODE */
+      IF (nonHydrostatic) THEN
+       CALL MOM_U_CORIOLIS_NH(bi,bj,k,wVel,cf,myThid)
+       DO j=jMin,jMax
+        DO i=iMin,iMax
+         gU(i,j,k,bi,bj) = gU(i,j,k,bi,bj)+fuFac*cf(i,j)
+        ENDDO
+       ENDDO
+      ENDIF
 
       RETURN
       END