Changeset 4626

Timestamp:

Jul 13, 2023, 2:14:39 PM (10 months ago)

Author:

dcugnet

Message:

StratAer? fix: stratH2O_methox needs aerophys, located in the StratAer? folder and needing strataer_local_var_mod
=> moved to StratAer/? ; the CALL in physiq_mod is now between CPP keys.
To be changed soon to allow stratH2O_methox usage without StratAer?.

Location:

LMDZ6/trunk/libf

Files:

• phylmd/StratAer/stratH2O_methox.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/stratH2O_methox.F90)
• phylmd/physiq_mod.F90 (modified) (1 diff)
• phylmdiso/physiq_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -4847 +4847 @@
     !DC Calcul de la tendance due au methane
     IF (ok_qch4) THEN
+!      d_q_ch4: H2O source in ppmv/sec
+#ifdef CPP_StratAer
        CALL stratH2O_methox(debut,paprs,d_q_ch4)
-!      d_q_ch4: H2O source in ppmv/sec - ecmwf routine METHOX
-!       CALL METHOX(1,klon,klon,klev,q_seri,d_q_ch4,pplay)
+#else
+!      ecmwf routine METHOX
+       CALL METHOX(1,klon,klon,klev,q_seri,d_q_ch4,pplay)
+#end if
        ! ajout de la tendance d'humidite due au methane
        d_q_ch4_dtime(:,:) = d_q_ch4(:,:)*phys_tstep

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -6144 +6144 @@
     !DC Calcul de la tendance due au methane
     IF (ok_qch4) THEN
+!      d_q_ch4: H2O source in ppmv/sec
+#ifdef CPP_StratAer
        CALL stratH2O_methox(debut,paprs,d_q_ch4)
-!      d_q_ch4: H2O source in ppmv/sec - ecmwf routine METHOX
-!       CALL METHOX(1,klon,klon,klev,q_seri,d_q_ch4,pplay)
+#else
+!      ecmwf routine METHOX
+       CALL METHOX(1,klon,klon,klev,q_seri,d_q_ch4,pplay)
+#end if
        ! ajout de la tendance d'humidite due au methane
        d_q_ch4_dtime(:,:) = d_q_ch4(:,:)*phys_tstep