Changeset 482 in lmdz_wrf for trunk/tools

Timestamp:

Jun 12, 2015, 11:48:25 AM (10 years ago)

Author:

lfita

Message:

Minor typo and adding final variable assignement

File:

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

trunk/tools/nc_var_tools.py

@@ -900 +900 @@
         varVal[:] = varVal2
     elif modins == 'lowthres@oper':
-        if valS[2] == 'sumc': varVal2 = np.where(varVal[:] < float(valsS[1]),        \
+        if valsS[2] == 'sumc': varVal2 = np.where(varVal[:] < float(valsS[1]),       \
            varVal[:] + float(valsS[2]), varVal[:])
-        elif valS[2] == 'subc': varVal2 = np.where(varVal[:] < float(valsS[1]),      \
+           varVal[:] = varVal2
+        elif valsS[2] == 'subc': varVal2 = np.where(varVal[:] < float(valsS[1]),     \
            varVal[:] - float(valsS[2]), varVal[:])
-        elif valS[2] == 'mulc': varVal2 = np.where(varVal[:] < float(valsS[1]),      \
+           varVal[:] = varVal2
+        elif valsS[2] == 'mulc': varVal2 = np.where(varVal[:] < float(valsS[1]),     \
            varVal[:] * float(valsS[2]), varVal[:])
-        elif valS[2] == 'divc': varVal2 = np.where(varVal[:] < float(valsS[1]),      \
+           varVal[:] = varVal2
+        elif valsS[2] == 'divc': varVal2 = np.where(varVal[:] < float(valsS[1]),     \
            varVal[:] / float(valsS[2]), varVal[:])
-        elif valS[2] == 'potc': varVal2 = np.where(varVal[:] < float(valsS[1]),      \
+           varVal[:] = varVal2
+        elif valsS[2] == 'potc': varVal2 = np.where(varVal[:] < float(valsS[1]),     \
            varVal[:] ** float(valsS[2]), varVal[:])
+           varVal[:] = varVal2
         else:
             print errormsg
@@ -916 +921 @@
             quit(-1)
     elif modins == 'upthres@oper':
-        if valS[2] == 'sumc': varVal2 = np.where(varVal[:] > float(valsS[1]),        \
+        if valsS[2] == 'sumc': varVal2 = np.where(varVal[:] > float(valsS[1]),       \
            varVal[:] + float(valsS[2]), varVal[:])
-        elif valS[2] == 'subc': varVal2 = np.where(varVal[:] > float(valsS[1]),      \
+           varVal[:] = varVal2
+        elif valsS[2] == 'subc': varVal2 = np.where(varVal[:] > float(valsS[1]),     \
            varVal[:] - float(valsS[2]), varVal[:])
-        elif valS[2] == 'mulc': varVal2 = np.where(varVal[:] > float(valsS[1]),      \
+           varVal[:] = varVal2
+        elif valsS[2] == 'mulc': varVal2 = np.where(varVal[:] > float(valsS[1]),     \
            varVal[:] * float(valsS[2]), varVal[:])
-        elif valS[2] == 'divc': varVal2 = np.where(varVal[:] > float(valsS[1]),      \
+           varVal[:] = varVal2
+        elif valsS[2] == 'divc': varVal2 = np.where(varVal[:] > float(valsS[1]),     \
            varVal[:] / float(valsS[2]), varVal[:])
-        elif valS[2] == 'potc': varVal2 = np.where(varVal[:] > float(valsS[1]),      \
+           varVal[:] = varVal2
+        elif valsS[2] == 'potc': varVal2 = np.where(varVal[:] > float(valsS[1]),     \
            varVal[:] ** float(valsS[2]), varVal[:])
+           varVal[:] = varVal2
         else:
             print errormsg