Changeset 5260 for LMDZ6/trunk

Timestamp:

Oct 22, 2024, 5:40:07 PM (2 months ago)

Author:

abarral

Message:

Wrap uses of cpp key OUTPUTPHYSSCM

Location:

LMDZ6/trunk/libf/phylmd/dyn1d

Files:

• old_lmdz1d.F90 (modified) (3 diffs)
• scm.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmd/dyn1d/old_lmdz1d.F90

@@ -45 +45 @@
    USE temps_mod, ONLY: annee_ref, calend, day_end, day_ini, day_ref, &
                         itau_dyn, itau_phy, start_time, year_len
-   USE phys_cal_mod, ONLY : year_len_phys_cal_mod => year_len 
+   USE phys_cal_mod, ONLY : year_len_phys_cal_mod => year_len
+   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_OUTPUTPHYSSCM
 
       implicit none
@@ -1046 +1047 @@
 !
 !=====================================================================
-#ifdef OUTPUT_PHYS_SCM
+IF (CPPKEY_OUTPUTPHYSSCM) THEN
        CALL iophys_ini(timestep)
-#endif
+END IF
 ! START OF THE TEMPORAL LOOP :
 !=====================================================================
@@ -1299 +1300 @@
      &             +dt_cooling(1:mxcalc))  ! Taux de chauffage ou refroid.
 
-#ifdef OUTPUT_PHYS_SCM
+IF (CPPKEY_OUTPUTPHYSSCM) THEN
       CALL iophys_ecrit('d_t_adv',klev,'d_t_adv','m/s',d_t_adv)
       CALL iophys_ecrit('d_t_nudge',klev,'d_t_nudge','m/s',d_t_nudge)
-#endif
+END IF
 
       endif  ! forcing_sandu or forcing_astex

LMDZ6/trunk/libf/phylmd/dyn1d/scm.F90

@@ -41 +41 @@
    USE temps_mod, ONLY: annee_ref, calend, day_end, day_ini, day_ref, &
                         itau_dyn, itau_phy, start_time, year_len
-   USE phys_cal_mod, ONLY : year_len_phys_cal_mod => year_len 
+   USE phys_cal_mod, ONLY : year_len_phys_cal_mod => year_len
+   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_OUTPUTPHYSSCM
 
       implicit none
@@ -61 +62 @@
 ! DECLARATIONS
 !=====================================================================
-
-#undef OUTPUT_PHYS_SCM
 
 !---------------------------------------------------------------------
@@ -795 +794 @@
 !
 !=====================================================================
-#ifdef OUTPUT_PHYS_SCM
+IF (CPPKEY_OUTPUTPHYSSCM) THEN
        CALL iophys_ini(timestep)
-#endif
+END IF
 
 !=====================================================================
@@ -1009 +1008 @@
 !---------------------------------------------------------------------
 
-#ifdef OUTPUT_PHYS_SCM
+IF (CPPKEY_OUTPUTPHYSSCM) THEN
       CALL iophys_ecrit('w_adv',klev,'w_adv','K/day',w_adv)
       CALL iophys_ecrit('z_adv',klev,'z_adv','K/day',z_adv)
@@ -1024 +1023 @@
       CALL iophys_ecrit('dtnud',klev,'dtnud','K/day',86400*d_t_nudge)
       CALL iophys_ecrit('dqnud',klev,'dqnud','K/day',1000*86400*d_q_nudge(:,1))
-#endif
+END IF
 
     IF (flag_inhib_forcing == 0) then ! if tendency of forcings should be added