Changeset 631 for codes/icosagcm/devel/Python/test

Timestamp:

12/12/17 16:04:23 (7 years ago)

Author:

dubos

Message:

devel/Python : extract pure Python stuff from cython module unstructured.pyx

Location:

codes/icosagcm/devel/Python/test/py

Files:

• RSW_2D.py (modified) (2 diffs)
• RSW_MPAS_W02.py (modified) (2 diffs)
• bubble.py (modified) (2 diffs)
• slice_GW_NH.py (modified) (2 diffs)
• slice_GW_hydro.py (modified) (2 diffs)
• test_xios.py (modified) (3 diffs)

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

@@ +1 @@
+from dynamico.meshes import Cartesian_mesh as Mesh
 from dynamico import unstructured as unst
 from dynamico import dyn
@@ -15 +16 @@
 
 unst.setvar('g',g)
-mesh = unst.Cartesian_mesh(nx,ny,llm,nqdyn,Lx,Ly,f)
+mesh = Mesh(nx,ny,llm,nqdyn,Lx,Ly,f)
 caldyn = unst.Caldyn_RSW(mesh)
 

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

@@ -1 @@
-import sys
 print 'Loading modules ...'
-sys.stdout.flush()
-
 import math as math
-# select non-interactive backend, cf http://stackoverflow.com/questions/4931376/generating-matplotlib-graphs-without-a-running-x-server
-import matplotlib
-matplotlib.use('Agg') 
 import matplotlib.pyplot as plt
 import numpy as np
+print '...Done'
 
 print 'Loading DYNAMICO modules ...'
-sys.stdout.flush()
 from dynamico import unstructured as unst
+from dynamico.meshes import MPAS_Mesh as Mesh
 from dynamico import time_step
 print '...Done'
-sys.stdout.flush()
 
 grid, llm, nqdyn = 10242, 1,1 # 2562, 10242, 40962
@@ -22 +16 @@
 
 print 'Omega, planetary PV', Omega, 2*Omega/gh0
-sys.stdout.flush()
 
 def f(lon,lat): return 2*Omega*np.sin(lat) # Coriolis parameter
 print 'Reading MPAS mesh ...'
-sys.stdout.flush()
-mesh = unst.MPAS_Mesh('grids/x1.%d.grid.nc'%grid, llm, nqdyn, radius, f)
+mesh = Mesh('grids/x1.%d.grid.nc'%grid, llm, nqdyn, radius, f)
 print '...Done'
-sys.stdout.flush()
 lon, lat = mesh.lon_i, mesh.lat_i
 x,y,z = np.cos(lat)*np.cos(lon), np.cos(lat)*np.sin(lon), np.sin(lat)

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

@@ -4 +4 @@
 import matplotlib.animation as manimation
 
+from dynamico.meshes import Cartesian_mesh as Mesh
 import dynamico.dyn as dyn
 import dynamico.time_step as time_step
@@ -94 +95 @@
 
 unst.setvar('nb_threads', 1)
-mesh = unst.Cartesian_mesh(nx,ny,llm,nqdyn,Lx,ny*dx,0.)
+mesh = Mesh(nx,ny,llm,nqdyn,Lx,ny*dx,0.)
 xx_ik, xx_il, ll = mesh.xx[:,0,:]/1000, mesh.xxp1[:,0,:]/1000, mesh.ll[:,0,:]
 

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

@@ +1 @@
+from dynamico.meshes import Cartesian_mesh as Mesh
 from dynamico import unstructured as unst
 from dynamico import dyn
@@ -91 +92 @@
 Lx, nx, ztop, llm = 2e5, 400, 3e4, 60
 nqdyn, ny, dx = 1, 1, Lx/nx
-mesh = unst.Cartesian_mesh(nx,ny,llm,nqdyn,nx*dx,ny*dx,0.)
+mesh = Mesh(nx,ny,llm,nqdyn,nx*dx,ny*dx,0.)
 xx,ll = mesh.xx[:,0,:]/1000, mesh.ll[:,0,:]
 

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

@@ +1 @@
+from dynamico.meshes import Cartesian_mesh as Mesh
 from dynamico import unstructured as unst
 from dynamico import dyn
@@ -58 +59 @@
 Lx, nx, llm = 3e5, 300, 20
 nqdyn, ny, dx = 1, 1, Lx/nx
-mesh = unst.Cartesian_mesh(nx,ny,llm,nqdyn,nx*dx,ny*dx,0.)
+mesh = Mesh(nx,ny,llm,nqdyn,nx*dx,ny*dx,0.)
 xx,ll = mesh.xx[:,0,:]/1000, mesh.ll[:,0,:]
 metric, thermo, BC, m0ik, gas0, Phi0_il, u0_jk = DCMIP.DCMIP31(Lx, nx, llm)

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

@@ -4 +4 @@
 print '%d/%d starting'%(mpi_rank,mpi_size)
 
-import sys
 import numpy as np
-#import dynamico.wrap as wrap
 print 'import dynamico.unstructured'
 import dynamico.unstructured as unst
@@ -12 +10 @@
 import dynamico.xios as xios
 print 'Done.'
+from dynamico.meshes import MPAS_Mesh as Mesh, radian
 
 def boundaries(degree,points,lon,lat):
@@ -29 +28 @@
 #----------------------------- read MPAS mesh --------------------------------
 
-radian=unst.radian
 grid, llm, nqdyn, nqtot = 10242, 1,1,1 # 2562, 10242, 40962  
 Omega, radius, g, gh0 = 2.*np.pi/86400., 6.4e6, 1., 2.94e4
 N, T, courant = 40, 10800., 1.2 # simulation length = N*T
 print 'Omega, planetary PV', Omega, 2*Omega/gh0
-sys.stdout.flush()
 
 def f(lon,lat): return 2*Omega*np.sin(lat) # Coriolis parameter                                                                                                                
 print 'Reading MPAS mesh ...'
-sys.stdout.flush()
-mesh = unst.MPAS_Mesh('grids/x1.%d.grid.nc'%grid, llm, nqdyn, radius, f)
+mesh = Mesh('grids/x1.%d.grid.nc'%grid, llm, nqdyn, radius, f)
 print '...Done'
-sys.stdout.flush()
 
 lon_i, lat_i, lon_v, lat_v = [x*radian for x in mesh.lon_i, mesh.lat_i, mesh.lon_v, mesh.lat_v]