Changeset 676 for codes/icosagcm

Timestamp:

01/31/18 18:48:48 (6 years ago)

Author:

dubos

Message:

devel/unstructured : update DCMIP 3.1 test case

Location:

codes/icosagcm/devel/Python/test

Files:

• py/NH_3D_DCMIP31.py (modified) (3 diffs)
• python.sh (modified) (1 diff)

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

@@ -94 +94 @@
 print 'llm, nb_hex, dx, dz =', llm, mesh.Ai.size, dx, dz
 
-caldyn_thermo, caldyn_eta = unst.thermo_entropy, unst.eta_lag
-caldyn = unst.Caldyn_NH(caldyn_thermo,caldyn_eta, mesh,thermo,params,params.g)
+#dt = courant*.5/np.sqrt(gas0.c2.max()*(dx**-2+dz**-2))
+dt = courant*.5*dx/np.sqrt(gas0.c2.max())
+
+nt = int(math.ceil(T/dt))
+dt = T/nt
+print 'Time step : %g s' % dt
 
 mesh.plot_e(mesh.le/mesh.de) ; plt.title('le/de')
@@ -103 +107 @@
 plt.savefig('fig_NH_3D_DCMIP31/Ai.png'); plt.close()
 
-#dt = courant*.5/np.sqrt(gas0.c2.max()*(dx**-2+dz**-2))
-dt = courant*.5*dx/np.sqrt(gas0.c2.max())
+caldyn_thermo, caldyn_eta = unst.thermo_entropy, unst.eta_lag
 
-nt = int(math.ceil(T/dt))
-dt = T/nt
-print 'Time step : %g s' % dt
-
-#scheme = time_step.RK4(caldyn.bwd_fast_slow, dt)
-scheme = time_step.ARK2(caldyn.bwd_fast_slow, dt, a32=0.7)
-
-flow=flow0
-w=mesh.field_mass()
-z=mesh.field_mass()
+if False: # time stepping in Python
+    caldyn = unst.Caldyn_NH(caldyn_thermo,caldyn_eta, mesh,thermo,params,params.g)
+    scheme = time_step.ARK2(caldyn.bwd_fast_slow, dt, a32=0.7)
+    def next_flow(m,S,u,Phi,W): return scheme.advance((m,S,u,Phi,W),nt)
+else: # time stepping in Fortran
+    scheme = time_step.ARK2(None, dt, a32=0.7)
+    caldyn_step = unst.caldyn_step_NH(mesh,scheme,nt, caldyn_thermo,caldyn_eta, thermo,params,params.g)
+    def next_flow(m,S,u,Phi,W):
+        caldyn_step.mass[:,:], caldyn_step.theta_rhodz[:,:], caldyn_step.u[:,:] = m,S,u
+        caldyn_step.geopot[:,:], caldyn_step.W[:,:] = Phi,W
+        caldyn_step.next()
+        return (caldyn_step.mass.copy(), caldyn_step.theta_rhodz.copy(), caldyn_step.u.copy(),
+                caldyn_step.geopot.copy(), caldyn_step.W.copy())
 
 def plots(it):
-    junk,fast,slow = caldyn.bwd_fast_slow(flow, 0.)
-    m,S,u,Phi,W = flow
     s=S/m ; s=.5*(s+abs(s))
     for l in range(llm):
@@ -133 +137 @@
     plt.close()
 
+w=mesh.field_mass()
+z=mesh.field_mass()
+m,S,u,Phi,W=flow0 
 plots(0)
 
 for it in range(Nslice):
-    #    unst.setvar('debug_hevi_solver',True)
+    unst.setvar('debug_hevi_solver',False)
     time1, elapsed1 =time.time(), unst.getvar('elapsed')
-    flow = scheme.advance(flow,nt)
+    m,S,u,Phi,W = next_flow(m,S,u,Phi,W)
     time2, elapsed2 =time.time(), unst.getvar('elapsed')
-    factor = 1000./(3*nt)
-    print 'ms per call to caldyn_hevi : ', factor*(time2-time1), factor*(elapsed2-elapsed1)
+    factor = 1000./nt
+    print 'ms per full time step : ', factor*(time2-time1), factor*(elapsed2-elapsed1)
     factor = 1e9/(4*nt*w.size)
     print 'nanosec per gridpoint per call to caldyn_hevi : ', factor*(time2-time1), factor*(elapsed2-elapsed1)
     plots(it+1)
-    

codes/icosagcm/devel/Python/test/python.sh

@@ -6 +6 @@
 . $DYNAMICO_ROOT/Python//env/$CURRENT_ARCH.env
 
+export OMP_STACKSIZE=128M
+
 LD_PRELOAD=$PYTHON_PRELOAD python -u $*