Changeset 5182 for LMDZ6/branches/Amaury_dev/libf/dyn3d_common

Timestamp:

Sep 10, 2024, 4:25:29 PM (2 months ago)

Author:

abarral

Message:

(WIP) Replace REPROBUS CPP KEY by logical
properly name modules

Location:

LMDZ6/branches/Amaury_dev/libf/dyn3d_common

Files:

• initdynav.F90 (modified) (1 diff)
• inithist.F90 (modified) (1 diff)
• iso_verif_dyn.f90 (modified) (1 diff)
• lmdz_infotrac.f90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/dyn3d_common/infotrac.F90) (6 diffs)
• test_period.f90 (modified) (1 diff)
• writedynav.F90 (modified) (1 diff)
• writehist.f90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initdynav.F90

@@ -4 +4 @@
 
   USE IOIPSL
-  USE infotrac, ONLY: nqtot
+  USE lmdz_infotrac, ONLY: nqtot
   USE com_io_dyn_mod, ONLY: histaveid, histvaveid, histuaveid, &
           dynhistave_file, dynhistvave_file, dynhistuave_file

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inithist.F90

@@ -4 +4 @@
 
   USE IOIPSL
-  USE infotrac, ONLY: nqtot
+  USE lmdz_infotrac, ONLY: nqtot
   USE com_io_dyn_mod, ONLY: histid, histvid, histuid, &
           dynhist_file, dynhistv_file, dynhistu_file

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/iso_verif_dyn.f90

@@ -64 +64 @@
   function iso_verif_aberrant_nostop &
           (x,iso,q,err_msg)
-    USE infotrac, ONLY: isoName, getKey
+    USE lmdz_infotrac, ONLY: isoName, getKey
     IMPLICIT NONE
 

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/lmdz_infotrac.f90

@@ -1 @@
-!$Id$
-
-MODULE infotrac
+MODULE lmdz_infotrac
 
   USE       lmdz_strings, ONLY: msg, fmsg, maxlen, cat, dispTable, int2str, bool2str, strStack, strParse
@@ -116 +114 @@
   SUBROUTINE init_infotrac
     USE control_mod, ONLY: planet_type
-#ifdef REPROBUS
-   USE CHEM_REP,    ONLY: Init_chem_rep_trac
-#endif
-    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_STRATAER
+    USE lmdz_reprobus_wrappers, ONLY: init_chem_rep_trac
+    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_STRATAER, CPPKEY_REPROBUS
     USE lmdz_iniprint, ONLY: lunout, prt_level
-
-  USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm
+    USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm
+
     IMPLICIT NONE
     !==============================================================================================================================
@@ -204 +200 @@
       END IF
     CASE('repr')
-#ifndef REPROBUS
-      CALL abort_gcm(modname, 'You must add cpp key REPROBUS and compile with REPROBUS code', 1)
-#endif
+      IF (.NOT. CPPKEY_REPROBUS)
+        CALL abort_gcm(modname, 'You must add cpp key REPROBUS and compile with REPROBUS code', 1)
+      END IF
     CASE('coag')
       IF (.NOT. CPPKEY_STRATAER) THEN
@@ -233 +229 @@
       !---------------------------------------------------------------------------------------------------------------------------
       nqo = SIZE(tracers) - nqCO2
-      CALL Init_chem_inca_trac(nqINCA)                               !--- Get nqINCA from INCA
+      CALL init_chem_inca_trac(nqINCA)                               !--- Get nqINCA from INCA
       nbtr = nqINCA + nqCO2                                          !--- Number of tracers passed to phytrac
       nqtrue = nbtr + nqo                                            !--- Total number of "true" tracers
@@ -277 +273 @@
     !---------------------------------------------------------------------------------------------------------------------------
 
-#ifdef REPROBUS
-   !--- Transfert the number of tracers to Reprobus
-   CALL Init_chem_rep_trac(nbtr, nqo, tracers(:)%name)
-
-#endif
+    IF (CPPKEY_REPROBUS) THEN
+      !--- Transfert the number of tracers to Reprobus
+      CALL init_chem_rep_trac(nbtr, nqo, tracers(:)%name)
+    END IF
+
     !==============================================================================================================================
     ! 2) Calculate nqtot, number of tracers needed (greater if advection schemes 20 or 30 have been chosen).
@@ -426 +422 @@
   END SUBROUTINE init_infotrac
 
-END MODULE infotrac
+END MODULE lmdz_infotrac

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/test_period.f90

@@ -8 +8 @@
   !                       teta, q , p et phis                 ..........
 
-  USE infotrac, ONLY: nqtot
+  USE lmdz_infotrac, ONLY: nqtot
 
   USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writedynav.F90

@@ -4 +4 @@
 
   USE ioipsl
-  USE infotrac, ONLY: nqtot
+  USE lmdz_infotrac, ONLY: nqtot
   USE com_io_dyn_mod, ONLY: histaveid, histvaveid, histuaveid
   USE comconst_mod, ONLY: cpp

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writehist.f90

@@ -4 +4 @@
 
   USE ioipsl
-  USE infotrac, ONLY: nqtot
+  USE lmdz_infotrac, ONLY: nqtot
   USE com_io_dyn_mod, ONLY: histid, histvid, histuid
   USE temps_mod, ONLY: itau_dyn