Changeset 639

Timestamp:

12/18/17 12:41:52 (6 years ago)

Author:

dubos

Message:

devel/unstructured : Python interface to ARK time scheme

Location:

codes/icosagcm/devel/Python

Files:

• dynamico/meshes.py (modified) (2 diffs)
• src/functions.h (modified) (2 diffs)

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

@@ -40 +40 @@
 #----------------------- Cartesian mesh -----------------------
 
-def squeeze(dims):
-#    return np.zeros(dims)
-    return np.zeros([n for n in dims if n>1])
+def squeeze(dims): return np.zeros([n for n in dims if n>1])
 
 # arrays is a list of arrays
@@ -280 +278 @@
         self.lon3D_i, self.ll3D = np.meshgrid(lon_i, range(llm))
         self.lat3D_i, self.ll3D = np.meshgrid(lat_i, range(llm))
-    def field_theta(self): return squeeze((self.nqdyn,self.primal_num,self.llm))
-    def field_mass(self): return squeeze((self.primal_num,self.llm))
-    def field_z(self): return squeeze((self.dual_num,self.llm))
-    def field_w(self): return squeeze((self.primal_num,self.llm+1))
-    def field_u(self): return squeeze((self.edge_num,self.llm))
-    def field_ps(self): return squeeze((self.primal_num,))
+    def field_theta(self,n=1): return squeeze((n,self.nqdyn,self.primal_num,self.llm))
+    def field_mass(self,n=1):  return squeeze((n,self.primal_num,self.llm))
+    def field_z(self,n=1):     return squeeze((n,self.dual_num,self.llm))
+    def field_w(self,n=1):     return squeeze((n,self.primal_num,self.llm+1))
+    def field_u(self,n=1):     return squeeze((n,self.edge_num,self.llm))
+    def field_ps(self,n=1):    return squeeze((n,self.primal_num,))
     def ucov2D(self, ulon, ulat): 
         return self.de*(ulon*np.cos(self.angle_e)+ulat*np.sin(self.angle_e))

codes/icosagcm/devel/Python/src/functions.h

@@ -1 +1 @@
 /* KERNELS */
 
+enum {max_nb_stage=5};
+extern double tauj[max_nb_stage];
+extern double cslj[max_nb_stage][max_nb_stage], cflj[max_nb_stage][max_nb_stage];
+
 void dynamico_init_params(void);
+
+void dynamico_ARK_step(double *mass_col, double *rhodz, double *theta_rhodz, 
+                       double *u, double *geopot, double *w,
+                       double *theta, double *ps, double *pk, double *hflux, double *qv,
+                       double *dmass_col, double *drhodz, double *dtheta_rhodz,
+                       double *du_fast, double *du_slow,
+                       double *dPhi_fast, double *dPhi_slow, 
+                       double *dW_fast, double *dW_slow);
 
 /* KERNELS -> XIOS */
@@ -7 +19 @@
 void dynamico_xios_set_timestep(double);
 void dynamico_xios_update_calendar(int);
-
 /* CXIOS */
 void cxios_context_close_definition(void);