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

Timestamp:

07/05/19 15:13:09 (5 years ago)

Author:

dubos

Message:

devel : DySL for enstrophy-conserving scheme

File:

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

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

@@ -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, wee, ap,bp, mass_bl, mass_dak, mass_dbk
-
+  NUM2(:,:), POINTER          :: centroid, xyz_v, Riv2, ap,bp, mass_bl, mass_dak, mass_dbk
+  NUM3(:,:,:), POINTER        :: wee
   INTEGER(C_INT), BIND(C) :: comm_icosa
 
@@ -147 +147 @@
 #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))
+#define ALLOC3(v,n1,n2,n3) IF(ASSOCIATED(v)) DEALLOCATE(v) ; ALLOCATE(v(n1,n2,n3))
 
   SUBROUTINE init_mesh( & 
@@ -225 +226 @@
     ALLOC1(le_de,edge_num)
     ALLOC2(Riv2, max_dual_deg, dual_num)
-    ALLOC2(wee, max_trisk_deg, edge_num)
+    ALLOC3(wee, max_trisk_deg, edge_num, 1)
     Ai(:) = Ai_(:)
     Av(:) = Av_(:)
@@ -231 +232 @@
     le_de(:) = le_de_(:)
     Riv2(:,:)=Riv2_(:,:)
-    wee(:,:) = wee_(:,:)
+    wee(:,:,1) = wee_(:,:)
     IF(is_mpi_master) THEN
        PRINT *, 'Max Ai : ',    MAXVAL(ABS(Ai))