From 864ccb7f567ce48e8872bbbabb6cbee989735b3b Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 9 Mar 2018 14:57:42 +0100
Subject: [PATCH] Philippe 09/03/2018: rename dimCDF type to dimCDFl2c to
prevent conflicts with MNH dimCDF datatype
---
LIBTOOLS/tools/lfi2cdf/src/mode_dimlist.f90 | 16 ++++++++--------
LIBTOOLS/tools/lfi2cdf/src/mode_util.f90 | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/LIBTOOLS/tools/lfi2cdf/src/mode_dimlist.f90 b/LIBTOOLS/tools/lfi2cdf/src/mode_dimlist.f90
index d4977136d..26f46ca56 100644
--- a/LIBTOOLS/tools/lfi2cdf/src/mode_dimlist.f90
+++ b/LIBTOOLS/tools/lfi2cdf/src/mode_dimlist.f90
@@ -1,22 +1,22 @@
MODULE mode_dimlist
IMPLICIT NONE
- TYPE dimCDF
+ TYPE dimCDFl2c
CHARACTER(LEN=8) :: name
INTEGER :: len
INTEGER :: id
LOGICAL :: create
INTEGER :: ndims ! number of dim reference (when create=.FALSE.)
- TYPE(dimCDF), POINTER :: next
- END TYPE dimCDF
+ TYPE(dimCDFl2c), POINTER :: next
+ END TYPE dimCDFl2c
- TYPE(dimCDF), POINTER, PRIVATE, SAVE :: dimlist
+ TYPE(dimCDFl2c), POINTER, PRIVATE, SAVE :: dimlist
INTEGER, PRIVATE, SAVE :: nbelt = 0
INTEGER, SAVE :: IDIMX = 0
INTEGER, SAVE :: IDIMY = 0
INTEGER, SAVE :: IDIMZ = 0
LOGICAL, SAVE :: GUSEDIM = .FALSE.
- TYPE(dimCDF), POINTER :: ptdimx, ptdimy, ptdimz
+ TYPE(dimCDFl2c), POINTER :: ptdimx, ptdimy, ptdimz
CONTAINS
@@ -46,7 +46,7 @@ CONTAINS
END FUNCTION size_dimCDF
FUNCTION first_dimCDF()
- TYPE(dimCDF), POINTER :: first_dimCDF
+ TYPE(dimCDFl2c), POINTER :: first_dimCDF
first_dimCDF=>dimlist
@@ -56,10 +56,10 @@ CONTAINS
FUNCTION get_dimCDF(len,ocreate)
INTEGER, INTENT(IN) :: len
LOGICAL, INTENT(IN), OPTIONAL :: ocreate ! when .TRUE. create a dim CELL
- TYPE(dimCDF), POINTER :: get_dimCDF
+ TYPE(dimCDFl2c), POINTER :: get_dimCDF
- TYPE(dimCDF), POINTER :: tmp
+ TYPE(dimCDFl2c), POINTER :: tmp
INTEGER :: count
CHARACTER(LEN=5) :: yndim
LOGICAL :: gforce
diff --git a/LIBTOOLS/tools/lfi2cdf/src/mode_util.f90 b/LIBTOOLS/tools/lfi2cdf/src/mode_util.f90
index 46e3306c1..2f6736900 100644
--- a/LIBTOOLS/tools/lfi2cdf/src/mode_util.f90
+++ b/LIBTOOLS/tools/lfi2cdf/src/mode_util.f90
@@ -38,7 +38,7 @@ MODULE mode_util
TYPE workfield
CHARACTER(LEN=FM_FIELD_SIZE) :: name ! nom du champ
- TYPE(dimCDF), POINTER :: dim
+ TYPE(dimCDFl2c), POINTER :: dim
INTEGER :: id_in = -1, id_out = -1
LOGICAL :: found ! T if found in the input file
LOGICAL :: calc ! T if computed from other variables
@@ -459,7 +459,7 @@ END DO
INTEGER :: compress_level, status
INTEGER :: idx, ji, nbfiles
INTEGER :: kcdf_id
- TYPE(dimCDF), POINTER :: tzdim
+ TYPE(dimCDFl2c), POINTER :: tzdim
INTEGER :: invdims
INTEGER :: type_float
INTEGER, DIMENSION(10) :: ivdims
--
GitLab