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

Timestamp:

Jul 20, 2024, 11:17:09 PM (5 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)

File:

• LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90 (modified) (16 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

@@ -93 +93 @@
     USE phys_output_var_mod, ONLY :      cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv
     USE phys_output_var_mod, ONLY : cloud_cover_sw, cloud_cover_sw_s2
+    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
 
 
@@ -111 +112 @@
 
 
-#ifdef INCA
     USE geometry_mod,      ONLY: longitude, latitude, boundslon, boundslat, ind_cell_glo
     USE time_phylmdz_mod,  ONLY: ndays
     USE infotrac_phy,      ONLY: nqCO2
-#endif
 #ifdef REPROBUS
     USE chem_rep, ONLY: Init_chem_rep_xjour, d_q_rep, d_ql_rep, d_qi_rep, &
@@ -122 +121 @@
     USE strataer_emiss_mod, ONLY: strataer_emiss_init
 #endif
-#if defined INCA || defined REPROBUS
     USE time_phylmdz_mod,    ONLY: annee_ref, day_ini, day_ref, start_time
     USE vertical_layers_mod, ONLY: aps, bps, ap, bp
-#endif
 
 
@@ -1343 +1340 @@
     REAL, dimension(klon, klev) :: cldfrarad   ! fraction nuageuse
 
-#ifdef INCA
     REAL :: calday, zxsnow_dummy(klon)
     ! set de variables utilisees pour l'initialisation des valeurs provenant de INCA
@@ -1350 +1346 @@
     REAL, DIMENSION(klon,klev,naero_grp,nbands) :: init_cginca
     REAL, DIMENSION(klon,klev,nbands) :: init_ccminca
-#endif
     REAL, DIMENSION(klon,nbtr) :: init_source
 
@@ -2341 +2336 @@
        !
        IF (ANY(type_trac == ['inca','inco'])) THEN ! ModThL
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
           CALL VTe(VTphysiq)
           CALL VTb(VTinca)
@@ -2419 +2414 @@
           CALL VTe(VTinca)
           CALL VTb(VTphysiq)
-#endif
+END IF
        ENDIF
        !
@@ -2995 +2990 @@
              B=Z2-fac*alog(pplay(i,itroprep(i)))
              ttrop(i)= fac*alog(ptrop(i))+B
-!        
+!
              Z1= 1.e-3 * ( pphi(i,itroprep(i)+1)+pphis(i) ) / gravit
              Z2= 1.e-3 * ( pphi(i,itroprep(i))  +pphis(i) ) / gravit
@@ -5611 +5606 @@
 
     IF (ANY(type_trac == ['inca','inco'])) THEN ! ModThL
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
        CALL VTe(VTphysiq)
        CALL VTb(VTinca)
@@ -5664 +5659 @@
        CALL VTe(VTinca)
        CALL VTb(VTphysiq)
-#endif
+END IF
     ENDIF !type_trac = inca or inco
     IF (type_trac == 'repr') THEN
@@ -5954 +5949 @@
 
        IF (aerosol_couple.AND.config_inca=='aero') THEN 
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
           CALL radlwsw_inca  &
                (chemistry_couple, kdlon,kflev,dist, rmu0, fract, solaire, &
@@ -5974 +5969 @@
                cldtaupirad, &
                topswai_aero, solswai_aero)
-#endif
+END IF
        ELSE
           !
@@ -7085 +7080 @@
     !
     IF (ANY(type_trac == ['inca','inco'])) THEN
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
        CALL VTe(VTphysiq)
        CALL VTb(VTinca)
@@ -7105 +7100 @@
        CALL VTe(VTinca)
        CALL VTb(VTphysiq)
-#endif
+END IF
     ENDIF
 
@@ -7412 +7407 @@
        IF (using_xios) THEN
 
-#ifdef INCA
+IF (CPPKEY_INCA) THEN
           IF (type_trac == 'inca') THEN 
              IF (is_omp_master .AND. grid_type==unstructured) THEN 
@@ -7418 +7413 @@
              ENDIF
           ENDIF
-#endif
+END IF
 
           IF (is_omp_master .and. grid_type==unstructured) CALL xios_context_finalize