Changeset 1520 in lmdz_wrf

Timestamp:

Apr 12, 2017, 12:58:12 AM (8 years ago)

Author:

lfita

Message:

Adding to `matoperations': 'repl', 'replbig', 'repless'

File:

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

trunk/tools/generic_tools.py

@@ -10166 +10166 @@
         'pot': powering with matB (matA ** matB)
         'potc',[modval1]: [val] ** [modval1]
+        'repl',[modval1]: replace values of matA with values from matB except matB = [modval1]
+        'replbig',[modval1]: replace values of matA with values from matB except matB > [modval1]
+        'repless',[modval1]: replace values of matA with values from matB except matB < [modval1]
         'sub': substracting matB to matA (matA - matB)
         'subc',[modval1]: remove [modval1]
@@ -10293 +10296 @@
     Lopn = {'add': '+', 'addc': '+', 'div': '/', 'divc': '/', 'inv': '^(-1)',        \
       'lowthres': '<', 'mul': '*', 'mulc': '*', 'pot': '^', 'potc': '^',             \
-      'sub': '-', 'subc': '-', 'upthres': '<'}
+      'repl': 'repl_excpt', 'replbig': 'repl_excpt_bigger',                          \
+      'repless': 'repl_excpt_less', 'sub': '-', 'subc': '-', 'upthres': '<'}
+    # Operations by constant value
     Lopnc = {'addc': '+', 'divc': '/', 'inv': '^{-1)', 'mulc': '*', 'potc': '^',     \
-      'subc': '-'}
-
+      'repl': 'repl_excpt', 'replbig': 'repl_excpt_bigger',                          \
+      'repless': 'repl_excpt_less', 'subc': '-'}
+
+    # Available operations
     opavail = ['add', 'addc', 'centerderiv', 'div', 'divc', 'forwrdderiv', 'inv',    \
-      'lowthres', 'lowthres@oper', 'mul', 'mulc', 'pot', 'potc', 'sub', 'subc',      \
-      'upthres', 'upthres@oper']
+      'lowthres', 'lowthres@oper', 'mul', 'mulc', 'pot', 'potc', 'repl', 'replbig',  \
+      'repless', 'sub', 'subc', 'upthres', 'upthres@oper']
     opavailc = ['addc', 'divc', 'inv', 'mulc', 'potc', 'subc']
 
@@ -10387 +10394 @@
         value1 = retype(opN.split(',')[1], valtype)
         Lopn['potc'] = '^' + str(value1)         
+    elif opN[0:4] == 'repl' and opN.split(',')[0] == 'repl':
+        opn = 'repl'
+        value1 = retype(opN.split(',')[1], valtype)
+        Lopn['repl'] = 'repl_excpt(' + str(value1) + ')'
+    elif opN[0:7] == 'replbig':
+        opn = 'replbig'
+        value1 = retype(opN.split(',')[1], valtype)
+        Lopn['replbig'] = 'repl_excpt(<' + str(value1) + ')'
+    elif opN[0:7] == 'repless':
+        opn = 'repless'
+        value1 = retype(opN.split(',')[1], valtype)
+        Lopn['repless'] = 'repl_excpt(>' + str(value1) + ')'
     elif opN[0:4] == 'subc':
         opn = 'subc'
@@ -10587 +10606 @@
     elif opn == 'potc':
         newmat = matA ** value1
+    elif opn == 'repl':
+        newmat = np.where(matB == value1, matA, matB)
+    elif opn == 'replbig':
+        newmat = np.where(matB > value1, matA, matB)
+    elif opn == 'repless':
+        newmat = np.where(matB < value1, matA, matB)
     elif opn == 'sub':
         newmat = matA - matB