Changeset 5748 for LMDZ6/trunk/libf/misc

Timestamp:

Jul 2, 2025, 12:00:08 PM (8 months ago)

Author:

dcugnet

Message:

• Use REAL(KIND=REAL32) and REAL(KIND=REAL64) Iinstead of REAL and DOUBLE PRECISION

to avoid ambiguity problems in generic procedure when reals are promoted to doubles.

• generic "num2str" replaces "str2int", "str2real", "str2dble" and "str2bool" functions.

Location:

LMDZ6/trunk/libf/misc

Files:

• readTracFiles_mod.f90 (modified) (46 diffs)
• strings_mod.f90 (modified) (24 diffs)
• write_field.f90 (modified) (7 diffs)

LMDZ6/trunk/libf/misc/readTracFiles_mod.f90

@@ -3 +3 @@
   USE strings_mod,    ONLY: msg, find, get_in, dispTable, strHead,  strReduce,  strFind, strStack, strIdx, &
              removeComment, cat,       maxlen, checkList, strParse, strReplace, strTail, strCount, reduceExpr, &
-             int2str, str2int, real2str, str2real, bool2str, str2bool
+             num2str, str2int, str2real, str2bool
 
   IMPLICIT NONE
@@ -993 +993 @@
   lerr = .FALSE.
   IF(nam(1) == 'iq') THEN
-    tmp2 = int2str([(iq, iq=1, nq)])
+    tmp2 = num2str([(iq, iq=1, nq)])
     tmp = tmp2
   ELSE
@@ -1086 +1086 @@
       tr(iq)%nqChildren = SIZE(iqDescen)
     END DO
-    CALL addKey('iqDescen', strStack(int2str(iqDescen)), tr(iq)%keys)
+    CALL addKey('iqDescen', strStack(num2str(iqDescen)), tr(iq)%keys)
     CALL addKey('nqDescen',             SIZE(iqDescen),  tr(iq)%keys)
     tr(iq)%iqDescen =      iqDescen
@@ -1328 +1328 @@
       np = SUM([(COUNT(tracers(:)%name == addPhase(i%trac(it), i%phase(ip:ip))), ip=1, npha)])
       lerr = np /= npha
