Changeset 646

Timestamp:

12/21/17 15:11:18 (6 years ago)

Author:

dubos

Message:

devel/unstructured : update some test cases

Location:

codes/icosagcm/devel/Python/test/py

Files:

• NH_3D_bubble.py (modified) (2 diffs)
• slice_GW_NH.py (modified) (3 diffs)
• slice_GW_hydro.py (modified) (1 diff)

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

@@ -54 +54 @@
 
 #Lx, nx, llm, thetac, T, Nslice, courant = 2000., 100, 50, 30., 5., 10, 2.8
-Lx, nx, llm, thetac, T, Nslice, courant = 2000., 50, 25, 30, 5., 10, 2.8
+Lx, nx, llm, thetac, T, Nslice, courant = 2000., 8, 80, 30, 5., 10, 2.8
 #Lx, nx, llm, thetac, T, Nslice, courant = 3000., 75, 25, -30, 5., 10, 2.8
 
@@ -130 +130 @@
     m,S,u,Phi,W = next_flow(m,S,u,Phi,W)
     time2, elapsed2 =time.time(), unst.getvar('elapsed')
-    factor = 1000./(4*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*nx*ny*llm)
-    print 'nanosec per gridpoint per call to caldyn_hevi : ', factor*(time2-time1), factor*(elapsed2-elapsed1)
+    print 'nanosec per gridpoint per full time step : ', factor*(time2-time1), factor*(elapsed2-elapsed1)
         

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

@@ -1 +1 @@
 from dynamico.meshes import Cartesian_mesh as Mesh
+from dynamico import meshes
 from dynamico import unstructured as unst
 from dynamico import dyn
@@ -15 +16 @@
     caldyn_thermo = unst.thermo_entropy
     g = mesh.dx/metric.dx_g0
-    caldyn = unst.Caldyn_NH(caldyn_thermo,caldyn_eta, mesh,metric,thermo,BC,g)
+    caldyn = unst.Caldyn_NH(caldyn_thermo,caldyn_eta, mesh,thermo,BC,g)
 
     Sik = m0ik*gas0.s
@@ -95 +96 @@
 xx,ll = mesh.xx[:,0,:]/1000, mesh.ll[:,0,:]
 
-#metric, thermo, BC, m0ik, gas0, Phi0_il, u0_jk = DCMIP.DCMIP31(Lx, nx, llm, deform=deform, dTheta=1.)
-metric, thermo, BC, m0ik, gas0, Phi0_il, u0_jk = DCMIP.DCMIP21(Lx, nx, llm, deform=deform, h0=0.)
+metric, thermo, BC, m0ik, gas0, Phi0_il, u0_jk = DCMIP.DCMIP31(Lx, nx, llm, deform=deform, dTheta=1.)
+#metric, thermo, BC, m0ik, gas0, Phi0_il, u0_jk = DCMIP.DCMIP21(Lx, nx, llm, deform=deform, h0=0.)
 
 BC.rho_bot = 1e6*BC.rho_bot # large stiffness
 
-mass_bl,mass_dak,mass_dbk = unst.compute_hybrid_coefs(m0ik)
-unst.init_hybrid(mass_bl,mass_dak,mass_dbk)
+mass_bl,mass_dak,mass_dbk = meshes.compute_hybrid_coefs(m0ik)
+unst.ker.dynamico_init_hybrid(mass_bl,mass_dak,mass_dbk)
 
 run(mesh,metric,thermo,BC,unst.eta_mass,20.,  m0ik,gas0,Phi0_il, courant=2.) # lower courant number required if h0=2000m

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

@@ -9 +9 @@
 import numpy as np
 import time
-
-unst.setvar('nb_threads', 1)
 
 def run(mesh,metric,thermo,BC,caldyn_eta, m0ik,gas0):