Changeset 687 for codes/icosagcm/devel/Python/test/py/DCMIP2008c5.py

Timestamp:

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

Author:

dubos

Message:

devel/unstructured : piecewise-constant vertical remapping

File:

• codes/icosagcm/devel/Python/test/py/DCMIP2008c5.py (modified) (4 diffs)

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(),