-      CALL msg(TRIM(int2str(np))//' phases instead of '//TRIM(int2str(npha))//' for '//TRIM(i%trac(it)), modname, lerr)
+      CALL msg(TRIM(num2str(np))//' phases instead of '//TRIM(num2str(npha))//' for '//TRIM(i%trac(it)), modname, lerr)
       IF(lerr) RETURN
     END DO
@@ -1334 +1334 @@
       nz = SUM([(COUNT(i%trac == TRIM(i%trac(it))//'_'//i%zone(iz)), iz=1, nzon)])
       lerr = nz /= nzon
-      CALL msg(TRIM(int2str(nz))//' tagging zones instead of '//TRIM(int2str(nzon))//' for '//TRIM(i%trac(it)), modname, lerr)
+      CALL msg(TRIM(num2str(nz))//' tagging zones instead of '//TRIM(num2str(nzon))//' for '//TRIM(i%trac(it)), modname, lerr)
       IF(lerr) RETURN
     END DO
@@ -1375 +1375 @@
    IF(iIso == ixIso) RETURN                                          !--- Nothing to do if the index is already OK
    lerr = iIso<=0 .OR. iIso>SIZE(isotopes)
-   CALL msg('Inconsistent isotopes family index '//TRIM(int2str(iIso))//': should be > 0 and <= '&
-          //TRIM(int2str(SIZE(isotopes)))//'"', ll = lerr .AND. lV)
+   CALL msg('Inconsistent isotopes family index '//TRIM(num2str(iIso))//': should be > 0 and <= '&
+          //TRIM(num2str(SIZE(isotopes)))//'"', ll = lerr .AND. lV)
    IF(lerr) RETURN
    ixIso = iIso                                                      !--- Update currently selected family index
@@ -1424 +1424 @@
   LOGICAL, OPTIONAL, INTENT(IN)    :: lOverWrite
 !------------------------------------------------------------------------------------------------------------------------------
-  CALL addKey_s11(key, int2str(ival), ky, lOverWrite)
+  CALL addKey_s11(key, num2str(ival), ky, lOverWrite)
 END SUBROUTINE addKey_i11
 !==============================================================================================================================
@@ -1433 +1433 @@
   LOGICAL, OPTIONAL, INTENT(IN)    :: lOverWrite
 !------------------------------------------------------------------------------------------------------------------------------
-  CALL addKey_s11(key, real2str(rval), ky, lOverWrite)
+  CALL addKey_s11(key, num2str(rval), ky, lOverWrite)
 END SUBROUTINE addKey_r11
 !==============================================================================================================================
@@ -1442 +1442 @@
   LOGICAL, OPTIONAL, INTENT(IN)    :: lOverWrite
 !------------------------------------------------------------------------------------------------------------------------------
-  CALL addKey_s11(key, bool2str(lval), ky, lOverWrite)
+  CALL addKey_s11(key, num2str(lval), ky, lOverWrite)
 END SUBROUTINE addKey_l11
 !==============================================================================================================================
@@ -1462 +1462 @@
 !------------------------------------------------------------------------------------------------------------------------------
   INTEGER :: itr
-  DO itr = 1, SIZE(ky); CALL addKey_s11(key, int2str(ival), ky(itr), lOverWrite); END DO
+  DO itr = 1, SIZE(ky); CALL addKey_s11(key, num2str(ival), ky(itr), lOverWrite); END DO
 END SUBROUTINE addKey_i1m
 !==============================================================================================================================
@@ -1472 +1472 @@
 !------------------------------------------------------------------------------------------------------------------------------
   INTEGER :: itr
-  DO itr = 1, SIZE(ky); CALL addKey_s11(key, real2str(rval), ky(itr), lOverWrite); END DO
+  DO itr = 1, SIZE(ky); CALL addKey_s11(key, num2str(rval), ky(itr), lOverWrite); END DO
 END SUBROUTINE addKey_r1m
 !==============================================================================================================================
@@ -1482 +1482 @@
 !------------------------------------------------------------------------------------------------------------------------------
   INTEGER :: itr
-  DO itr = 1, SIZE(ky); CALL addKey_s11(key, bool2str(lval), ky(itr), lOverWrite); END DO
+  DO itr = 1, SIZE(ky); CALL addKey_s11(key, num2str(lval), ky(itr), lOverWrite); END DO
 END SUBROUTINE addKey_l1m
 !==============================================================================================================================
@@ -1502 +1502 @@
 !------------------------------------------------------------------------------------------------------------------------------
   INTEGER :: itr
-  DO itr = 1, SIZE(ky); CALL addKey_s11(key, int2str(ival(itr)), ky(itr), lOverWrite); END DO
+  DO itr = 1, SIZE(ky); CALL addKey_s11(key, num2str(ival(itr)), ky(itr), lOverWrite); END DO
 END SUBROUTINE addKey_imm
 !==============================================================================================================================
@@ -1512 +1512 @@
 !------------------------------------------------------------------------------------------------------------------------------
   INTEGER :: itr
-  DO itr = 1, SIZE(ky); CALL addKey_s11(key, real2str(rval(itr)), ky(itr), lOverWrite); END DO
+  DO itr = 1, SIZE(ky); CALL addKey_s11(key, num2str(rval(itr)), ky(itr), lOverWrite); END DO
 END SUBROUTINE addKey_rmm
 !==============================================================================================================================
@@ -1522 +1522 @@
 !------------------------------------------------------------------------------------------------------------------------------
   INTEGER :: itr
-  DO itr = 1, SIZE(ky); CALL addKey_s11(key, bool2str(lval(itr)), ky(itr), lOverWrite); END DO
+  DO itr = 1, SIZE(ky); CALL addKey_s11(key, num2str(lval(itr)), ky(itr), lOverWrite); END DO
 END SUBROUTINE addKey_lmm
 !==============================================================================================================================
@@ -1676 +1676 @@
   LOGICAL :: lD
   lD = .TRUE.; IF(PRESENT(lDisp)) lD = lDisp
-  s = 'key "'//TRIM(strStack(keyn, '/'))//'" for tracer nr. '//TRIM(int2str(itr))
+  s = 'key "'//TRIM(strStack(keyn, '/'))//'" for tracer nr. '//TRIM(num2str(itr))
   lerr = .TRUE.
   IF(lerr .AND. PRESENT(ky))         val = fgetKey(ky)                                   !--- "ky"
@@ -1706 +1706 @@
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen) :: sval, s
-  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, int2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, lDisp=lDisp)
   IF(lerr) RETURN
   val = str2int(sval)
   lerr = val == -HUGE(1)
-  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
+  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(num2str(itr))//' is not'
   CALL msg(TRIM(s)//' an integer: '//TRIM(sval), modname, lerr)
 END FUNCTION getKeyByIndex_im11
@@ -1724 +1724 @@
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen) :: sval, s
-  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, real2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, lDisp=lDisp)
   IF(lerr) RETURN
   val = str2real(sval)
   lerr = val == -HUGE(1.)
-  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
+  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(num2str(itr))//' is not'
   CALL msg(TRIM(s)//' a real: '//TRIM(sval), modname, lerr)
 END FUNCTION getKeyByIndex_rm11
@@ -1743 +1743 @@
   CHARACTER(LEN=maxlen) :: sval, s
   INTEGER               :: ival
-  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, bool2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, lDisp=lDisp)
   IF(lerr) RETURN
   ival = str2bool(sval)
   lerr = ival == -1
-  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
+  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(num2str(itr))//' is not'
   CALL msg(TRIM(s)//' a boolean: '//TRIM(sval), modname, lerr)
   IF(.NOT.lerr) val = ival == 1
@@ -1778 +1778 @@
   CHARACTER(LEN=maxlen)              :: sval, s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11([keyn], sval, itr, ky, int2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11([keyn], sval, itr, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_sm11([keyn], sval, itr, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -1785 +1785 @@
   val = str2int(svals)
   lerr = ANY(val == -HUGE(1))
-  s = 'key "'//TRIM(keyn)//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
+  s = 'key "'//TRIM(keyn)//'" of tracer nr. '//TRIM(num2str(itr))//' is not'
   CALL msg(TRIM(s)//' an integer: '//TRIM(sval), modname, lerr)
 END FUNCTION getKeyByIndex_i1m1
@@ -1799 +1799 @@
   CHARACTER(LEN=maxlen)              :: sval, s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11([keyn], sval, itr, ky, real2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11([keyn], sval, itr, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_sm11([keyn], sval, itr, ky, lDisp=lDisp)
   lerr = strParse(sval, ',', svals)
@@ -1805 +1805 @@
   val = str2real(svals)
   lerr = ANY(val == -HUGE(1.))
-  s = 'key "'//TRIM(keyn)//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
+  s = 'key "'//TRIM(keyn)//'" of tracer nr. '//TRIM(num2str(itr))//' is not'
   CALL msg(TRIM(s)//' a real: '//TRIM(sval), modname, lerr)
 END FUNCTION getKeyByIndex_r1m1
@@ -1820 +1820 @@
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
   INTEGER,               ALLOCATABLE :: ivals(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11([keyn], sval, itr, ky, bool2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11([keyn], sval, itr, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_sm11([keyn], sval, itr, ky, lDisp=lDisp)
   lerr = strParse(sval, ',', svals)
@@ -1826 +1826 @@
   ivals = str2bool(svals)
   lerr = ANY(ivals == -1)
-  s = 'key "'//TRIM(keyn)//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
+  s = 'key "'//TRIM(keyn)//'" of tracer nr. '//TRIM(num2str(itr))//' is not'
   CALL msg(TRIM(s)//' a boolean: '//TRIM(sval), modname, lerr)
   IF(.NOT.lerr) val = ivals == 1
@@ -1856 +1856 @@
   CHARACTER(LEN=maxlen)              :: sval, s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, int2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -1863 +1863 @@
   val = str2int(svals)
   lerr = ANY(val == -HUGE(1))
-  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
+  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(num2str(itr))//' is not'
   CALL msg(TRIM(s)//' an integer: '//TRIM(sval), modname, lerr)
 END FUNCTION getKeyByIndex_imm1
@@ -1877 +1877 @@
   CHARACTER(LEN=maxlen)              :: sval, s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, real2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -1884 +1884 @@
   val = str2real(svals)
   lerr = ANY(val == -HUGE(1.))
-  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
+  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(num2str(itr))//' is not'
   CALL msg(TRIM(s)//' a real: '//TRIM(sval), modname, lerr)
 END FUNCTION getKeyByIndex_rmm1
@@ -1899 +1899 @@
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
   INTEGER,               ALLOCATABLE :: ivals(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, bool2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_sm11(keyn, sval, itr, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -1906 +1906 @@
   ivals = str2bool(svals)
   lerr = ANY(ivals == -1)
-  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(int2str(itr))//' is not'
+  s = 'key "'//TRIM(strStack(keyn, '/'))//'" of tracer nr. '//TRIM(num2str(itr))//' is not'
   CALL msg(TRIM(s)//' a boolean: '//TRIM(sval), modname, lerr)
   IF(.NOT.lerr) val = ivals == 1
@@ -2011 +2011 @@
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:), tname(:)
   LOGICAL,               ALLOCATABLE ::    ll(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, int2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2033 +2033 @@
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:), tname(:)
   LOGICAL,               ALLOCATABLE ::    ll(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, real2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2055 +2055 @@
   LOGICAL,               ALLOCATABLE ::    ll(:)
   INTEGER,               ALLOCATABLE :: ivals(:)
-  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, bool2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByIndex_smmm(keyn, svals, ky, tname, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2164 +2164 @@
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen) :: sval, s
-  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, int2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2181 +2181 @@
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=maxlen) :: sval, s
-  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, real2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2199 +2199 @@
   CHARACTER(LEN=maxlen) :: sval, s
   INTEGER               :: ival
-  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, bool2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2232 +2232 @@
   CHARACTER(LEN=maxlen)              :: sval, s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
-  IF(     PRESENT(def)) lerr = getKeyByName_sm11([keyn], sval, tname, ky, int2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_sm11([keyn], sval, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_sm11([keyn], sval, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2252 +2252 @@
   CHARACTER(LEN=maxlen)              :: sval, s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
-  IF(     PRESENT(def)) lerr = getKeyByName_sm11([keyn], sval, tname, ky, real2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_sm11([keyn], sval, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_sm11([keyn], sval, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2273 +2273 @@
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
   INTEGER,               ALLOCATABLE :: ivals(:)
-  IF(     PRESENT(def)) lerr = getKeyByName_sm11([keyn], sval, tname, ky, bool2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_sm11([keyn], sval, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_sm11([keyn], sval, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2308 +2308 @@
   CHARACTER(LEN=maxlen)              :: sval, s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
-  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, int2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2328 +2328 @@
   CHARACTER(LEN=maxlen)              :: sval, s
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
-  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, real2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2349 +2349 @@
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
   INTEGER,               ALLOCATABLE :: ivals(:)
-  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, bool2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_sm11(keyn, sval, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2447 +2447 @@
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
   LOGICAL,               ALLOCATABLE ::    ll(:)
-  IF(     PRESENT(def)) lerr = getKeyByName_smmm(keyn, svals, tname, ky, int2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_smmm(keyn, svals, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_smmm(keyn, svals, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2467 +2467 @@
   CHARACTER(LEN=maxlen), ALLOCATABLE :: svals(:)
   LOGICAL,               ALLOCATABLE ::    ll(:)
-  IF(     PRESENT(def)) lerr = getKeyByName_smmm(keyn, svals, tname, ky, real2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_smmm(keyn, svals, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_smmm(keyn, svals, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN
@@ -2488 +2488 @@
   LOGICAL,               ALLOCATABLE ::    ll(:)
   INTEGER,               ALLOCATABLE :: ivals(:)
-  IF(     PRESENT(def)) lerr = getKeyByName_smmm(keyn, svals, tname, ky, bool2str(def), lDisp)
+  IF(     PRESENT(def)) lerr = getKeyByName_smmm(keyn, svals, tname, ky, num2str(def), lDisp)
   IF(.NOT.PRESENT(def)) lerr = getKeyByName_smmm(keyn, svals, tname, ky, lDisp=lDisp)
   IF(lerr) RETURN

LMDZ6/trunk/libf/misc/strings_mod.f90

@@ -1 +1 @@
 MODULE strings_mod
+
+  USE, INTRINSIC :: ISO_FORTRAN_ENV, ONLY: REAL64, REAL32
 
   IMPLICIT NONE
@@ -8 +10 @@
   PUBLIC :: strUpper, strTail, strStackm, strParse, strReplace, strFind, find, duplicate, cat
   PUBLIC :: dispTable, dispOutliers, dispNameList
-  PUBLIC :: is_numeric, bool2str, int2str, real2str, dble2str
-  PUBLIC :: reduceExpr, str2bool, str2int, str2real, str2dble
-  PUBLIC :: addQuotes, checkList, removeComment
+  PUBLIC :: is_numeric, num2str, str2bool, str2int, str2real, str2dble
+  PUBLIC :: reduceExpr, addQuotes, checkList, removeComment
 
   INTERFACE get_in;     MODULE PROCEDURE getin_s,  getin_i,  getin_r,  getin_l;  END INTERFACE get_in
+  INTERFACE num2str;    MODULE PROCEDURE bool2str, int2str, real2str, dble2str;  END INTERFACE num2str
   INTERFACE  msg;       MODULE PROCEDURE        msg_1,                    msg_m; END INTERFACE  msg
   INTERFACE strHead;    MODULE PROCEDURE    strHead_1,                strHead_m; END INTERFACE strHead
@@ -21 +23 @@
   INTERFACE strCount;   MODULE PROCEDURE  strCount_m1, strCount_11, strCount_1m; END INTERFACE strCount
   INTERFACE strReplace; MODULE PROCEDURE strReplace_1,             strReplace_m; END INTERFACE strReplace
-  INTERFACE cat;        MODULE PROCEDURE  horzcat_s00, horzcat_i00, horzcat_r00,  & !horzcat_d00, &
-                                          horzcat_s10, horzcat_i10, horzcat_r10,  & !horzcat_d10, &
-                                          horzcat_s11, horzcat_i11, horzcat_r11,  & !horzcat_d11, &
-                                          horzcat_s21, horzcat_i21, horzcat_r21; END INTERFACE cat !horzcat_d21
-  INTERFACE strFind;      MODULE PROCEDURE strFind_1, strFind_m;                 END INTERFACE strFind
+  INTERFACE cat; MODULE PROCEDURE  horzcat_s00, horzcat_i00, horzcat_r00, horzcat_d00, &
+                                   horzcat_s10, horzcat_i10, horzcat_r10, horzcat_d10, &
+                                   horzcat_s11, horzcat_i11, horzcat_r11, horzcat_d11, &
+                                   horzcat_s21, horzcat_i21, horzcat_r21;  END INTERFACE cat !horzcat_d21
+  INTERFACE strFind;      MODULE PROCEDURE strFind_1, strFind_m;           END INTERFACE strFind
   INTERFACE find;         MODULE PROCEDURE strFind_1, strFind_m, intFind_1, intFind_m, booFind; END INTERFACE find
   INTERFACE duplicate;    MODULE PROCEDURE dupl_s, dupl_i, dupl_r, dupl_l; END INTERFACE duplicate
@@ -68 +70 @@
   INTEGER,          INTENT(IN)    :: def
   val = def; CALL getin(nam, val)
-  IF(val/=def) WRITE(lunout,*)TRIM(nam)//' = '//TRIM(int2str(val))
+  IF(val/=def) WRITE(lunout,*)TRIM(nam)//' = '//TRIM(num2str(val))
 END SUBROUTINE getin_i
 !==============================================================================================================================
@@ -78 +80 @@
   REAL,             INTENT(IN)    :: def
   val = def; CALL getin(nam, val)
-  IF(val/=def) WRITE(lunout,*)TRIM(nam)//' = '//TRIM(real2str(val))
+  IF(val/=def) WRITE(lunout,*)TRIM(nam)//' = '//TRIM(num2str(val))
 END SUBROUTINE getin_r
 !==============================================================================================================================
@@ -88 +90 @@
   LOGICAL,          INTENT(IN)    :: def
   val = def; CALL getin(nam, val)
-  IF(val.NEQV.def) WRITE(lunout,*)TRIM(nam)//' = '//TRIM(bool2str(val))
+  IF(val.NEQV.def) WRITE(lunout,*)TRIM(nam)//' = '//TRIM(num2str(val))
 END SUBROUTINE getin_l
 !==============================================================================================================================
@@ -953 +955 @@
 FUNCTION horzcat_r00(r0, r1, r2, r3, r4, r5, r6, r7, r8, r9) RESULT(out)
   IMPLICIT NONE
-  REAL,                   INTENT(IN) :: r0
-  REAL, OPTIONAL, TARGET, INTENT(IN) :: r1, r2, r3, r4, r5, r6, r7, r8, r9
-  REAL, ALLOCATABLE :: out(:)
-  REAL, POINTER     :: r
+  REAL(KIND=REAL32),                   INTENT(IN) :: r0
+  REAL(KIND=REAL32), OPTIONAL, TARGET, INTENT(IN) :: r1, r2, r3, r4, r5, r6, r7, r8, r9
+  REAL(KIND=REAL32), ALLOCATABLE :: out(:)
+  REAL(KIND=REAL32), POINTER :: r
   INTEGER           :: ncol, iv
   LOGICAL           :: pre(9)
@@ -975 +977 @@
 FUNCTION horzcat_r10(r0, r1, r2, r3, r4, r5, r6, r7, r8, r9) RESULT(out)
   IMPLICIT NONE
-  REAL,           INTENT(IN) :: r0(:), r1
-  REAL, OPTIONAL, INTENT(IN) :: r2, r3, r4, r5, r6, r7, r8, r9
-  REAL, ALLOCATABLE :: out(:), tmp(:)
+  REAL(KIND=REAL32),           INTENT(IN) :: r0(:), r1
+  REAL(KIND=REAL32), OPTIONAL, INTENT(IN) :: r2, r3, r4, r5, r6, r7, r8, r9
+  REAL(KIND=REAL32), ALLOCATABLE :: out(:), tmp(:)
   INTEGER :: nc
   nc  = SIZE(r0)
@@ -987 +989 @@
 FUNCTION horzcat_r11(r0, r1, r2, r3, r4, r5, r6, r7, r8, r9) RESULT(out)
   IMPLICIT NONE
-  REAL,                   INTENT(IN) :: r0(:)
-  REAL, OPTIONAL, TARGET, INTENT(IN) :: r1(:), r2(:), r3(:), r4(:), r5(:), r6(:), r7(:), r8(:), r9(:)
-  REAL, ALLOCATABLE :: out(:,:)
-  REAL, POINTER     :: r(:)
-  INTEGER           :: nrow, ncol, iv, n
-  LOGICAL           :: pre(9)
+  REAL(KIND=REAL32),                   INTENT(IN) :: r0(:)
+  REAL(KIND=REAL32), OPTIONAL, TARGET, INTENT(IN) :: r1(:), r2(:), r3(:), r4(:), r5(:), r6(:), r7(:), r8(:), r9(:)
+  REAL(KIND=REAL32), ALLOCATABLE :: out(:,:)
+  REAL(KIND=REAL32), POINTER     :: r(:)
+  INTEGER :: nrow, ncol, iv, n
+  LOGICAL :: pre(9)
 !------------------------------------------------------------------------------------------------------------------------------
   pre(:) = [PRESENT(r1),PRESENT(r2),PRESENT(r3),PRESENT(r4),PRESENT(r5),PRESENT(r6),PRESENT(r7),PRESENT(r8),PRESENT(r9)]
@@ -1012 +1014 @@
 FUNCTION horzcat_r21(r0, r1, r2, r3, r4, r5, r6, r7, r8, r9) RESULT(out)
   IMPLICIT NONE
-  REAL,           INTENT(IN) :: r0(:,:), r1(:)
-  REAL, OPTIONAL, INTENT(IN) :: r2(:), r3(:), r4(:), r5(:), r6(:), r7(:), r8(:), r9(:)
-  REAL, ALLOCATABLE :: out(:,:), tmp(:,:)
+  REAL(KIND=REAL32),           INTENT(IN) :: r0(:,:), r1(:)
+  REAL(KIND=REAL32), OPTIONAL, INTENT(IN) :: r2(:), r3(:), r4(:), r5(:), r6(:), r7(:), r8(:), r9(:)
+  REAL(KIND=REAL32), ALLOCATABLE :: out(:,:), tmp(:,:)
   INTEGER :: nc
   nc  = SIZE(r0, 2)
@@ -1024 +1026 @@
 FUNCTION horzcat_d00(d0, d1, d2, d3, d4, d5, d6, d7, d8, d9) RESULT(out)
   IMPLICIT NONE
-  DOUBLE PRECISION,                   INTENT(IN) :: d0
-  DOUBLE PRECISION, OPTIONAL, TARGET, INTENT(IN) :: d1, d2, d3, d4, d5, d6, d7, d8, d9
-  DOUBLE PRECISION, ALLOCATABLE :: out(:)
-  DOUBLE PRECISION, POINTER     :: d
+  REAL(KIND=REAL64),                   INTENT(IN) :: d0
+  REAL(KIND=REAL64), OPTIONAL, TARGET, INTENT(IN) :: d1, d2, d3, d4, d5, d6, d7, d8, d9
+  REAL(KIND=REAL64), ALLOCATABLE :: out(:)
+  REAL(KIND=REAL64), POINTER     :: d
   INTEGER                       :: ncol, iv
   LOGICAL                       :: pre(9)
@@ -1046 +1048 @@
 FUNCTION horzcat_d10(d0, d1, d2, d3, d4, d5, d6, d7, d8, d9) RESULT(out)
   IMPLICIT NONE
-  DOUBLE PRECISION,           INTENT(IN) :: d0(:), d1
-  DOUBLE PRECISION, OPTIONAL, INTENT(IN) :: d2, d3, d4, d5, d6, d7, d8, d9
-  DOUBLE PRECISION, ALLOCATABLE :: out(:), tmp(:)
+  REAL(KIND=REAL64),           INTENT(IN) :: d0(:), d1
+  REAL(KIND=REAL64), OPTIONAL, INTENT(IN) :: d2, d3, d4, d5, d6, d7, d8, d9
+  REAL(KIND=REAL64), ALLOCATABLE :: out(:), tmp(:)
   INTEGER :: nc
   nc = SIZE(d0)
@@ -1058 +1060 @@
 FUNCTION horzcat_d11(d0, d1, d2, d3, d4, d5, d6, d7, d8, d9) RESULT(out)
   IMPLICIT NONE
-  DOUBLE PRECISION,                   INTENT(IN) :: d0(:)
-  DOUBLE PRECISION, OPTIONAL, TARGET, INTENT(IN) :: d1(:), d2(:), d3(:), d4(:), d5(:), d6(:), d7(:), d8(:), d9(:)
-  DOUBLE PRECISION, ALLOCATABLE :: out(:,:)
-  DOUBLE PRECISION, POINTER     :: d(:)
+  REAL(KIND=REAL64),                   INTENT(IN) :: d0(:)
+  REAL(KIND=REAL64), OPTIONAL, TARGET, INTENT(IN) :: d1(:), d2(:), d3(:), d4(:), d5(:), d6(:), d7(:), d8(:), d9(:)
+  REAL(KIND=REAL64), ALLOCATABLE :: out(:,:)
+  REAL(KIND=REAL64), POINTER     :: d(:)
   INTEGER                       :: nrow, ncol, iv, n
   LOGICAL                       :: pre(9)
@@ -1082 +1084 @@
 FUNCTION horzcat_d21(d0, d1, d2, d3, d4, d5, d6, d7, d8, d9) RESULT(out)
   IMPLICIT NONE
-  DOUBLE PRECISION,           INTENT(IN) :: d0(:,:), d1(:)
-  DOUBLE PRECISION, OPTIONAL, INTENT(IN) :: d2(:), d3(:), d4(:), d5(:), d6(:), d7(:), d8(:), d9(:)
-  DOUBLE PRECISION, ALLOCATABLE :: out(:,:), tmp(:,:)
+  REAL(KIND=REAL64),           INTENT(IN) :: d0(:,:), d1(:)
+  REAL(KIND=REAL64), OPTIONAL, INTENT(IN) :: d2(:), d3(:), d4(:), d5(:), d6(:), d7(:), d8(:), d9(:)
+  REAL(KIND=REAL64), ALLOCATABLE :: out(:,:), tmp(:,:)
   INTEGER :: nc
   nc  = SIZE(d0, 2)
@@ -1159 +1161 @@
     d(1,ic) = TRIM(titles(ic))
     SELECT CASE(p(ic:ic))
-      CASE('s'); d(2:nmx,ic) =          s(:,is)     ; is = is + 1
-      CASE('i'); d(2:nmx,ic) =  int2str(i(:,ii)    ); ii = ii + 1
-      CASE('r'); d(2:nmx,ic) = real2str(r(:,ir),rFm); ir = ir + 1
+      CASE('s'); d(2:nmx,ic) =         s(:,is)     ; is = is + 1
+      CASE('i'); d(2:nmx,ic) = num2str(i(:,ii)    ); ii = ii + 1
+      CASE('r'); d(2:nmx,ic) = num2str(r(:,ir),rFm); ir = ir + 1
     END SELECT
   END DO
@@ -1260 +1262 @@
     d(1,ic) = TRIM(titles(ic))
     SELECT CASE(p(ic:ic))
-      CASE('s'); d(2:nrow,ic) =          s(:,is)     ; is = is + 1
-      CASE('i'); d(2:nrow,ic) =  int2str(i(:,ii)    ); ii = ii + 1
-      CASE('r'); d(2:nrow,ic) = real2str(r(:,ir),rFm); ir = ir + 1
+      CASE('s'); d(2:nrow,ic) =         s(:,is)     ; is = is + 1
+      CASE('i'); d(2:nrow,ic) = num2str(i(:,ii)    ); ii = ii + 1
+      CASE('r'); d(2:nrow,ic) = num2str(r(:,ir),rFm); ir = ir + 1
     END SELECT
   END DO
@@ -1362 +1364 @@
     IF(.NOT.ANY(m)) CYCLE                                            !--- no outlayers for tracer "itr"
     v = TRIM(vnm(MIN(itr,SIZE(vnm))))//'('//TRIM(s)                  !--- "<name>("
-    IF(nv == 1) ttl(rk) = TRIM(v)//','//int2str(itr)//')'            !--- "<name>(i,j,itr)" (single name)
+    IF(nv == 1) ttl(rk) = TRIM(v)//','//num2str(itr)//')'            !--- "<name>(i,j,itr)" (single name)
     IF(nv /= 1) ttl(rk) = TRIM(v)//')'                               !--- "<nam(itr)>(i,j)" (one name each table/itr index)
     IF(rk==2) lerr = dispTable('ir',  ttl, i=cat(PACK(ki,m)),            r=cat(PACK(a(ib:ie),m)), &
@@ -1485 +1487 @@
   CHARACTER(LEN=*),      INTENT(IN)  :: str
   CHARACTER(LEN=*),      INTENT(OUT) :: val
-  DOUBLE PRECISION,      ALLOCATABLE :: vl(:)
+  REAL(KIND=REAL64),     ALLOCATABLE :: vl(:)
   INTEGER,               ALLOCATABLE :: id(:)
   CHARACTER(LEN=maxlen), ALLOCATABLE :: ky(:)
@@ -1491 +1493 @@
 !------------------------------------------------------------------------------------------------------------------------------
   CHARACTER(LEN=1024) :: s
-  DOUBLE PRECISION :: v, vm, vp
+  REAL(KIND=REAL64) :: v, vm, vp
   INTEGER      :: i, ni, io
   lerr = .FALSE.
@@ -1500 +1502 @@
   IF(lerr) RETURN                                                              !--- Problem with the parsing
   vl = str2dble(ky)                                                            !--- Conversion to doubles
-  lerr = ANY(vl >= HUGE(1.d0))
+  lerr = ANY(vl >= HUGE(1._REAL64))
   CALL msg('Some values are non-numeric in: '//TRIM(s), ll=lerr)
   IF(lerr) RETURN                                                              !--- Non-numerical values found
@@ -1519 +1521 @@
     END DO
   END DO
-  val = dble2str(vl(1))
+  val = num2str(vl(1))
 
 END FUNCTION reduceExpr_basic
@@ -1581 +1583 @@
 END FUNCTION str2int
 !==============================================================================================================================
-ELEMENTAL REAL FUNCTION str2real(str) RESULT(out)
+ELEMENTAL REAL(KIND=REAL32) FUNCTION str2real(str) RESULT(out)
   IMPLICIT NONE
   CHARACTER(LEN=*), INTENT(IN) :: str
   INTEGER :: ierr
   READ(str,*,IOSTAT=ierr) out
-  IF(ierr/=0) out = -HUGE(1.)
+  IF(ierr/=0) out = -HUGE(1._REAL32)
 END FUNCTION str2real
 !==============================================================================================================================
-ELEMENTAL DOUBLE PRECISION FUNCTION str2dble(str) RESULT(out)
+ELEMENTAL REAL(KIND=REAL64) FUNCTION str2dble(str) RESULT(out)
   IMPLICIT NONE
   CHARACTER(LEN=*), INTENT(IN) :: str
   INTEGER :: ierr
   READ(str,*,IOSTAT=ierr) out
-  IF(ierr/=0) out = -HUGE(1.d0)
+  IF(ierr/=0) out = -HUGE(1._REAL64)
 END FUNCTION str2dble
 !==============================================================================================================================
@@ -1617 +1619 @@
 ELEMENTAL CHARACTER(LEN=maxlen) FUNCTION real2str(r,fmt) RESULT(out)
   IMPLICIT NONE
-  REAL,                       INTENT(IN) :: r
+  REAL(KIND=REAL32),          INTENT(IN) :: r
   CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: fmt
 !------------------------------------------------------------------------------------------------------------------------------
@@ -1627 +1629 @@
 ELEMENTAL CHARACTER(LEN=maxlen) FUNCTION dble2str(d,fmt) RESULT(out)
   IMPLICIT NONE
-  DOUBLE PRECISION,           INTENT(IN) :: d
+  REAL(KIND=REAL64),          INTENT(IN) :: d
   CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: fmt
 !------------------------------------------------------------------------------------------------------------------------------

LMDZ6/trunk/libf/misc/write_field.f90

@@ -5 +5 @@
   USE netcdf, ONLY: nf90_sync, nf90_put_var, nf90_enddef, nf90_def_dim, nf90_unlimited, &
           nf90_clobber, nf90_create, nf90_def_var, nf90_double
-  USE strings_mod, ONLY: int2str
+  USE strings_mod, ONLY: num2str
   IMPLICIT NONE; PRIVATE
   PUBLIC WriteField
@@ -156 +156 @@
     write (id,'("----- Field '//name//'",//)')
     Dim=shape(Field)
-    MaxLen=int2str(len(trim(int2str(Dim(1)))))
-    ColumnSize=20+6+3+len(trim(int2str(Dim(1))))
+    MaxLen=num2str(len(trim(num2str(Dim(1)))))
+    ColumnSize=20+6+3+len(trim(num2str(Dim(1))))
     Nb=0
     Pos=2
@@ -164 +164 @@
       
       if (MOD(nb,NbCol)==0) then
-        form='(t'//trim(int2str(pos))// ',i'//trim(MaxLen) //'," ---> ",g22.16,/)'
+        form='(t'//trim(num2str(pos))// ',i'//trim(MaxLen) //'," ---> ",g22.16,/)'
         Pos=2
       else
-        form='(t'//trim(int2str(pos))// ',i'//trim(MaxLen) //'," ---> ",g22.16," | ",)'
+        form='(t'//trim(num2str(pos))// ',i'//trim(MaxLen) //'," ---> ",g22.16," | ",)'
         Pos=Pos+ColumnSize
       endif
@@ -198 +198 @@
     
     Dim=shape(Field)
-    offset=len(trim(int2str(Dim(1))))+len(trim(int2str(Dim(2))))+3
+    offset=len(trim(num2str(Dim(1))))+len(trim(num2str(Dim(2))))+3
     ColumnSize=20+6+3+offset
 
@@ -210 +210 @@
       
         if (MOD(nb,NbCol)==0) then
-          form='(t'//trim(int2str(pos))//            &
-               ',"('//trim(int2str(j))//','          &
-                    //trim(int2str(i))//')",t'       & 
-                    //trim(int2str(pos+offset))     &    
+          form='(t'//trim(num2str(pos))//            &
+               ',"('//trim(num2str(j))//','          &
+                    //trim(num2str(i))//')",t'       & 
+                    //trim(num2str(pos+offset))     &    
                     //'," ---> ",g22.16,/)'
           Pos=2
         else
-          form='(t'//trim(int2str(pos))//            &
-               ',"('//trim(int2str(j))//','          &
-                    //trim(int2str(i))//')",t'       & 
-                    //trim(int2str(pos+offset))     &    
+          form='(t'//trim(num2str(pos))//            &
+               ',"('//trim(num2str(j))//','          &
+                    //trim(num2str(i))//')",t'       & 
+                    //trim(num2str(pos+offset))     &    
                     //'," ---> ",g22.16," | ")'
           Pos=Pos+ColumnSize
@@ -256 +256 @@
     
     Dim=shape(Field)
-    offset=len(trim(int2str(Dim(1))))+len(trim(int2str(Dim(2))))+len(trim(int2str(Dim(3))))+4
+    offset=len(trim(num2str(Dim(1))))+len(trim(num2str(Dim(2))))+len(trim(num2str(Dim(3))))+4
     ColumnSize=22+6+3+offset
 
@@ -273 +273 @@
       
           if (MOD(nb,NbCol)==0) then
-            form='(t'//trim(int2str(pos))//            &
-                 ',"('//trim(int2str(k))//','          &
-                      //trim(int2str(j))//','          &
-                      //trim(int2str(i))//')",t'       & 
-                      //trim(int2str(pos+offset))      &    
+            form='(t'//trim(num2str(pos))//            &
+                 ',"('//trim(num2str(k))//','          &
+                      //trim(num2str(j))//','          &
+                      //trim(num2str(i))//')",t'       & 
+                      //trim(num2str(pos+offset))      &    
                       //'," ---> ",g22.16,/)'
            Pos=2
           else
-            form='(t'//trim(int2str(pos))//            &
-                 ',"('//trim(int2str(k))//','          &
-                      //trim(int2str(j))//','          &
-                      //trim(int2str(i))//')",t'       & 
-                      //trim(int2str(pos+offset))      &    
+            form='(t'//trim(num2str(pos))//            &
+                 ',"('//trim(num2str(k))//','          &
+                      //trim(num2str(j))//','          &
+                      //trim(num2str(i))//')",t'       & 
+                      //trim(num2str(pos+offset))      &    
                       //'," ---> ",g22.16," | ")'
 ! d�pent de l'impl�mention, sur compaq, c'est necessaire