Changeset 5003

Timestamp:

Jul 1, 2024, 3:02:29 PM (3 months ago)

Author:

dcugnet

Message:

• Modifiy some horzcat* routines: gfortran does not like empty arrays (ie with one null dimension) in arrays constructors (ifort does)
• Remove unused variables

Location:

LMDZ6/trunk/libf

Files:

• dyn3d_common/infotrac.F90 (modified) (2 diffs)
• misc/readTracFiles_mod.f90 (modified) (9 diffs)
• misc/strings_mod.F90 (modified) (9 diffs)
• phylmd/infotrac_phy.F90 (modified) (1 diff)

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -156 +156 @@
    INTEGER :: nqtrue                                                 !--- Tracers nb from tracer.def (no higher order moments)
    INTEGER :: iad                                                    !--- Advection scheme number
-   INTEGER :: ic, iq, jq, it, nt, im, nm, iz, k                      !--- Indexes and temporary variables
+   INTEGER :: iq, jq, nt, im, nm                                     !--- Indexes and temporary variables
    LOGICAL :: lerr, ll
-   CHARACTER(LEN=1) :: p
    TYPE(trac_type), ALLOCATABLE, TARGET :: ttr(:)
    TYPE(trac_type), POINTER             :: t1, t(:)
-   INTEGER :: ierr
    CHARACTER(LEN=maxlen),   ALLOCATABLE :: types_trac(:)  !--- Keyword for tracers type(s), parsed version
 
@@ -245 +243 @@
       ttr(1+nqo:nqCO2+nqo   )%component = 'co2i'
       ttr(1+nqo+nqCO2:nqtrue)%component = 'inca'
-      ttr(1+nqo      :nqtrue)%name      = [('CO2     ', k=1, nqCO2), solsym_inca]
+      ttr(1+nqo      :nqtrue)%name      = [('CO2     ', iq=1, nqCO2), solsym_inca]
       ttr(1+nqo+nqCO2:nqtrue)%parent    = tran0
       ttr(1+nqo+nqCO2:nqtrue)%phase     = 'g'

LMDZ6/trunk/libf/misc/readTracFiles_mod.f90

@@ -599 +599 @@
   INTEGER                            :: iq, jq, ig
   CHARACTER(LEN=maxlen), ALLOCATABLE :: parent(:), name(:)
-  CHARACTER(LEN=maxlen) :: gen0N
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen) :: modname
@@ -723 +722 @@
   INTEGER,               ALLOCATABLE ::  i0(:), iGen(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:), gen0N(:), phase(:), parents(:), dType(:)
-  CHARACTER(LEN=maxlen)              ::  nam,     gen0Nm,   pha,      parent,      typ
+  CHARACTER(LEN=maxlen)              ::  nam,     gen0Nm,   pha,      parent
   CHARACTER(LEN=1) :: p
   INTEGER :: ip, np, iq, jq, nq, it, nt, nc, i, n
@@ -927 +926 @@
   TYPE(trac_type), ALLOCATABLE, INTENT(OUT) ::       tr(:)
   LOGICAL,            OPTIONAL, INTENT(IN)  :: lRename               !--- .TRUE.: add a section suffix to identical names
-  CHARACTER(LEN=maxlen)  :: tnam, tnam_new, modname
+  CHARACTER(LEN=maxlen)  :: tnam_new, modname
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:), parent(:), comp(:)
   INTEGER :: iq, jq, is
@@ -988 +987 @@
   CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: snam
   INTEGER :: m
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: s0(:,:), n0(:)
+  CHARACTER(LEN=maxlen), ALLOCATABLE :: n0(:)
   CHARACTER(LEN=maxlen) :: nm
   lerr = .FALSE.
