Changeset 10725 for vendors/AGRIF/CMEMS_2020/AGRIF_FILES/modtypes.F90

Timestamp:

2019-02-27T14:55:54+01:00 (5 years ago)

Author:

rblod

Message:

Update agrif library and conv see ticket #2129

File:

• vendors/AGRIF/CMEMS_2020/AGRIF_FILES/modtypes.F90 (modified) (7 diffs)

vendors/AGRIF/CMEMS_2020/AGRIF_FILES/modtypes.F90

@@ -111 +111 @@
 !> \name Arrays containing the values of the grid variables (real)
 !> @{
-    real,    dimension(:)          , pointer :: parray1 => NULL()
-    real,    dimension(:,:)        , pointer :: parray2 => NULL()
-    real,    dimension(:,:,:)      , pointer :: parray3 => NULL()
-    real,    dimension(:,:,:,:)    , pointer :: parray4 => NULL()
-    real,    dimension(:,:,:,:,:)  , pointer :: parray5 => NULL()
-    real,    dimension(:,:,:,:,:,:), pointer :: parray6 => NULL()
+    real,    dimension(:)          , pointer :: parray1
+    real,    dimension(:,:)        , pointer :: parray2
+    real,    dimension(:,:,:)      , pointer :: parray3
+    real,    dimension(:,:,:,:)    , pointer :: parray4
+    real,    dimension(:,:,:,:,:)  , pointer :: parray5
+    real,    dimension(:,:,:,:,:,:), pointer :: parray6
 !> @}
 !> \name Arrays containing the values of the grid variables (real*8)
 !> @{
-    real(8), dimension(:)          , pointer :: pdarray1 => NULL()
-    real(8), dimension(:,:)        , pointer :: pdarray2 => NULL()
-    real(8), dimension(:,:,:)      , pointer :: pdarray3 => NULL()
-    real(8), dimension(:,:,:,:)    , pointer :: pdarray4 => NULL()
-    real(8), dimension(:,:,:,:,:)  , pointer :: pdarray5 => NULL()
-    real(8), dimension(:,:,:,:,:,:), pointer :: pdarray6 => NULL()
+    real(8), dimension(:)          , pointer :: pdarray1
+    real(8), dimension(:,:)        , pointer :: pdarray2
+    real(8), dimension(:,:,:)      , pointer :: pdarray3
+    real(8), dimension(:,:,:,:)    , pointer :: pdarray4
+    real(8), dimension(:,:,:,:,:)  , pointer :: pdarray5
+    real(8), dimension(:,:,:,:,:,:), pointer :: pdarray6
 !> @}
 !> \name Arrays containing the values of the grid variables (real*4)
 !> @{
-    real(4), dimension(:)          , pointer :: psarray1 => NULL()
-    real(4), dimension(:,:)        , pointer :: psarray2 => NULL()
-    real(4), dimension(:,:,:)      , pointer :: psarray3 => NULL()
-    real(4), dimension(:,:,:,:)    , pointer :: psarray4 => NULL()
-    real(4), dimension(:,:,:,:,:)  , pointer :: psarray5 => NULL()
-    real(4), dimension(:,:,:,:,:,:), pointer :: psarray6 => NULL()
+    real(4), dimension(:)          , pointer :: psarray1
+    real(4), dimension(:,:)        , pointer :: psarray2
+    real(4), dimension(:,:,:)      , pointer :: psarray3
+    real(4), dimension(:,:,:,:)    , pointer :: psarray4
+    real(4), dimension(:,:,:,:,:)  , pointer :: psarray5
+    real(4), dimension(:,:,:,:,:,:), pointer :: psarray6
 !> @}
 !> \name Arrays used to restore the values
@@ -159 +159 @@
     integer, dimension(6)   :: ub
 
-    integer, dimension(6,2) :: lubglob
-
     logical,dimension(6,2) :: memberin
     integer,dimension(6,2,2,6,2) :: childarray
@@ -288 +286 @@
     integer,dimension(6)              :: pttab, petab, pttab_Child, pttab_Parent = -99
     integer,dimension(6)              :: indmin, indmax
-    integer,dimension(6)              :: indmin_required_p, indmax_required_p
     integer,dimension(6)              :: pttruetab,cetruetab
     logical :: member, memberin
@@ -354 +351 @@
     real                  :: Agrif_Efficiency = 0.7
     integer               :: MaxSearch = 5
-    real(kind=8), dimension(3)    :: Agrif_mind
+    real, dimension(3)    :: Agrif_mind
 !> @}
 !> \name parameters for the interpolation of the child grids
@@ -374 +371 @@
     integer, parameter    :: Agrif_Update_Average = 2           !< average
     integer, parameter    :: Agrif_Update_Full_Weighting = 3    !< full-weighting
+    integer, parameter    :: Agrif_Update_Max = 4               !< Max
 !> @}
 !> \name Raffinement grid switches
@@ -418 +416 @@
 integer function Agrif_Ceiling ( x )
 !---------------------------------------------------------------------------------------------------
-    real(kind=8),intent(in) :: x
+    real,   intent(in) :: x
 !
     integer   :: i
@@ -438 +436 @@
     integer function Agrif_Int(x)
 !---------------------------------------------------------------------------------------------------
-    real(kind=8),intent(in) :: x
+    real,   intent(in) :: x
 !
     integer :: i