Changeset 1011 for trunk/UTIL

Timestamp:

Jul 24, 2013, 2:13:49 PM (11 years ago)

Author:

aslmd

Message:

UTIL PYTHON planetoplot_v2. added quadratic mean: self.compute == qmean

File:

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

trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py

@@ -1690 +1690 @@
             else:
                 if self.verbose: print "!! WARNING !! No area accounted for (computing on t and/or z axis)."
+        # prepare quadratic mean
+        if "qmean" in self.compute: self.field = self.field*self.field
         # now ready to compute [TBD: we would like to have e.g. mean over x,y and min over t ??]
         if self.method_t == "comp":
@@ -1707 +1709 @@
         if self.method_y == "comp": 
             if self.verbose: print "**** OK. Computing over y axis."
-            if self.compute == "mean": self.field = ppcompute.mean(self.field,axis=2)
+            if "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)
@@ -1716 +1718 @@
         if self.method_x == "comp":
             if self.verbose: print "**** OK. Computing over x axis."
-            if self.compute == "mean": self.field = ppcompute.mean(self.field,axis=3)
+            if "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)
@@ -1725 +1727 @@
         # remove all dimensions with size 1 to prepare plot (and check the resulting dimension with dimplot)
         self.field = np.squeeze(self.field)
+        # take root mean square for quadratic mean
+        if self.compute == "qmean": self.field = np.sqrt(self.field)
+        # error handling and verbose
         if self.field.ndim != self.dimplot: 
             print "!! ERROR !! Problem: self.field is different than plot dimensions", self.field.ndim, self.dimplot ; exit()