Changeset 1014 for trunk/UTIL

Timestamp:

Jul 29, 2013, 10:46:34 AM (11 years ago)

Author:

tnavarro

Message:

there was a bug in computations with meanarea when quadratic mean option was added

File:

• trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py (modified) (2 diffs)

trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py

@@ -1709 +1709 @@
         if self.method_y == "comp": 
             if self.verbose: print "**** OK. Computing over y axis."
-            if "mean" in self.compute: self.field = ppcompute.mean(self.field,axis=2)
+            if self.compute == "meanarea": self.field = ppcompute.sum(self.field,axis=2)
+            elif "mean" in self.compute: self.field = ppcompute.mean(self.field,axis=2)
             elif self.compute == "min": self.field = ppcompute.min(self.field,axis=2)
             elif self.compute == "max": self.field = ppcompute.max(self.field,axis=2)
-            elif self.compute == "meanarea": self.field = ppcompute.sum(self.field,axis=2)
             else: print "!! ERROR !! operation not supported." ; exit()
             ny = 1 ; self.field = np.reshape(self.field,(nt,nz,ny,nx))
@@ -1718 +1718 @@
         if self.method_x == "comp":
             if self.verbose: print "**** OK. Computing over x axis."
-            if "mean" in self.compute: self.field = ppcompute.mean(self.field,axis=3)
+            if self.compute == "meanarea": self.field = ppcompute.sum(self.field,axis=3)
+            elif "mean" in self.compute: self.field = ppcompute.mean(self.field,axis=3)
             elif self.compute == "min": self.field = ppcompute.min(self.field,axis=3)
             elif self.compute == "max": self.field = ppcompute.max(self.field,axis=3)
-            elif self.compute == "meanarea": self.field = ppcompute.sum(self.field,axis=3)
             else: print "!! ERROR !! operation not supported." ; exit()
             nx = 1 ; self.field = np.reshape(self.field,(nt,nz,ny,nx))