Changeset 696 for codes/icosagcm

Timestamp:

05/10/18 01:01:55 (6 years ago)

Author:

dubos

Message:

devel/unstructured : bugfix XIOS output

Location:

codes/icosagcm/devel/Python

Files:

• dynamico/xios.py (modified) (3 diffs)
• test/py/test_xios.py (modified) (2 diffs)

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

@@ -29 +29 @@
 
 class XIOS_Context:
-    def __init__(self, pmesh, mesh,nqtot):
+    def __init__(self, pmesh, mesh,nqtot, step):
         self.mesh=mesh
         ker.dynamico_setup_xios()
@@ -46 +46 @@
         # calendar
         calendar=cxios.Handle('calendar_wrapper')
-        dtime = cxios.Duration(second=3600.)
+        dtime = cxios.Duration(second=step)
         calendar.set_attr(timestep=dtime)
         calendar.update_timestep()
@@ -60 +60 @@
             data = data[own_loc]
         if data.ndim==2:
-            data = data[:,own_loc]
+            data = data[own_loc,:]
+            data = data.transpose() # XIOS expects contiguous horizontal slices
         data = np.ascontiguousarray(data)
         cxios.send_field(name, data)

codes/icosagcm/devel/Python/test/py/test_xios.py

@@ -28 +28 @@
 #--------------------------------- write some data ----------------------------------------
 
-context=xios.XIOS_Context(pmesh,mesh,nqtot)
+context=xios.XIOS_Context(pmesh,mesh,nqtot, 3600)
 
 lat_i = radian*mesh.lat_i
-lat_ik, junk  = np.meshgrid(lat_i, np.arange(llm), indexing='xy')
+lat_ik, junk  = np.meshgrid(lat_i, np.arange(llm), indexing='ij')
 
 no_error=True
@@ -37 +37 @@
     for i in range(100):
         context.update_calendar(i)
-        print 'send_field', i
+        print 'send_field', i, lat_ik.shape
         context.send_field_primal('ps', lat_i)
         context.send_field_primal('theta', lat_ik)