Changeset 790 for codes/icosagcm/devel/Python/dynamico

Timestamp:

12/03/18 17:58:11 (6 years ago)

Author:

dubos

Message:

devel/Python : centralize logging and command-line argument parsing + update some test cases accordingly

Location:

codes/icosagcm/devel/Python/dynamico

Files:

• getargs.py (added)
• wrap.py (modified) (3 diffs)
• xios.py (modified) (5 diffs)

codes/icosagcm/devel/Python/dynamico/wrap.py

@@ -1 +1 @@
 #------------------- wrap C/Fortran routines -------------------#                                                                                           
-
+import getargs
 import numpy as np 
 from ctypes import *
@@ -55 +55 @@
                 name = prefix+name
                 soname = self.prefix_so+name
-                print 'wrap.Sharedlib : importing', soname
+                if verbose : print 'wrap.Sharedlib : importing', soname
                 self.vardict[self.prefix_py+name] = Wrap(self.lib[soname], self.check_args, proto)
     def addvars(self,*types_and_names):
@@ -72 +72 @@
         for name,val in zip(names,vals):
             self.vars[name].value=val
+
+args = getargs.parse()
+verbose = 'wrap' in args.debug

codes/icosagcm/devel/Python/dynamico/xios.py

@@ +1 @@
+from __future__ import print_function
 import numpy as np
 import cxios
@@ -4 +5 @@
 from dynamico.meshes import radian
 from mpi4py import MPI
+
+import getargs
+args=getargs.parse()
+verbose = 'xios' in args.debug
 
 #-----------------------------------------------------------------------------
@@ -13 +18 @@
         return self
     def __exit__(self, type, value, traceback):
-        print 'xios_finalize()'
+        print('xios_finalize()')
         cxios.finalize()
     def min(self,data): return self.comm.allreduce(data, op=MPI.MIN)
@@ -20 +25 @@
 class Context:
     def __enter__(self):
-        print 'cxios.context_close_definition()'
+        print('cxios.context_close_definition()')
         cxios.context_close_definition()
         return self
     def __exit__(self, type, value, traceback):
-        print 'xios_context_finalize()'
+        print('xios_context_finalize()')
         cxios.context_finalize()
     def init_llm(self, mesh, nqtot):
@@ -62 +67 @@
 def setup_curvilinear(cat,id,nx,ny,own,i_index,j_index,lon,lat):
     mesh = cxios.Handle(cat,id)
-    def log(name,data) : print 'setup_curvilinear : %s shape min max'%name, data.shape, data.min(), data.max()
+    def log(name,data) : 
+        if verbose : print('setup_curvilinear : %s shape min max'%name, data.shape, data.min(), data.max() )
     i_index, j_index, lon, lat = [ x[own] for x in i_index, j_index, lon, lat ]
     log('i_index',i_index)