Changeset 867 for codes/icosagcm/devel/src/unstructured/data_unstructured.F90

Timestamp:

05/16/19 23:45:56 (5 years ago)

Author:

dubos

Message:

devel : towards Fortran driver for unstructured/LAM meshes

File:

• codes/icosagcm/devel/src/unstructured/data_unstructured.F90 (modified) (4 diffs)

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

@@ -4 +4 @@
   USE mpipara, ONLY : is_mpi_master
   USE grid_param, ONLY : llm, nqdyn
+  USE geometry, ONLY : le, le_de, fv, Av, Ai
 #ifdef CPP_USING_OMP
   USE OMP_LIB
@@ -28 +29 @@
   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
+  INDEX, POINTER :: & ! deg(ij) = nb of vertices = nb of edges of primal/dual cell ij
        primal_deg(:), primal_edge(:,:), primal_vertex(:,:), primal_ne(:,:), & 
        dual_deg(:), dual_edge(:,:), dual_vertex(:,:), dual_ne(:,:), &
@@ -43 +44 @@
   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
-  NUM1(:), ALLOCATABLE            :: le, le_de, fv, Av, Ai
-  NUM2(:,:), ALLOCATABLE          :: centroid, xyz_v, Riv2, wee, ap,bp, mass_bl, mass_dak, mass_dbk
+  NUM2(:,:), POINTER          :: centroid, xyz_v, Riv2, wee, ap,bp, mass_bl, mass_dak, mass_dbk
 
   INTEGER(C_INT), BIND(C) :: comm_icosa
@@ -144 +144 @@
   !---------------------------- CONTEXT INITIALIZATION --------------------------
 
-#define ALLOC1(v,n1) IF(ALLOCATED(v)) DEALLOCATE(v) ; ALLOCATE(v(n1))
-#define ALLOC2(v,n1,n2) IF(ALLOCATED(v)) DEALLOCATE(v) ; ALLOCATE(v(n1,n2))
+!#define ALLOC1(v,n1) IF(ALLOCATED(v)) DEALLOCATE(v) ; ALLOCATE(v(n1))
+!#define ALLOC2(v,n1,n2) IF(ALLOCATED(v)) DEALLOCATE(v) ; ALLOCATE(v(n1,n2))
+#define ALLOC1(v,n1) IF(ASSOCIATED(v)) DEALLOCATE(v) ; ALLOCATE(v(n1))
+#define ALLOC2(v,n1,n2) IF(ASSOCIATED(v)) DEALLOCATE(v) ; ALLOCATE(v(n1,n2))
 
   SUBROUTINE init_mesh( &