--- MITgcm/pkg/mom_fluxform/mom_fluxform.F	2001/09/28 16:49:54	1.4
+++ MITgcm/pkg/mom_fluxform/mom_fluxform.F	2002/11/05 18:49:02	1.5
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_fluxform/mom_fluxform.F,v 1.4 2001/09/28 16:49:54 adcroft Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/mom_fluxform/mom_fluxform.F,v 1.5 2002/11/05 18:49:02 adcroft Exp $
 C $Name:  $
 
 CBOI
@@ -374,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
@@ -522,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
@@ -530,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