Changeset 4325 for LMDZ6/trunk/libf/phylmdiso/isotopes_mod.F90

Timestamp:

Nov 7, 2022, 3:09:43 AM (20 months ago)

Author:

dcugnet

Message:

• simplify the parser usage:
  • the getKey_init routine is now embedded in the readTracersFile routine.
  • the initIsotopes routine is now embedded in the readIsotopesFile routine.
  • the database is now unique, but can be changed using the get/setKeysDBase.
  • the derived types descriptions, originally located in trac_types_mod, are moved to readTracFiles_mod.
  • few checkings moved from infotrac to the routine testIsotopes, contained in the readIsotopesFile function from readTracFiles_mod.
  • the readTracersFiles and readIsotopesFile routines no longer use a tracers/isotopes argument.
• remove tnat and alpha_ideal from infotrac ; use instead getKey to get them where they are used (check_isotopes, dynetat0, iniacademic)
• the trac_type field %Childs is renamed %Children
• move the isoSelect routine and the corresponding variables routine from infotrac and infotrac_phy to readTracFiles_mod
• infotrac_phy routine is now fully independant of the (very similar) routine infotrac (init_infotrac_phy has no arguments left).
• all the explicit keys of the trac_type are now included in the embedded keys database, accessible using the getKey function.
• the getKey/addKey routines are expanded to handle vectors of integers, reals, logicals or strings.
• few subroutines converted into functions with error return value.
• corrections for isotopic tagging tracers mode (to be continued).

File:

• LMDZ6/trunk/libf/phylmdiso/isotopes_mod.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/phylmdiso/isotopes_mod.F90

@@ -133 +133 @@
 
 SUBROUTINE iso_init()
-   USE ioipsl_getin_p_mod, ONLY: getin_p
    USE infotrac_phy,       ONLY: ntiso, niso, getKey
     USE strings_mod,       ONLY: maxlen
@@ -181 +180 @@
    iso_HTO = strIdx(isoName, 'H[3]HO');  CALL msg('iso_HTO='//int2str(iso_HTO), modname)
 
-   ! initialisation
-   ! lecture des parametres isotopiques:
-   ! pour que ca marche en openMP, il faut utiliser getin_p. Car le getin ne peut
-   ! etre appele que par un thread a la fois, et ca pose tout un tas de problemes,
-   ! d'ou tout un tas de magouilles comme dans conf_phys_m. A terme, tout le monde
-   ! lira par getin_p.
+   !--- Initialiaation: reading the isotopic parameters.
    CALL get_in('lambda',     lambda_sursat, 0.004)
    CALL get_in('thumxt1',    thumxt1,       0.75*1.2)
@@ -339 +333 @@
    USE mod_phys_lmdz_omp_data, ONLY :  is_omp_root
    USE mod_phys_lmdz_transfert_para, ONLY : bcast
-   CHARACTER(LEN=*),  INTENT(IN)    :: nam
-   CHARACTER(LEN=*),  INTENT(INOUT) :: val
-   CHARACTER(LEN=*),  INTENT(IN)    :: def
-   LOGICAL, OPTIONAL, INTENT(IN)    :: lDisp
+   CHARACTER(LEN=*),           INTENT(IN)    :: nam
+   CHARACTER(LEN=*),           INTENT(INOUT) :: val
+   CHARACTER(LEN=*), OPTIONAL, INTENT(IN)    :: def
+   LOGICAL,          OPTIONAL, INTENT(IN)    :: lDisp
    LOGICAL :: lD
 !$OMP BARRIER
    IF(is_mpi_root.AND.is_omp_root) THEN
-      val=def; CALL getin(nam,val)
+      IF(PRESENT(def)) val=def; CALL getin(nam,val)
       lD=.TRUE.; IF(PRESENT(lDisp)) lD=lDisp
       IF(lD) CALL msg(TRIM(nam)//' = '//TRIM(val))
-   END IF
-   CALL bcast(val)
+  END IF
+  CALL bcast(val)
 END SUBROUTINE getinp_s
 
@@ -360 +354 @@
    CHARACTER(LEN=*),  INTENT(IN)    :: nam
    INTEGER,           INTENT(INOUT) :: val
-   INTEGER,           INTENT(IN)    :: def
+   INTEGER, OPTIONAL, INTENT(IN)    :: def
    LOGICAL, OPTIONAL, INTENT(IN)    :: lDisp
    LOGICAL :: lD
 !$OMP BARRIER
    IF(is_mpi_root.AND.is_omp_root) THEN
-      val=def; CALL getin(nam,val)
+      IF(PRESENT(def)) val=def; CALL getin(nam,val)
       lD=.TRUE.; IF(PRESENT(lDisp)) lD=lDisp
       IF(lD) CALL msg(TRIM(nam)//' = '//TRIM(int2str(val)))
-   END IF
-   CALL bcast(val)
+  END IF
+  CALL bcast(val)
 END SUBROUTINE getinp_i
 
@@ -379 +373 @@
    CHARACTER(LEN=*),  INTENT(IN)    :: nam
    REAL,              INTENT(INOUT) :: val
-   REAL,              INTENT(IN)    :: def
+   REAL,    OPTIONAL, INTENT(IN)    :: def
    LOGICAL, OPTIONAL, INTENT(IN)    :: lDisp
    LOGICAL :: lD
 !$OMP BARRIER
    IF(is_mpi_root.AND.is_omp_root) THEN
-      Val=def; CALL getin(nam,val)
+      IF(PRESENT(def)) val=def; CALL getin(nam,val)
       lD=.TRUE.; IF(PRESENT(lDisp)) lD=lDisp
       IF(lD) CALL msg(TRIM(nam)//' = '//TRIM(real2str(val)))
-   ENDIF
-   CALL bcast(val)
+  END IF
+  CALL bcast(val)
 END SUBROUTINE getinp_r
 
@@ -398 +392 @@
    CHARACTER(LEN=*),  INTENT(IN)    :: nam
    LOGICAL,           INTENT(INOUT) :: val
-   LOGICAL,           INTENT(IN)    :: def
+   LOGICAL, OPTIONAL, INTENT(IN)    :: def
    LOGICAL, OPTIONAL, INTENT(IN)    :: lDisp
    LOGICAL :: lD
 !$OMP BARRIER
    IF(is_mpi_root.AND.is_omp_root) THEN
-      val=def; CALL getin(nam,val)
+      IF(PRESENT(def)) val=def; CALL getin(nam,val)
       lD=.TRUE.; IF(PRESENT(lDisp)) lD=lDisp
       IF(lD) CALL msg(TRIM(nam)//' = '//TRIM(bool2str(val)))
-   END IF
-   CALL bcast(val)
+  END IF
+  CALL bcast(val)
 END SUBROUTINE getinp_l