Changeset 5184 for LMDZ6/trunk/libf

Timestamp:

Sep 11, 2024, 3:17:07 PM (3 months ago)

Author:

dcugnet

Message:

Few corrections, more is needed to fix the previous commit.

Location:

LMDZ6/trunk/libf

Files:

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

LMDZ6/trunk/libf/misc/readTracFiles_mod.f90

@@ -1159 +1159 @@
   TYPE(isot_type),  TARGET, ALLOCATABLE, OPTIONAL, INTENT(OUT)   ::   isot(:)
   CHARACTER(LEN=*), TARGET,              OPTIONAL, INTENT(IN)    :: iClasses(:)
-  CHARACTER(LEN=maxlen), ALLOCATABLE :: p(:), str1(:), str2(:)       !--- Temporary storage
+  CHARACTER(LEN=maxlen), ALLOCATABLE :: str1(:), str2(:)             !--- Temporary storage
   CHARACTER(LEN=maxlen), ALLOCATABLE :: tname(:), parent(:), dType(:), phase(:), gen0N(:), iCla(:)
   CHARACTER(LEN=maxlen) :: iClass, modname
-  CHARACTER(LEN=1)      :: ph                                           !--- Phase
-  LOGICAL,  ALLOCATABLE :: ll(:)                                      !--- Mask
+  CHARACTER(LEN=1)      :: ph                                        !--- Phase
+  LOGICAL,  ALLOCATABLE :: ll(:)                                     !--- Mask
   INTEGER,  ALLOCATABLE :: iGen(:)
   INTEGER :: ic, ip, iq, ii, it, iz
@@ -2036 +2036 @@
   s = 'key "'//TRIM(strStack(keyn, '/'))//'" of '//TRIM(strStack(tname, MASK=ll))//' is not'
   CALL msg(TRIM(s)//' a boolean: '//TRIM(strStack(svals, MASK=ll)), modname)
+  IF(.NOT.lerr) val = ivals == 1
 END FUNCTION getKeyByIndex_lmmm
 !==============================================================================================================================

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -260 +260 @@
    INTEGER :: iad                                                    !--- Advection scheme number
    INTEGER :: iq, jq, it, nt, im, nm                                 !--- Indexes and temporary variables
-   LOGICAL :: lerr, lInit
+   LOGICAL :: lInit
    TYPE(keys_type), ALLOCATABLE, TARGET :: tra(:)                    !--- Tracers  descriptor as in readTracFiles_mod
    TYPE(tisot),     ALLOCATABLE         :: iso(:)                    !--- Isotopes descriptor as in readTracFiles_mod