Changeset 2172 in lmdz_wrf for trunk/tools

Timestamp:

Oct 8, 2018, 4:11:11 PM (7 years ago)

Author:

lfita

Message:

Fixing `stats_time2D'

File:

• trunk/tools/generic_tools.py (modified) (4 diffs)

trunk/tools/generic_tools.py

@@ -5623 +5623 @@
         fname = 'stats_time2D'
 
-        if vals1 == 'h':
+        if type(vals) == type('S') and vals == 'h':
             print fname + '_____________________________________________________________'
             print stats_time2Dvars.__doc__
             quit()
 
-        if vals1 is None:
+        if vals is None:
             self.minv = None
             self.maxv = None
@@ -5638 +5638 @@
             dimx = vals.shape[2]
             dimy = vals.shape[1]
-            stats=np.zeros((dimy,dimx,5), dtype=np.float)
+            stats=np.zeros((dimy,dimx,6), dtype=np.float)
             absmean = np.mean(vals,axis=0)
-            pecents = np.zeros((20,dimy,dimx), dtype=np.float)
+            percents = np.zeros((21,dimy,dimx), dtype=np.float)
 
             stats[:,:,0]=np.min(vals, axis=0)
@@ -5646 +5646 @@
             stats[:,:,2]=np.mean(vals, axis=0)
             stats[:,:,3]=np.mean(vals*vals, axis=0)
-            stats[:,:,4]=absmean - stats[:,:,2]
+            stats[:,:,4]=np.std(vals, axis=0)
+            stats[:,:,5]=absmean - stats[:,:,2]
 
             stats = np.where(stats > 0.1*fillValue, fillValue, stats)
@@ -5661 +5662 @@
             self.meanv=stats[:,:,2]
             self.mean2v=stats[:,:,3]
-            self.stdv=np.sqrt(stats[:,:,3]-stats[:,:,2]*stats[:,:,2])
-            self.anomv=stats[:,:,4]
-            self.percen=percents
+            self.stdv=stats[:,:,4]
+            self.anomv=stats[:,:,5]
+            self.percen=percents[:]
 
         return