Changeset 687 for codes/icosagcm

Timestamp:

03/08/18 13:05:02 (6 years ago)

Author:

dubos

Message:

devel/unstructured : piecewise-constant vertical remapping

Location:

codes/icosagcm/devel/Python

Files:

• dynamico/meshes.py (modified) (1 diff)
• src/kernels_transport.jin (modified) (4 diffs)
• src/unstructured.pyx (modified) (2 diffs)
• test/py/DCMIP2008c5.py (modified) (4 diffs)

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

@@ -294 +294 @@
         return ucov
     def plot(self, tri,data, **kwargs):
-        plt.figure(figsize=(12,4))
+        plt.figure(figsize=(10,4))
         plt.gca().set_aspect('equal')
         plt.tricontourf(tri, data, 20, **kwargs)

codes/icosagcm/devel/Python/src/kernels_transport.jin

@@ -234 +234 @@
         rhodz_cum(CELL)=0.
         cur_lev(HIDX(CELL))=1
-        eta(CELL)=0.
+        eta(CELL)=1.
         new_rhodz_cum(HIDX(CELL))=0.
       END_BLOCK
@@ -252 +252 @@
            IF(rhodz_cum_target<=rhodz_cum_levp1) EXIT
         END DO
+        IF(level>llm) level=llm
         rhodz_cum_lev = rhodz_cum(AT_LEVEL(CELL,level))
         ! now rhodz_cum_lev <= rhodz_cum_target <= rhodz_cum_levp1  
@@ -275 +276 @@
       BODY('1,llm+1')
         X = eta(CELL)
-        level = FLOOR(X)
+        level = MIN(llm,FLOOR(X)) ! eta=llm+1 => level=llm, X=1
         X = X-level
         new_thetarhodz_cum(CELL) = thetarhodz_cum(AT_LEVEL(CELL,level))+X*thetarhodz(AT_LEVEL(CELL,level))
       END_BLOCK
       BODY('1,llm')
-        thetarhodz(CELL)) = new_thetarhodz_cum(UP(CELL)) - new_thetarhodz_cum(CELL)
+        thetarhodz(CELL) = new_thetarhodz_cum(UP(CELL)) - new_thetarhodz_cum(CELL)
       END_BLOCK
     END_BLOCK
@@ -300 +301 @@
       BODY('1,llm+1')
         X = .5*(eta(CELL1)+eta(CELL2))
-        level = FLOOR(X)
+        level = MIN(llm,FLOOR(X))
         X = X-level
         new_urhodz_cum(EDGE) = urhodz_cum(AT_LEVEL(EDGE,level))+X*urhodz(AT_LEVEL(EDGE,level))

codes/icosagcm/devel/Python/src/unstructured.pyx

@@ -29 +29 @@
                                  double *dPhi_fast, double *dPhi_slow, 
                                  double *dW_fast, double *dW_slow)
+     cdef void dynamico_remap(double *rhodz, double *theta_rhodz, double *u)
      cdef void dynamico_init_params()
      cpdef void dynamico_setup_xios()
@@ -161 +162 @@
         #time2=time.time()
         #if time2>time1: elapsed=elapsed+time2-time1
+    def remap(self):
+        dynamico_remap(self.p_mass, self.p_theta_rhodz, self.p_u)
 
 def caldyn_step_TRSW(mesh,time_scheme,nstep):

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

@@ -109 +109 @@
 #------------------------ main program -------------------------
 
-grid, llm = 40962, 26
+#grid, llm = 40962, 26
+grid, llm = 2562, 26
 T, Nslice, courant = 14400, 24, 3.0
-#caldyn_thermo, caldyn_eta = unst.thermo_entropy, unst.eta_lag
-caldyn_thermo, caldyn_eta = unst.thermo_entropy, unst.eta_mass
+caldyn_thermo, caldyn_eta = unst.thermo_entropy, unst.eta_lag
+#caldyn_thermo, caldyn_eta = unst.thermo_entropy, unst.eta_mass
 thermo, mesh, hybrid_coefs, params, flow0, gas0 = DCMIP2008c5(grid,llm)
 llm, dx = mesh.llm, params.dx
@@ -120 +121 @@
 else:
     print 'Mass-based coordinate.'
-    unst.ker.dynamico_init_hybrid(*hybrid_coefs)
+
+unst.ker.dynamico_init_hybrid(*hybrid_coefs)
     
 dt = courant*.5*dx/np.sqrt(gas0.c2.max())
@@ -129 +131 @@
 
 mesh.plot_e(mesh.le/mesh.de) ; plt.title('le/de')
-plt.savefig('fig_DCMIP2008c5/le_de.png') ;plt.close()
+plt.savefig('fig_DCMIP2008c5/le_de.png'); plt.close()
 
 mesh.plot_i(mesh.Ai) ; plt.title('Ai')
@@ -146 +148 @@
     def next_flow(m,S,u):
         caldyn_step.mass[:,:], caldyn_step.theta_rhodz[:,:], caldyn_step.u[:,:] = m,S,u
+        caldyn_step.remap()
         caldyn_step.next()
         return (caldyn_step.mass.copy(), caldyn_step.theta_rhodz.copy(),