Changeset 773

Timestamp:

11/14/18 15:07:09 (5 years ago)

Author:

dubos

Message:

devel/Python : fix RSW_2D testcase

Location:

codes/icosagcm/devel/Python

Files:

• dynamico/meshes.py (modified) (1 diff)
• test/py/RSW_2D.py (modified) (1 diff)
• test/py/RSW_2D_mesh.py (modified) (2 diffs)
• test/py/write_Cartesian_mesh.py (modified) (1 diff)

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

@@ -178 +178 @@
                   dual_deg,dual_edge,dual_ne,dual_vertex,
                   left,right,down,up,trisk_deg,trisk,
-                  Aiv,Aiv,f+0.*Aiv,le_de,Riv2,-wee)
+                  Aiv,Aiv,f+0.*Aiv,le_de,Riv2,wee)
         self.set_members(locals(), 'primal_deg', 'primal_edge', 'primal_ne', 'primal_vertex',
                          'dual_deg', 'dual_edge', 'dual_ne', 'dual_vertex',

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

@@ -23 +23 @@
 h0[:] = 1+0.1*(np.exp(-2.*(x1*x1+yy*yy))+
             np.exp(-2.*(x2*x2+yy*yy)))
+#h0[:] = 1+0.1*(np.exp(-2.*yy*yy))
+
 flow0=(h0,u0)
 

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

@@ -35 +35 @@
 h0 = 1+0.1*(np.exp(-2.*(x1*x1+yy*yy))+
             np.exp(-2.*(x2*x2+yy*yy)))
+#h0 = 1+0.1*(np.exp(-5.*yy*yy))
+
 flow0=prec.asnum([h0,u0])
 
@@ -40 +42 @@
 dt = cfl/math.sqrt((nx/Lx)**2+(ny/Ly)**2)
 
-T=1.
+T=10.
 N=int(T/dt)+1
 dt=T/N

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

@@ -19 +19 @@
                     default=8., choices=None,
                     help="Ly")
-parser.add_argument("-llm", type=int,
-                    default=1, choices=[1],
-                    help="number of vertical levels")
 args = parser.parse_args()
-nx, ny, Lx, Ly, llm, nqdyn = args.nx, args.ny,args.Lx, args.Ly, args.llm, 1
+
+nx, ny, Lx, Ly, llm, nqdyn = args.nx, args.ny,args.Lx, args.Ly, 1, 1
 
 dx,dy=Lx/nx,Ly/ny