Changeset 1517 in lmdz_wrf for trunk

Timestamp:

Apr 12, 2017, 12:52:49 AM (8 years ago)

Author:

lfita

Message:

Adding into 'compute_opersvarsfiles':

'repl',[modval1]: replace values of [prevalues] with values from [operfile2var] except values in second file = [modval1]
'replbig',[modval1]: replace values of [prevalues] with values from [operfile2var] except values in second file > [modval1]
'repless',[modval1]: replace values of [prevalues] with values from [operfile2var] except values in second file < [modval1]

File:

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

trunk/tools/nc_var_tools.py

@@ -6950 +6950 @@
     """ Function to compute opersvarfiles: operation of variables from different files
       (OPER1.FILE1_VAR1 OPER2.FILE2_VAR2), operations are going to be sequentially made
-      compute_opersvarsfiles(values, varinfo)
+      compute_opersvarsfiles(values, varinfo). 
+        NOTE: Values from the first file (with always operation 'add')
+        [prevalues]: values from the previous operations
         values= '%' separated list of dimension ranges and file,operation,variable to compute
           [dimranges1]@[operfile1var]%[dimranges2]@[operfile2var]%[...[dimrangesM]@[operfileMvar]]
@@ -6975 +6977 @@
              'pot': powering with [var] ([prevalues] ** [var])
              'potc',[modval1]: [prevalues] ** [modval1]
+             'repl',[modval1]: replace values of [prevalues] with values from [operfile2var] except 
+               values in second file = [modval1]
+             'replbig',[modval1]: replace values of [prevalues] with values from [operfile2var] except 
+               values in second file > [modval1]
+             'repless',[modval1]: replace values of [prevalues] with values from [operfile2var] except 
+               values in second file < [modval1]
              'sub': substracting [var] ([prevalues] - [var])
              'subc',[modval1]: remove [modval1] of [prevalues]
@@ -7171 +7179 @@
                 prevalues, operS = gen.matoperations(opern, varvals, inimat)
             else:
+                print ' ' + fname + ': Lluis opern:', opern
                 prevalues, operS = gen.matoperations(opern, prevalues, varvals)
             operS = ' ' + operS + '[' + varn + ']'
@@ -7217 +7226 @@
 
 # Global attributes
-    objofile.setncattr('script',  fname)
-    objofile.setncattr('version',  '1.0')
-    objofile.setncattr('author',  'L. Fita')
-    newattr = set_attributek(objofile, 'institution', unicode('Laboratoire de M' +   \
-      unichr(233) + 't' + unichr(233) + 'orologie Dynamique'), 'U')
-    objofile.setncattr('university',  'Pierre et Marie Curie')
-    objofile.setncattr('country',  'France')
+    add_global_PyNCplot(objofile, main, fname, '1.1')
     newattr = set_attributek(objofile, 'used_operation',  operationS, 'S')
     newattr = set_attributek(objofile, 'used_files',  ', '.join(filens) ,'S')