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

Timestamp:

Jul 20, 2024, 11:17:09 PM (6 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/dynphy_lonlat/phylmd

Files:

• etat0dyn_netcdf.F90 (modified) (3 diffs)
• iniphysiq_mod.F90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90

@@ -77 +77 @@
   USE infotrac,       ONLY: nqtot, tracers
   USE filtreg_mod
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
   IMPLICIT NONE
 !-------------------------------------------------------------------------------
@@ -145 +146 @@
 !*******************************************************************************
 ! Look for ozone tracer:
-#ifndef INCA
+IF (CPPKEY_INCA) THEN
   DO iq=1,nqtot; IF(strLower(tracers(iq)%name)=="o3") EXIT; END DO
   IF(iq/=nqtot+1) THEN
@@ -153 +154 @@
     q3d(:,:,:,iq)=q3d(:,:,:,iq)*48./ 29.                !--- Mole->mass fraction         
   END IF
-#endif
+END IF
   q3d(iip1,:,:,:)=q3d(1,:,:,:)
 

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -38 +38 @@
   USE phyaqua_mod, ONLY: iniaqua
   USE comconst_mod, ONLY: omeg, rad
-#ifdef INCA
   USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic
 #ifdef CPP_PARA
@@ -45 +44 @@
 #endif
   USE mod_phys_lmdz_omp_data, ONLY: klon_omp 
-#endif
   USE ioipsl_getin_p_mod, ONLY: getin_p
   USE slab_heat_transp_mod, ONLY: ini_slab_transp_geom
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
   IMPLICIT NONE
 
@@ -167 +166 @@
 
   IF (ANY(type_trac == ['inca','inco'])) THEN
-#ifdef INCA
+  IF (CPPKEY_INCA) THEN
      CALL init_inca_dim_reg(nbp_lon, nbp_lat - 1, &
           rlonudyn, rlatudyn, rlonvdyn, rlatvdyn)
-#endif
+  END IF
   END IF