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

Timestamp:

Jul 20, 2024, 11:17:09 PM (4 months ago)

Author:

abarral

Message:

Move lmdz_netcdf_format.F90 -> lmdz_cppkeys_wrapper.F90 to handle other CPP keys
Replace all (except wrapper) use of CPP_PHYS by fortran logical
Refactor makelmdz_fcm (put blocks into functions, use modern bash)

Location:

LMDZ6/branches/Amaury_dev/libf/dyn3d_common

Files:

• infotrac.F90 (modified) (7 diffs)
• inigeom.F (modified) (2 diffs)

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

@@ -117 +117 @@
    USE CHEM_REP,    ONLY: Init_chem_rep_trac
 #endif
+   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
    IMPLICIT NONE
 !==============================================================================================================================
@@ -143 +144 @@
 ! 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
@@ -197 +196 @@
    SELECT CASE(type_trac)
       CASE('inca', 'inco')
-#ifndef INCA
+      IF (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
@@ -229 +228 @@
    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
@@ -260 +259 @@
       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)
@@ -269 +268 @@
       nbtr   = nqtrue-COUNT(delPhase(tracers(:)%gen0Name) == 'H2O' &
                                .AND. tracers(:)%component == 'lmdz') !--- Number of tracers passed to phytrac
-#ifdef INCA
+   IF (CPPKEY_INCA) THEN
       nqINCA = COUNT(tracers(:)%component == 'inca')
-#endif
+   END IF
       lerr = getKey('hadv', hadv, ky=tracers(:)%keys)
       lerr = getKey('vadv', vadv, ky=tracers(:)%keys)
@@ -400 +399 @@
    CALL msg('niso   = '//TRIM(int2str(niso)),   modname)
    CALL msg('ntiso  = '//TRIM(int2str(ntiso)),  modname)
-#ifdef INCA
-   CALL msg('nqCO2  = '//TRIM(int2str(nqCO2)),  modname)
-   CALL msg('nqINCA = '//TRIM(int2str(nqINCA)), modname)
-#endif
+   IF (CPPKEY_INCA) THEN
+      CALL msg('nqCO2  = '//TRIM(int2str(nqCO2)),  modname)
+      CALL msg('nqINCA = '//TRIM(int2str(nqINCA)), modname)
+   END IF
    t => tracers
    CALL msg('Information stored in infotrac :', modname)

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inigeom.F

@@ -348 +348 @@
       DO j = 1, jjp1
 c
-      IF ( j. eq. 1 )  THEN
+      IF ( j == 1 )  THEN
 c
       yprm           = yprimu1(j)
@@ -378 +378 @@
       END IF
 c
-      IF ( j. eq. jjp1 )  THEN
+      IF ( j == jjp1 )  THEN
        yprp               = yprimu2(j-1)
        rlatp              = rlatu2 (j-1)