Changeset 5251 for LMDZ6/trunk/libf/dyn3d_common

Timestamp:

Oct 22, 2024, 12:31:08 PM (5 weeks ago)

Author:

abarral

Message:

Wrap uses of cpp key INCA
Add INCA wrapper

File:

• LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

@@ -121 +121 @@
    USE CHEM_REP, ONLY: Init_chem_rep_trac
 #endif
+   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
    IMPLICIT NONE
 !==============================================================================================================================
@@ -147 +148 @@
 ! Local variables
    INTEGER, ALLOCATABLE :: hadv(:), vadv(:)                          !--- Horizontal/vertical transport scheme number
-#ifdef INCA
    INTEGER, ALLOCATABLE :: had (:), hadv_inca(:), conv_flg_inca(:), &!--- Variables specific to INCA
                            vad (:), vadv_inca(:),  pbl_flg_inca(:)
    CHARACTER(LEN=8), ALLOCATABLE :: solsym_inca(:)                   !--- Tracers names for INCA
    INTEGER :: nqINCA
-#endif
    CHARACTER(LEN=2)      ::   suff(9)                                !--- Suffixes for schemes of order 3 or 4 (Prather)
    CHARACTER(LEN=3)      :: descrq(30)                               !--- Advection scheme description tags
@@ -199 +198 @@
    SELECT CASE(type_trac)
       CASE('inca', 'inco')
-#ifndef INCA
+IF (.NOT. CPPKEY_INCA) THEN
          CALL abort_gcm(modname, 'You must add cpp key INCA and compile with INCA code', 1)
-#endif
+END IF
       CASE('repr')
 #ifndef REPROBUS
@@ -232 +231 @@
    IF(fType == 1 .AND. ANY(['inca', 'inco'] == type_trac)) THEN      !=== FOUND OLD STYLE INCA "traceur.def"
    !---------------------------------------------------------------------------------------------------------------------------
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
       nqo = SIZE(tracers) - nqCO2
       CALL Init_chem_inca_trac(nqINCA)                               !--- Get nqINCA from INCA
@@ -263 +262 @@
       IF(setGeneration(tracers)) CALL abort_gcm(modname,'See above',1) !- SET FIELDS %iGeneration, %gen0Name
       DEALLOCATE(had, hadv_inca, vad, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca)
-#endif
+END IF
    !---------------------------------------------------------------------------------------------------------------------------
    ELSE                                                              !=== OTHER CASES (OLD OR NEW FORMAT, NO INCA MODULE)
@@ -271 +270 @@
    nbtr = nqtrue-COUNT(tracers(:)%component == 'lmdz' .AND. delPhase(tracers(:)%gen0Name) == 'H2O')     !--- Passed to phytrac
    nqCO2  =      COUNT( [type_trac == 'inco', type_trac == 'co2i'] )
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
    nqINCA =      COUNT(tracers(:)%component == 'inca')
-#endif
+END IF
    IF(getKey('hadv', hadv, ky=tracers(:)%keys)) CALL abort_gcm(modname, 'missing key "hadv"', 1)
    IF(getKey('vadv', vadv, ky=tracers(:)%keys)) CALL abort_gcm(modname, 'missing key "vadv"', 1)
@@ -401 +400 @@
    CALL msg('niso   = '//TRIM(int2str(niso)),   modname)
    CALL msg('ntiso  = '//TRIM(int2str(ntiso)),  modname)
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
    CALL msg('nqCO2  = '//TRIM(int2str(nqCO2)),  modname)
    CALL msg('nqINCA = '//TRIM(int2str(nqINCA)), modname)
-#endif
+END IF
    t => tracers
    CALL msg('Information stored in '//TRIM(modname)//': ', modname)