Changeset 1103 in lmdz_wrf for trunk

Timestamp:

Sep 13, 2016, 9:29:27 AM (9 years ago)

Author:

lfita

Message:

Addding python dependency on the existence of dt.deltatime.total_seconds()
Adding `turb' turbulence in 'file_oper_alongdims'

File:

• trunk/tools/nc_var_tools.py (modified) (7 diffs)

trunk/tools/nc_var_tools.py

@@ -8977 +8977 @@
         which operation has to be done
       opkind= operation to perform along the dimensions with a range: max, mean, 
-        mean2, min, sum, var
+        mean2, min, sum, turb, var
     """
     fname = 'operation_alongdims'
@@ -9129 +9129 @@
 # Operations with which when the variable dimensions will be ajusted to the file
 #   the zero value along the operated dimensions will be taken
-    zerodimops = ['max', 'mean', 'mean2', 'min', 'sum', 'std', 'var']
+    zerodimops = ['max', 'mean', 'mean2', 'min', 'sum', 'std', 'turb', 'var']
 
     dimsoperS = gen.numVector_String(dimsoper,', ')
@@ -9270 +9270 @@
     
     # Statistics of the variable dimension along the dimensions operated
-    basicoper = ['min', 'max', 'mean', 'mean2', 'sum', 'std']
+    basicoper = ['min', 'max', 'mean', 'mean2', 'sum', 'std', 'var']
 
 # operating variable dimension
@@ -9295 +9295 @@
             varvals = np.squeeze(varvals0)
 
-            finalvarvals, finaldims = operdim(varvals, varsliceddims, dimsoper, operkind)
+            tooper = False
+            for idn in varsliceddims:
+                if gen.searchInlist(dimsoper,idn): tooper = True
+
+            if tooper:
+                finalvarvals, finaldims = operdim(varvals, varsliceddims, dimsoper, operkind)
+            else:
+                finalvarvals = varvals
+                finaldims = varsliceddims
 
             # Adding dimensions
@@ -9405 +9413 @@
                 uname = gen.variables_values(vn)[5]
 
-            if len(varvals.shape) == 1:
+            # No statistics for `turb'
+            if len(varvals.shape) == 1 and operkind != 'turb':
                 print '  ' + fname + ': Statisitcs of operated variable dimension _______'
                 print "    '" + vn + "' ... .. ."
@@ -12777 +12786 @@
 
             DT = endT - iniT
-            diffT = DT.total_seconds()
+            # Python version depending
+            if searchInlist(dir(DT), 'total_seconds'):
+                diffT = DT.total_seconds()
+            else:
+                diffT = DT.days*24*3600. + DT.seconds
+
             print '  ' + fname + ': seconds between time-steps in files:', diffT
 
@@ -12796 +12810 @@
 
                 DT = endT - iniT
-                diffitv = np.abs(DT.total_seconds())
+                # Python version depending
+                if searchInlist(dir(DT), 'total_seconds'):
+                    diffitv = np.abs(DT.total_seconds())
+                else:
+                    diffitv = np.abs(DT.days*24*3600. + DT.seconds)
 
                 if diffT/2. >= diffitv: