Changeset 749

Timestamp:

10/08/18 10:49:07 (6 years ago)

Author:

dubos

Message:

devel/unstructured : fix recently introduced bugs

Location:

codes/icosagcm/devel

Files:

• Python/dynamico/meshes.py (modified) (1 diff)
• Python/test/py/RSW2_MPAS_W02.py (modified) (1 diff)
• src/unstructured/caldyn_unstructured.F90 (modified) (2 diffs)
• src/unstructured/data_unstructured.F90 (modified) (1 diff)

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

@@ -181 +181 @@
     def field_z(self,n=1): return zeros((n,self.ny,self.nx,self.llm))
     def field_w(self,n=1): return zeros((n,self.ny,self.nx,self.llm+1))
-    def field_u(self,n=1): return zeros((self.ny,2*self.nx,self.llm))
+    def field_u(self,n=1): return zeros((n,self.ny,2*self.nx,self.llm))
     def field_ps(self,n=1): return zeros((n,self.ny,self.nx))
     def ucomp(self,u): 

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

@@ -45 +45 @@
 print T, nt
 
-caldyn = unst.Caldyn_RSW(mesh)
-scheme = time_step.RK4(caldyn.bwd_fast_slow, dt)
-#scheme = time_step.RKn_simple(1,caldyn.bwd_fast_slow, dt) # forward Euler scheme
+scheme = time_step.RK4(None, dt)
 print dt, scheme.csjl, scheme.cfjl
 step = unst.caldyn_step_TRSW(mesh,scheme,nt)

codes/icosagcm/devel/src/unstructured/caldyn_unstructured.F90

@@ -34 +34 @@
   NUM :: tau, gamma, tau2_g, tau2_g2, g2, gm2, vreff, Rd_preff
   INTEGER :: iter
+  LOGICAL :: debug_hevi_solver
   DECLARE_INDICES
   NUM :: rho_ij, X_ij, Y_ij, wil, rho_c2_mik, c2_mik, ml_g2
@@ -52 +53 @@
 #endif
 
+  debug_hevi_solver=.FALSE.
+!$OMP MASTER
+  debug_hevi_solver = debug_hevi_solver_
+!$OMP END MASTER
+
   START_TRACE(id_NH_geopot, 7,0,0)
 #include "../kernels_unst/compute_NH_geopot.k90"
   STOP_TRACE  
+
+!$OMP MASTER
+  debug_hevi_solver_ = debug_hevi_solver
+!$OMP END MASTER
 
 #if COLUMN

codes/icosagcm/devel/src/unstructured/data_unstructured.F90

@@ -12 +12 @@
   INDEX,  BIND(C) :: caldyn_thermo=thermo_theta, caldyn_eta=eta_lag, &
        caldyn_vert_variant=caldyn_vert_cons, nb_threads=0, nb_stage=0
-  LOGICAL(C_BOOL), BIND(C) :: hydrostatic=.TRUE., debug_hevi_solver=.TRUE.
+  LOGICAL(C_BOOL), BIND(C) :: hydrostatic=.TRUE.
+  LOGICAL(C_BOOL), BIND(C, NAME='debug_hevi_solver') :: debug_hevi_solver_=.TRUE.
 
 #ifdef CPP_MIXED_PREC