@@ -1061 +1060 @@
   INTEGER,               ALLOCATABLE :: iqDescen(:), ix(:), iy(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tnames(:), parent(:)
-  INTEGER,       DIMENSION(SIZE(tr)) :: iqParent, iGen, nqChildren, nqDescen
+  INTEGER,       DIMENSION(SIZE(tr)) :: iqParent, iGen
   lerr = getKey('name',   tnames, tr%keys); IF(lerr) RETURN          !--- Names
   lerr = getKey('parent', parent, tr%keys); IF(lerr) RETURN          !--- Parents
@@ -1321 +1320 @@
 !------------------------------------------------------------------------------------------------------------------------------
   INTEGER :: ix, it, ip, np, iz, nz, npha, nzon
-  CHARACTER(LEN=maxlen) :: s
   TYPE(isot_type), POINTER :: i
   DO ix = 1, nbIso
@@ -1841 +1839 @@
   LOGICAL,                  OPTIONAL, INTENT(IN)  :: lDisp
 !------------------------------------------------------------------------------------------------------------------------------
-  CHARACTER(LEN=maxlen)              :: sval
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
+  CHARACTER(LEN=maxlen) :: sval
   lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, def, lDisp); IF(lerr) RETURN
   lerr = strParse(sval, ',', val)
@@ -2295 +2292 @@
   LOGICAL,                  OPTIONAL, INTENT(IN)  :: lDisp
 !------------------------------------------------------------------------------------------------------------------------------
-  CHARACTER(LEN=maxlen)              :: sval
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
+  CHARACTER(LEN=maxlen) :: sval
   lerr = getKeyByName_sm11(keyn, sval, tname, ky, def, lDisp); IF(lerr) RETURN
   lerr = strParse(sval, ',', val)
@@ -2487 +2483 @@
   LOGICAL,         OPTIONAL, INTENT(IN)  :: lDisp
 !------------------------------------------------------------------------------------------------------------------------------
-  CHARACTER(LEN=maxlen) :: s, sval
+  CHARACTER(LEN=maxlen) :: s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
   LOGICAL,               ALLOCATABLE ::    ll(:)

LMDZ6/trunk/libf/misc/strings_mod.F90

@@ -621 +621 @@
   IF(PRESENT(vals)) CALL parseV(vals)                                !--- PARSE <key>=<val> PAIRS
   IF(PRESENT(n)) n = nk                                              !--- RETURN THE NUMBER OF KEYS
-  IF(PRESENT(vals)) &
-print*,'key ; val = '//TRIM(strStack(keys))//' ; '//TRIM(strStack(vals))
 
 CONTAINS
@@ -814 +812 @@
   nc = SIZE(s0)
   tmp = horzcat_s00(s0(nc), s1, s2, s3, s4, s5, s6, s7, s8, s9)
-  out = [s0(1:nc-1), tmp]
+  IF(nc == 1) out = tmp
+  IF(nc /= 1) out = [s0(1:nc-1), tmp]
 END FUNCTION horzcat_s10
 !==============================================================================================================================
@@ -850 +849 @@
   nc  = SIZE(s0, 2)
   tmp = horzcat_s11(s0(:,nc), s1, s2, s3, s4, s5, s6, s7, s8, s9)
-  out = RESHAPE([PACK(s0(:,1:nc-1), .TRUE.), PACK(tmp, .TRUE.)], SHAPE=[SIZE(s0, 1), nc + SIZE(tmp, 2)-1])
+  IF(nc == 1) out = tmp
+  IF(nc /= 1) out = RESHAPE([PACK(s0(:,1:nc-1), .TRUE.), PACK(tmp, .TRUE.)], SHAPE=[SIZE(s0, 1), nc + SIZE(tmp, 2)-1])
 END FUNCTION horzcat_s21
 !==============================================================================================================================
@@ -883 +883 @@
   nc = SIZE(i0)
   tmp = horzcat_i00(i0(nc), i1, i2, i3, i4, i5, i6, i7, i8, i9)
-  out = [i0(1:nc-1), tmp]
+  IF(nc == 1) out = tmp
+  IF(nc /= 1) out = [i0(1:nc-1), tmp]
 END FUNCTION horzcat_i10
 !==============================================================================================================================
