Changeset 2715 for trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modtypes.F

Timestamp:

2011-03-30T17:58:35+02:00 (13 years ago)

Author:

rblod

Message:

First attempt to put dynamic allocation on the trunk

File:

• trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modtypes.F (modified) (7 diffs)

trunk/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modtypes.F

@@ -37 +37 @@
       INTEGER, PARAMETER :: Agrif_NbMaxGrids = 10
                   
-C     MPI Communicator
-      INTEGER :: mpi_comm_agrif
 C
 C     **************************************************************************
@@ -126 +124 @@
            ! List of the grid variables   
            TYPE(Agrif_PVariable), DIMENSION(:) ,Pointer :: tabvars     
+           ! pointer on the save grid 
+           TYPE(Agrif_grid)                    ,Pointer :: save_grid                
 C
            ! Global x,y and z position
@@ -169 +169 @@
            INTEGER                                 :: NbVariables = 0
            Type(Agrif_Flux), Pointer               :: fluxes => NULL()
+           INTEGER                                 :: level
+           ! level of the grid in the hierarchy
       End TYPE Agrif_grid
 C
@@ -198 +200 @@
 C        Arrays containing the values of the grid variables (REAL)
          REAL                                    :: array0 
-         REAL   , DIMENSION(:)          ,Pointer :: array1    => NULL()
-         REAL   , DIMENSION(:,:)        ,Pointer :: array2    => NULL()
-         REAL   , DIMENSION(:,:,:)      ,Pointer :: array3    => NULL()
-         REAL   , DIMENSION(:,:,:,:)    ,Pointer :: array4    => NULL()
-         REAL   , DIMENSION(:,:,:,:,:)  ,Pointer :: array5    => NULL()
-         REAL   , DIMENSION(:,:,:,:,:,:),Pointer :: array6    => NULL()
+         REAL   , DIMENSION(:)          ,ALLOCATABLE :: array1    
+         REAL   , DIMENSION(:,:)        ,ALLOCATABLE :: array2    
+         REAL   , DIMENSION(:,:,:)      ,ALLOCATABLE :: array3    
+         REAL   , DIMENSION(:,:,:,:)    ,ALLOCATABLE :: array4    
+         REAL   , DIMENSION(:,:,:,:,:)  ,ALLOCATABLE :: array5    
+         REAL   , DIMENSION(:,:,:,:,:,:),ALLOCATABLE :: array6  
+         
+         REAL   , DIMENSION(:)          ,POINTER :: parray1    
+         REAL   , DIMENSION(:,:)        ,POINTER :: parray2    
+         REAL   , DIMENSION(:,:,:)      ,POINTER :: parray3    
+         REAL   , DIMENSION(:,:,:,:)    ,POINTER :: parray4    
+         REAL   , DIMENSION(:,:,:,:,:)  ,POINTER :: parray5    
+         REAL   , DIMENSION(:,:,:,:,:,:),POINTER :: parray6
+         
 C        Arrays containing the values of the grid variables (REAL*8)
          REAL*8                                 :: darray0
-         REAL*8, DIMENSION(:)          ,Pointer :: darray1   => NULL()
-         REAL*8, DIMENSION(:,:)        ,Pointer :: darray2   => NULL()
-         REAL*8, DIMENSION(:,:,:)      ,Pointer :: darray3   => NULL()
-         REAL*8, DIMENSION(:,:,:,:)    ,Pointer :: darray4   => NULL()
-         REAL*8, DIMENSION(:,:,:,:,:)  ,Pointer :: darray5   => NULL()
-         REAL*8, DIMENSION(:,:,:,:,:,:),Pointer :: darray6   => NULL()
+         REAL*8, DIMENSION(:)          ,ALLOCATABLE :: darray1   
+         REAL*8, DIMENSION(:,:)        ,ALLOCATABLE :: darray2   
+         REAL*8, DIMENSION(:,:,:)      ,ALLOCATABLE :: darray3   
+         REAL*8, DIMENSION(:,:,:,:)    ,ALLOCATABLE :: darray4   
+         REAL*8, DIMENSION(:,:,:,:,:)  ,ALLOCATABLE :: darray5   
+         REAL*8, DIMENSION(:,:,:,:,:,:),ALLOCATABLE :: darray6   
 C        Arrays containing the values of the grid variables (REAL*4)
          REAL*4                                 :: sarray0
-         REAL*4, DIMENSION(:)          ,Pointer :: sarray1   => NULL()
-         REAL*4, DIMENSION(:,:)        ,Pointer :: sarray2   => NULL()
-         REAL*4, DIMENSION(:,:,:)      ,Pointer :: sarray3   => NULL()
-         REAL*4, DIMENSION(:,:,:,:)    ,Pointer :: sarray4   => NULL()
-         REAL*4, DIMENSION(:,:,:,:,:)  ,Pointer :: sarray5   => NULL()
-         REAL*4, DIMENSION(:,:,:,:,:,:),Pointer :: sarray6   => NULL()
+         REAL*4, DIMENSION(:)          ,ALLOCATABLE :: sarray1   
+         REAL*4, DIMENSION(:,:)        ,ALLOCATABLE :: sarray2   
+         REAL*4, DIMENSION(:,:,:)      ,ALLOCATABLE :: sarray3   
+         REAL*4, DIMENSION(:,:,:,:)    ,ALLOCATABLE :: sarray4   
+         REAL*4, DIMENSION(:,:,:,:,:)  ,ALLOCATABLE :: sarray5   
+         REAL*4, DIMENSION(:,:,:,:,:,:),ALLOCATABLE :: sarray6   
 C        Arrays containing the values of the grid variables (LOGICAL)
          LOGICAL                                 :: larray0
