Changeset 949 for codes/icosagcm/devel/src/unstructured

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/unstructured

Files:

• data_unstructured.F90 (modified) (2 diffs)
• init_unstructured.f90 (modified) (3 diffs)

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