@@ -919 +920 @@
   nc  = SIZE(i0, 2)
   tmp = horzcat_i11(i0(:,nc), i1, i2, i3, i4, i5, i6, i7, i8, i9)
-  out = RESHAPE([PACK(i0(:,1:nc-1), .TRUE.), PACK(tmp, .TRUE.)], SHAPE=[SIZE(i0, 1), nc + SIZE(tmp, 2)-1])
+  IF(nc == 1) out = tmp
+  IF(nc /= 1) out = RESHAPE([PACK(i0(:,1:nc-1), .TRUE.), PACK(tmp, .TRUE.)], SHAPE=[SIZE(i0, 1), nc + SIZE(tmp, 2)-1])
 END FUNCTION horzcat_i21
 !==============================================================================================================================
@@ -952 +954 @@
   nc  = SIZE(r0)
   tmp = horzcat_r00(r0(nc), r1, r2, r3, r4, r5, r6, r7, r8, r9)
-  out = [r0(1:nc-1), tmp]
+  IF(nc == 1) out = tmp
+  IF(nc /= 1) out = [r0(1:nc-1), tmp]
 END FUNCTION horzcat_r10
 !==============================================================================================================================
@@ -988 +991 @@
   nc  = SIZE(r0, 2)
   tmp = horzcat_r11(r0(:,nc), r1, r2, r3, r4, r5, r6, r7, r8, r9)
-  out = RESHAPE([PACK(r0(:,1:nc-1), .TRUE.), PACK(tmp, .TRUE.)], SHAPE=[SIZE(r0, 1), nc + SIZE(tmp, 2)-1])
+  IF(nc == 1) out = tmp
+  IF(nc /= 1) out = RESHAPE([PACK(r0(:,1:nc-1), .TRUE.), PACK(tmp, .TRUE.)], SHAPE=[SIZE(r0, 1), nc + SIZE(tmp, 2)-1])
 END FUNCTION horzcat_r21
 !==============================================================================================================================
@@ -1021 +1025 @@
   nc = SIZE(d0)
   tmp = horzcat_d00(d0(nc), d1, d2, d3, d4, d5, d6, d7, d8, d9)
-  out = [d0(1:nc-1), tmp]
+  IF(nc == 1) out = tmp
+  IF(nc /= 1) out = [d0(1:nc-1), tmp]
 END FUNCTION horzcat_d10
 !==============================================================================================================================
@@ -1056 +1061 @@
   nc  = SIZE(d0, 2)
   tmp = horzcat_d11(d0(:,nc), d1, d2, d3, d4, d5, d6, d7, d8, d9)
-  out = RESHAPE([PACK(d0(:,1:nc-1), .TRUE.), PACK(tmp, .TRUE.)], SHAPE=[SIZE(d0, 1), nc + SIZE(tmp, 2)-1])
+  IF(nc == 1) out = tmp
+  IF(nc /= 1) out = RESHAPE([PACK(d0(:,1:nc-1), .TRUE.), PACK(tmp, .TRUE.)], SHAPE=[SIZE(d0, 1), nc + SIZE(tmp, 2)-1])
 END FUNCTION horzcat_d21
 !==============================================================================================================================

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -178 +178 @@
    INTEGER :: nqtrue                                                 !--- Tracers nb from tracer.def (no higher order moments)
    INTEGER :: iad                                                    !--- Advection scheme number
-   INTEGER :: ic, iq, jq, it, nt, im, nm, iz, k                      !--- Indexes and temporary variables
-   LOGICAL :: lerr, ll, lInit
-   CHARACTER(LEN=1) :: p
+   INTEGER :: iq, jq, nt, im, nm, k                                 !--- Indexes and temporary variables
+   LOGICAL :: lerr, lInit
    TYPE(trac_type), ALLOCATABLE, TARGET :: ttr(:)
    TYPE(trac_type), POINTER             :: t1, t(:)
-   INTEGER :: ierr
    CHARACTER(LEN=maxlen),   ALLOCATABLE :: types_trac(:)  !--- Keyword for tracers type(s), parsed version