-         LOGICAL, DIMENSION(:)          ,Pointer :: larray1   => NULL()
-         LOGICAL, DIMENSION(:,:)        ,Pointer :: larray2   => NULL()
-         LOGICAL, DIMENSION(:,:,:)      ,Pointer :: larray3   => NULL()
-         LOGICAL, DIMENSION(:,:,:,:)    ,Pointer :: larray4   => NULL()
-         LOGICAL, DIMENSION(:,:,:,:,:)  ,Pointer :: larray5   => NULL()
-         LOGICAL, DIMENSION(:,:,:,:,:,:),Pointer :: larray6   => NULL()
+         LOGICAL, DIMENSION(:)          ,ALLOCATABLE :: larray1   
+         LOGICAL, DIMENSION(:,:)        ,ALLOCATABLE :: larray2   
+         LOGICAL, DIMENSION(:,:,:)      ,ALLOCATABLE :: larray3   
+         LOGICAL, DIMENSION(:,:,:,:)    ,ALLOCATABLE :: larray4   
+         LOGICAL, DIMENSION(:,:,:,:,:)  ,ALLOCATABLE :: larray5   
+         LOGICAL, DIMENSION(:,:,:,:,:,:),ALLOCATABLE :: larray6   
 C         Arrays containing the values of the grid variables (INTEGER)   
          INTEGER                                 :: iarray0
-         INTEGER, DIMENSION(:)          ,Pointer :: iarray1   => NULL()
-         INTEGER, DIMENSION(:,:)        ,Pointer :: iarray2   => NULL()
-         INTEGER, DIMENSION(:,:,:)      ,Pointer :: iarray3   => NULL()
-         INTEGER, DIMENSION(:,:,:,:)    ,Pointer :: iarray4   => NULL()
-         INTEGER, DIMENSION(:,:,:,:,:)  ,Pointer :: iarray5   => NULL()
-         INTEGER, DIMENSION(:,:,:,:,:,:),Pointer :: iarray6   => NULL()
+         INTEGER, DIMENSION(:)          ,ALLOCATABLE :: iarray1   
+         INTEGER, DIMENSION(:,:)        ,ALLOCATABLE :: iarray2   
+         INTEGER, DIMENSION(:,:,:)      ,ALLOCATABLE :: iarray3   
+         INTEGER, DIMENSION(:,:,:,:)    ,ALLOCATABLE :: iarray4   
+         INTEGER, DIMENSION(:,:,:,:,:)  ,ALLOCATABLE :: iarray5   
+         INTEGER, DIMENSION(:,:,:,:,:,:),ALLOCATABLE :: iarray6   
 C
          INTEGER, DIMENSION(:)          ,Pointer :: restore1D => NULL()
@@ -245 +255 @@
 C   
          CHARACTER(2050)                          :: carray0
-         CHARACTER(200), DIMENSION(:)    ,Pointer :: carray1   => NULL()
-         CHARACTER(200), DIMENSION(:,:)  ,Pointer :: carray2   => NULL()
+         CHARACTER(200), DIMENSION(:)    ,ALLOCATABLE :: carray1
+         CHARACTER(200), DIMENSION(:,:)  ,ALLOCATABLE :: carray2
 C
          ! Array used for the time interpolation
@@ -375 +385 @@
       REAL                  :: Agrif_SpecialValueFineGrid
 C   clustering PARAMETERs
-      INTEGER               :: Agrif_Regridding
+      INTEGER               :: Agrif_Regridding = 10
       INTEGER               :: Agrif_Minwidth
       REAL                  :: Agrif_Efficiency = 0.7
@@ -406 +416 @@
       ! Agrif_USE_FIXED_GRIDS = 1 if AMR mode + fixed grid 
       !    else only AMR mode
-      INTEGER               :: Agrif_USE_FIXED_GRIDS         
+      INTEGER               :: Agrif_USE_FIXED_GRIDS
+      INTEGER               :: Agrif_Maxlevelloc
 C
 #ifdef key_mpp_mpi
       INTEGER :: Agrif_Nbprocs  ! Number of processors
       INTEGER :: Agrif_ProcRank ! Rank of the current processor 
-      INTEGER :: Agrif_Group    ! Group associated to MPI_COMM_AGRIF
+      INTEGER :: Agrif_Group    ! Group associated to MPI_COMM_WORLD
       INTEGER :: Agrif_MPIPREC
 #endif