Changeset 5253 for LMDZ6/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Oct 22, 2024, 2:29:31 PM (5 hours ago)

Author:

abarral

Message:

Wrap uses of cpp key DUST

File:

• LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (modified) (15 diffs)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -100 +100 @@
 !
 !
-#ifdef CPP_Dust
-    USE phytracr_spl_mod, ONLY: phytracr_spl, phytracr_spl_out_init
-    USE phys_output_write_spl_mod
-#else
     USE phytrac_mod, ONLY : phytrac_init, phytrac
     USE phys_output_write_mod
-#endif
 
 
@@ -118 +113 @@
     USE time_phylmdz_mod,    ONLY: annee_ref, day_ini, day_ref, start_time
     USE vertical_layers_mod, ONLY: aps, bps, ap, bp
-    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER
+    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS, CPPKEY_STRATAER, CPPKEY_DUST
 
 #ifdef CPP_RRTM
@@ -1509 +1504 @@
        ok_water_mass_fixer=.FALSE.  ! OB: by default we do not apply the mass fixer
        CALL getin_p('ok_water_mass_fixer',ok_water_mass_fixer)
-#ifdef CPP_Dust
-       IF (iflag_phytrac.EQ.0) THEN 
+IF (CPPKEY_DUST) THEN
+       IF (iflag_phytrac.EQ.0) THEN
          WRITE(lunout,*) 'In order to run with SPLA, iflag_phytrac will be forced to 1'
          iflag_phytrac = 1
        ENDIF
-#endif
+END IF
        nvm_lmdz = 13
        CALL getin_p('NVM',nvm_lmdz)
@@ -1888 +1883 @@
 END IF
 
-#ifdef CPP_Dust
+IF (CPPKEY_DUST) THEN
        ! Quand on utilise SPLA, on force iflag_phytrac=1
        CALL phytracr_spl_out_init()
@@ -1897 +1892 @@
                                 ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse,      &
                                 flag_aerosol, flag_aerosol_strat, ok_cdnc)
-#else
+ELSE
        ! phys_output_write écrit des variables traceurs seulement si iflag_phytrac == 1 
        ! donc seulement dans ce cas on doit appeler phytrac_init()
@@ -1909 +1904 @@
                               ptconvth, d_u, d_t, qx, d_qx, zmasse,           &
                               flag_aerosol, flag_aerosol_strat, ok_cdnc, t, u1, v1)
-#endif
+END IF
 
 
@@ -4261 +4256 @@
                    !--new aerosol properties SW and LW
                    !
-#ifdef CPP_Dust
+IF (CPPKEY_DUST) THEN
                    !--SPL aerosol model
                    CALL splaerosol_optic_rrtm( ok_alw, pplay, paprs, t_seri, rhcl, &
@@ -4267 +4262 @@
                         tau_aero_sw_rrtm, piz_aero_sw_rrtm, cg_aero_sw_rrtm,  &
                         tausum_aero, tau3d_aero)
-#else
+ELSE
                    !--climatologies or INCA aerosols
                    CALL readaerosol_optic_rrtm( debut, aerosol_couple, ok_alw, ok_volcan, &
@@ -4275 +4270 @@
                         tau_aero_sw_rrtm, piz_aero_sw_rrtm, cg_aero_sw_rrtm,  &
                         tausum_aero, drytausum_aero, tau3d_aero)
-#endif
+END IF
 
                    IF (flag_aerosol .EQ. 7) THEN
@@ -5315 +5310 @@
     ENDIF
 
-#ifdef CPP_Dust
+IF (CPPKEY_DUST) THEN
     !  Avec SPLA, iflag_phytrac est forcé =1 
     CALL       phytracr_spl ( debut,lafin , jD_cur,jH_cur,iflag_con,       &  ! I
@@ -5332 +5327 @@
                       d_tr_dyn,tr_seri)
 
-#else
+ELSE
     IF (iflag_phytrac == 1 ) THEN
       CALL phytrac ( &
@@ -5373 +5368 @@
     ENDIF    ! (iflag_phytrac=1)
 
-#endif
+END IF
     !ENDIF    ! (iflag_phytrac=1)
 
@@ -5732 +5727 @@
     !On effectue les sorties:
 
-#ifdef CPP_Dust
+IF (CPPKEY_DUST) THEN
   CALL phys_output_write_spl(itap, pdtphys, paprs, pphis,  &
        pplay, lmax_th, aerosol_couple,                 &
@@ -5739 +5734 @@
        ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse,      &
        flag_aerosol, flag_aerosol_strat, ok_cdnc)
-#else
+ELSE
     CALL phys_output_write(itap, pdtphys, paprs, pphis,  &
          pplay, lmax_th, aerosol_couple,                 &
@@ -5746 +5741 @@
          ptconvth, d_u, d_t, qx, d_qx, zmasse,           &
          flag_aerosol, flag_aerosol_strat, ok_cdnc,t, u1, v1)
-#endif
+END IF
 
 #ifndef CPP_XIOS