Changeset 949

Timestamp:

07/13/19 17:01:16 (5 years ago)

Author:

dubos

Message:

devel : generic compute_caldyn_slow_hydro + fixes

Location:

codes/icosagcm/devel/src

Files:

• base/init_grid_param.f90 (modified) (1 diff)
• dynamics/caldyn_hevi.f90 (modified) (2 diffs)
• time/timeloop_gcm.f90 (modified) (1 diff)
• unstructured/data_unstructured.F90 (modified) (2 diffs)
• unstructured/init_unstructured.f90 (modified) (3 diffs)

codes/icosagcm/devel/src/base/init_grid_param.f90

@@ -85 +85 @@
     compute_pvort_only         => compute_pvort_only_unst
     compute_theta              => compute_theta_unst
-!    compute_geopot           => compute_geopot_unst
+    compute_geopot             => compute_geopot_unst
     compute_caldyn_fast        => compute_caldyn_fast_unst
     compute_caldyn_slow_hydro  => compute_caldyn_slow_hydro_unst
-    compute_caldyn_coriolis   => compute_caldyn_coriolis_unst
+    compute_caldyn_coriolis    => compute_caldyn_coriolis_unst
   END SUBROUTINE select_compute_unst
   

codes/icosagcm/devel/src/dynamics/caldyn_hevi.f90

@@ -6 +6 @@
   USE compute_caldyn_vert_NH_mod, ONLY : compute_caldyn_vert_NH => compute_caldyn_vert_NH_manual
   USE compute_caldyn_kv_mod, ONLY : compute_caldyn_kv
-  USE compute_caldyn_slow_hydro_mod, ONLY : compute_caldyn_slow_hydro => compute_caldyn_slow_hydro_manual
   USE compute_caldyn_slow_NH_mod, ONLY : compute_caldyn_slow_NH
   USE compute_caldyn_solver_mod, ONLY : compute_caldyn_solver
@@ -32 +31 @@
     USE checksum_mod
     USE compute_caldyn_mod, ONLY : compute_pvort_only, compute_theta, &
-         compute_geopot, compute_caldyn_fast, compute_caldyn_coriolis
+         compute_geopot, compute_caldyn_fast, compute_caldyn_coriolis, compute_caldyn_slow_hydro
     IMPLICIT NONE
     LOGICAL,INTENT(IN)    :: write_out

codes/icosagcm/devel/src/time/timeloop_gcm.f90

@@ -252 +252 @@
     !$OMP END MASTER   
 
-    IF(grid_type == grid_unst) RETURN
-
     DO it=itau0+1,itau0+itaumax
        IF (is_master) CALL print_iteration(it, itau0, itaumax, start_clock, rate_clock)

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

@@ -5 +5 @@
   USE grid_param, ONLY : llm, nqdyn, primal_num, edge_num, dual_num, &
        max_primal_deg, max_dual_deg, max_trisk_deg
-  USE geometry, ONLY : le, le_de, fv, Av, Ai
+  USE geometry, ONLY : le, le_de, fv, Av, Ai, wee, Riv2
 #ifdef CPP_USING_OMP
   USE OMP_LIB
@@ -43 +43 @@
   NUM1(max_nb_stage), BIND(C)              :: tauj       ! diagonal of fast Butcher tableau
   NUM2(max_nb_stage,max_nb_stage), BIND(C) :: cslj, cflj ! slow and fast modified Butcher tableaus
-  NUM2(:,:), POINTER          :: centroid, xyz_v, Riv2, ap,bp, mass_bl, mass_dak, mass_dbk
-  NUM3(:,:,:), POINTER        :: wee
+  NUM2(:,:), POINTER          :: centroid, xyz_v, ap,bp, mass_bl, mass_dak, mass_dbk
   INTEGER(C_INT), BIND(C) :: comm_icosa
 

codes/icosagcm/devel/src/unstructured/init_unstructured.f90

@@ -219 +219 @@
     USE field_mod
     USE domain_mod, ONLY : swap_needed, domain, domain_glo
-    USE geometry, ONLY : geom, lon_i, lat_i, lon_e, lat_e, ep_e
+    USE geometry, ONLY : geom, lon_i, lat_i, lon_e, lat_e, ep_e, Riv2, wee
     USE netcdf_mod, ONLY : nf90_close
     IMPLICIT NONE
@@ -242 +242 @@
     swap_needed = .TRUE.
     CALL swap_geometry(1)
+    swap_needed = .FALSE.
     
     PRINT *, 'read_local_mesh : primal_num =', primal_num, domain_glo(1)%primal_own%ncell
@@ -311 +312 @@
     DEALLOCATE(angle_e)
 
-    CALL swap_geometry(1)
-    swap_needed = .FALSE.
-
   END SUBROUTINE read_local_mesh