Changeset 813 for codes

Timestamp:

03/13/19 16:02:44 (5 years ago)

Author:

jisesh

Message:

devel ; towards Fortran driver for unstructured/LAM meshes

Location:

codes/icosagcm/devel/src

Files:

• base/grid_param.f90 (modified) (1 diff)
• icosa_init.f90 (modified) (2 diffs)
• parallel/domain.f90 (modified) (2 diffs)
• parallel/mpipara.F90 (modified) (1 diff)
• unstructured/data_unstructured.F90 (modified) (3 diffs)
• unstructured/init_unstructured.f90 (added)

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

@@ -2 +2 @@
   INTEGER  :: iim_glo=40
   INTEGER  :: jjm_glo
-  INTEGER,PARAMETER  :: nb_face=10
-  INTEGER  :: llm=19
+  INTEGER, PARAMETER  :: nb_face=10
+  INTEGER, PARAMETER :: grid_unst=1, grid_ico = 2
+  INTEGER  :: grid_type ! unstructured or icosahedral
+  INTEGER, BIND(C) :: llm=19
   INTEGER  :: nqtot ! number of tracers handled by advection scheme
-  INTEGER  :: nqdyn ! number of dynamical tracers : 1 if dry, more if moist
+  INTEGER, BIND(C) :: nqdyn ! number of dynamical tracers : 1 if dry, more if moist
 
 CONTAINS

codes/icosagcm/devel/src/icosa_init.f90

@@ -22 +22 @@
   USE diagflux_mod
   USE profiling_mod
+  USE init_unstructured_mod, ONLY: init_grid_type
   IMPLICIT NONE
   
     CALL init_profiling
     CALL init_mpipara
+    CALL init_grid_type
     CALL trace_off
     CALL xios_init
@@ -74 +76 @@
 
   CONTAINS
-  
+ 
     SUBROUTINE check_total_area
     IMPLICIT NONE

codes/icosagcm/devel/src/parallel/domain.f90

@@ -579 +579 @@
     CALL assign_domain_omp
 !$OMP END PARALLEL
-        
-    
+            
   END SUBROUTINE  assign_domain      
    
@@ -612 +611 @@
   END SUBROUTINE assign_domain_omp
     
-
           
   SUBROUTINE compute_domain
-  IMPLICIT NONE
-    CALL init_domain_param
-    CALL create_domain
-    CALL assign_cell
-    CALL compute_boundary
-    CALL set_neighbour_indice
-    CALL assign_domain
-      
+    USE grid_param, ONLY : grid_type, grid_unst, grid_ico
+    IMPLICIT NONE
+    SELECT CASE(grid_type)
+    CASE(grid_unst)
+       ndomain=1
+       ALLOCATE(assigned_domain(1))
+       assigned_domain=.TRUE.
+    CASE DEFAULT
+       CALL init_domain_param
+       CALL create_domain
+       CALL assign_cell
+       CALL compute_boundary
+       CALL set_neighbour_indice
+       CALL assign_domain
+    END SELECT
   END SUBROUTINE compute_domain
           
 END MODULE domain_mod 
-  

codes/icosagcm/devel/src/parallel/mpipara.F90

@@ -9 +9 @@
   LOGICAL,SAVE :: using_mpi
   LOGICAL,SAVE :: is_mpi_root
-  LOGICAL,SAVE :: is_mpi_master
+  LOGICAL,SAVE, BIND(C) :: is_mpi_master=.TRUE.
   INTEGER,SAVE :: mpi_master
   

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

@@ -2 +2 @@
   USE ISO_C_BINDING
   USE OMP_LIB
+  USE mpipara, ONLY : is_mpi_master
+  USE grid_param, ONLY : llm, nqdyn
   IMPLICIT NONE
   SAVE
+
 
 #include "unstructured.h90"
@@ -12 +15 @@
   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., is_mpi_master=.TRUE., debug_on=.FALSE.
+  LOGICAL(C_BOOL), BIND(C) :: hydrostatic=.TRUE., debug_on=.FALSE.
   LOGICAL(C_BOOL), BIND(C, NAME='debug_hevi_solver') :: debug_hevi_solver_=.TRUE.
 
@@ -21 +24 @@
 #endif
 
-  INDEX, BIND(C) :: llm, nqdyn, edge_num, primal_num, dual_num, &
+  INDEX, BIND(C) :: edge_num, primal_num, dual_num, &
        max_primal_deg, max_dual_deg, max_trisk_deg
   INDEX, ALLOCATABLE :: & ! deg(ij) = nb of vertices = nb of edges of primal/dual cell ij