--- MITgcm/pkg/diagnostics/diagstats_local.F	2008/11/18 21:41:06	1.7
+++ MITgcm/pkg/diagnostics/diagstats_local.F	2009/12/21 00:10:07	1.9
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/diagnostics/diagstats_local.F,v 1.7 2008/11/18 21:41:06 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/diagnostics/diagstats_local.F,v 1.9 2009/12/21 00:10:07 jmc Exp $
 C $Name:  $
 
 #include "DIAG_OPTIONS.h"
@@ -13,7 +13,7 @@
      I                  sizI1,sizI2,sizJ1,sizJ2,sizK,sizTx,sizTy,
      I                  iRun,jRun,kIn,biIn,bjIn,
      I                  k,bi,bj, region2fill, ndId, parsFld,
-     I                  myThid)
+     I                  myThid )
 
 C     !DESCRIPTION:
 C     Update array statFld
@@ -51,7 +51,7 @@
 C     sizK        :: size of inpFld array: 3rd  dimension
 C     sizTx,sizTy :: size of inpFld array: tile dimensions
 C     iRun,jRun   :: range of 1rst & 2nd index
-C     kIn         :: level index of inpFld array to porcess
+C     kIn         :: level index of inpFld array to process
 C     biIn,bjIn   :: tile indices of inpFld array to process
 C     k,bi,bj     :: level and tile indices used for weighting (mask,area ...)
 C     region2fill :: indicates whether to compute statistics over this region
@@ -81,7 +81,7 @@
 
 C     !LOCAL VARIABLES:
 C     i,j    :: loop indices
-      INTEGER i, n, km, kFr, kRegMsk
+      INTEGER i, n, kFr, kRegMsk
       INTEGER im, ix, iv
       PARAMETER ( iv = nStats - 2 , im = nStats - 1 , ix = nStats )
       LOGICAL exclSpVal
@@ -162,7 +162,7 @@
      I            scaleFact, power, useFract, n, diagSt_vRegMsk(n),
      I            nStats,sizI1,sizI2,sizJ1,sizJ2,iRun,jRun,
      I            diagSt_regMask(1-Olx,1-Oly,kRegMsk,bi,bj),
-     I            maskH(1-Olx,1-Oly,bi,bj), rA(1-Olx,1-Oly,bi,bj),
+     I            maskInC(1-Olx,1-Oly,bi,bj), rA(1-Olx,1-Oly,bi,bj),
      I            specialVal, exclSpVal,
      I            k,bi,bj, parsFld, myThid )
          ELSEIF ( useLand .AND.
@@ -182,8 +182,6 @@
 c        ELSEIF ( parsFld(10:10) .EQ. '1' ) THEN
          ELSE
 
-          km = 1
-          IF ( usingPCoords ) km = Nr
           drLoc = 1. _d 0
           IF     ( parsFld(2:2).EQ.'U' ) THEN
            CALL  DIAGSTATS_CALC(
@@ -193,8 +191,8 @@
      I            scaleFact, power, useFract, n, diagSt_vRegMsk(n),
      I            nStats,sizI1,sizI2,sizJ1,sizJ2,iRun,jRun,
      I            diagSt_regMask(1-Olx,1-Oly,kRegMsk,bi,bj),
-     I            maskW(1-Olx,1-Oly,km,bi,bj),
-     I            maskW(1-Olx,1-Oly,km,bi,bj),rAw(1-Olx,1-Oly,bi,bj),
+     I            maskInW(1-Olx,1-Oly,bi,bj),
+     I            maskInW(1-Olx,1-Oly,bi,bj),rAw(1-Olx,1-Oly,bi,bj),
      I            drLoc, specialVal, exclSpVal, useWeight, myThid )
           ELSEIF ( parsFld(2:2).EQ.'V' ) THEN
            CALL  DIAGSTATS_CALC(
@@ -204,8 +202,8 @@
      I            scaleFact, power, useFract, n, diagSt_vRegMsk(n),
      I            nStats,sizI1,sizI2,sizJ1,sizJ2,iRun,jRun,
      I            diagSt_regMask(1-Olx,1-Oly,kRegMsk,bi,bj),
-     I            maskS(1-Olx,1-Oly,km,bi,bj),
-     I            maskS(1-Olx,1-Oly,km,bi,bj),rAs(1-Olx,1-Oly,bi,bj),
+     I            maskInS(1-Olx,1-Oly,bi,bj),
+     I            maskInS(1-Olx,1-Oly,bi,bj),rAs(1-Olx,1-Oly,bi,bj),
      I            drLoc, specialVal, exclSpVal, useWeight, myThid )
           ELSE
            CALL  DIAGSTATS_CALC(
@@ -215,8 +213,8 @@
      I            scaleFact, power, useFract, n, diagSt_vRegMsk(n),
      I            nStats,sizI1,sizI2,sizJ1,sizJ2,iRun,jRun,
      I            diagSt_regMask(1-Olx,1-Oly,kRegMsk,bi,bj),
-     I            maskH(1-Olx,1-Oly,bi,bj),
-     I            maskH(1-Olx,1-Oly,bi,bj), rA(1-Olx,1-Oly,bi,bj),
+     I            maskInC(1-Olx,1-Oly,bi,bj),
+     I            maskInC(1-Olx,1-Oly,bi,bj), rA(1-Olx,1-Oly,bi,bj),
      I            drLoc, specialVal, exclSpVal, useWeight, myThid )
           ENDIF