Changeset 5791 for LMDZ6/branches/contrails/libf/phylmdiso/physiq_mod.F90

Timestamp:

Jul 28, 2025, 7:23:15 PM (6 days ago)

Author:

aborella

Message:

Merge with trunk r5789

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmdiso/physiq_mod.F90 (modified) (18 diffs)

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

@@ -49 +49 @@
     USE netcdf, only: nf90_fill_real     ! IM for NMC files
     USE open_climoz_m, only: open_climoz ! ozone climatology from a file
+    USE orografi_mod, ONLY: drag_noro, lift_noro, sugwd
+    USE orografi_strato_mod, ONLY: drag_noro_strato, lift_noro_strato, sugwd_strato
     USE ozonecm_m, only: ozonecm ! ozone of J.-F. Royer
     USE pbl_surface_mod, ONLY : pbl_surface
@@ -93 +95 @@
     USE lmdz_cloud_optics_prop_ini, ONLY : cloud_optics_prop_ini
     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 phys_output_var_mod, ONLY : cloud_cover_sw, cloud_cover_sw_s2, ZFLUX_DIR, ZFLUX_DIR_CLEAR, &
+  &      ZFLUX_DIR_s2, ZFLUX_DIR_CLEAR_s2, ZFLUX_DIR_SUN, ZFLUX_DIR_SUN_s2
 
 
@@ -113 +116 @@
     USE infotrac_phy,      ONLY: nqCO2
     USE lmdz_reprobus_wrappers, ONLY: init_chem_rep_xjour, d_q_rep, d_ql_rep, d_qi_rep, &
-                        ptrop, ttrop, ztrop, gravit, itroprep, Z1, Z2, fac, B, chemini_rep, chemtime_rep, coord_hyb_rep, &
-            rtime
+                        ptrop, ttrop, ztrop, gravit, itroprep, Z1, Z2, fac, B, &
+                        chemini_rep, rtime, chemtime_rep, coord_hyb_rep
     USE strataer_local_var_mod
     USE strataer_emiss_mod, ONLY: strataer_emiss_init
@@ -350 +353 @@
        !    Deep convective variables used in phytrac
        pmflxr, pmflxs,  &
-       wdtrainA, wdtrainS, wdtrainM,  &
+       wdtrainA, wdtrainS, wdtrainM, wdtrainAS,  &
        upwd, dnwd, &
        ep,  &
@@ -402 +405 @@
        rneb,  &
        zxsnow,snowhgt,qsnow,to_ice,sissnow,runoff,albsol3_lic, &
-       zxfluxt,zxfluxq 
+!GG       zxfluxt,zxfluxq 
+       zxfluxt,zxfluxq, &
+       fcds, fcdi, dh_basal_growth, dh_basal_melt, &
+       dh_top_melt, dh_snow2sic, &
+       dtice_melt, dtice_snow2sic
+!GG
 
 
@@ -1899 +1907 @@
        ok_sync=ok_sync_omp
 
-       freq_outNMC(1) = ecrit_files(7)
-       freq_outNMC(2) = ecrit_files(8)
-       freq_outNMC(3) = ecrit_files(9)
-       WRITE(lunout,*)'OK freq_outNMC(1)=',freq_outNMC(1)
-       WRITE(lunout,*)'OK freq_outNMC(2)=',freq_outNMC(2)
-       WRITE(lunout,*)'OK freq_outNMC(3)=',freq_outNMC(3)
+!       freq_outNMC(1) = ecrit_files(7)
+!       freq_outNMC(2) = ecrit_files(8)
+!       freq_outNMC(3) = ecrit_files(9)
+!       WRITE(lunout,*)'OK freq_outNMC(1)=',freq_outNMC(1)
+!       WRITE(lunout,*)'OK freq_outNMC(2)=',freq_outNMC(2)
+!       WRITE(lunout,*)'OK freq_outNMC(3)=',freq_outNMC(3)
+
 
 #ifndef CPP_XIOS
@@ -3299 +3308 @@
             debut,     lafin, &
             longitude_deg, latitude_deg, rugoro,  zrmu0,      &
-            sollwdown,    cldt,      &
+        !GG    sollwdown,    cldt,      &
+            sollwdown, pphi,   cldt,      &
+        !GG
             rain_fall, snow_fall, bs_fall, solsw,   solswfdiff, sollw,     &
             gustiness,                                &
@@ -3347 +3358 @@
             wake_delta_pbl_TKE, &
                                 !>nrlmd+jyg
-             treedrg &            
+!GG             treedrg )
+            treedrg,hice, tice, bilg_cumul, &
+            fcds, fcdi, dh_basal_growth, dh_basal_melt, &
+            dh_top_melt, dh_snow2sic, &
+            dtice_melt, dtice_snow2sic , &
+!GG
 !AM 
-            , tsurf_tersrf, tsoil_tersrf, qsurf_tersrf, tsurf_new_tersrf, &
+            tsurf_tersrf, tsoil_tersrf, qsurf_tersrf, tsurf_new_tersrf, &
             cdragm_tersrf, cdragh_tersrf, &
             swnet_tersrf, lwnet_tersrf, fluxsens_tersrf, fluxlat_tersrf &
@@ -3632 +3648 @@
     wdtrainS(:,:) = 0.
     wdtrainM(:,:) = 0.
+    wdtrainAS(:,:) = 0.
     upwd(:,:) = 0.
     dnwd(:,:) = 0.
@@ -6056 +6073 @@
                topsw0,toplw0,solsw0,sollw0, &
                lwdnc0, lwdn0, lwdn, lwupc0, lwup0, lwup,  &
+               lwtoa0b, lwtoab , &  !FC
                swdnc0, swdn0, swdn, swupc0, swup0, swup, &
                topswad_aero, solswad_aero, &
@@ -6070 +6088 @@
                ZLWFT0_i, ZFLDN0, ZFLUP0, &
                ZSWFT0_i, ZFSDN0, ZFSUP0, &
+               ZFLUX_DIR, ZFLUX_DIR_CLEAR, ZFLUX_DIR_SUN, &
                cloud_cover_sw)
 
@@ -6135 +6154 @@
                      topsw0p,toplw0p,solsw0p,sollw0p, &
                      lwdnc0p, lwdn0p, lwdnp, lwupc0p, lwup0p, lwupp,  &
+                     lwtoa0bp, lwtoabp , &  !FC
                      swdnc0p, swdn0p, swdnp, swupc0p, swup0p, swupp, &
                      topswad_aerop, solswad_aerop, &
@@ -6149 +6169 @@
                      ZLWFT0_i, ZFLDN0, ZFLUP0, &
                      ZSWFT0_i, ZFSDN0, ZFSUP0, &
+                     ZFLUX_DIR, ZFLUX_DIR_CLEAR, ZFLUX_DIR_SUN, &
                      cloud_cover_sw)
           ENDIF !ok_4xCO2atm
@@ -6181 +6202 @@
                      topsw0_s2,toplw0_s2,solsw0_s2,sollw0_s2, &
                      lwdnc0_s2, lwdn0_s2, lwdn_s2, lwupc0_s2, lwup0_s2, lwup_s2,  &
+                     lwtoa0b_s2, lwtoab_s2 , &  !FC
                      swdnc0_s2, swdn0_s2, swdn_s2, swupc0_s2, swup0_s2, swup_s2, &
                      topswad_aero_s2, solswad_aero_s2, &
@@ -6195 +6217 @@
                      ZLWFT0_i, ZFLDN0, ZFLUP0, &
                      ZSWFT0_i, ZFSDN0, ZFSUP0, &
+                     ZFLUX_DIR, ZFLUX_DIR_CLEAR, ZFLUX_DIR_SUN, &
                      cloud_cover_sw_s2)
           ENDIF ! ok_3Deffect
@@ -6921 +6944 @@
     ENDIF
 
+    ! Merge wdtrainA and wdtrainS in the total source of precipitation due to
+    ! adiabatic updraughts.
+    !
+    wdtrainAS(:,:) = wdtrainA(:,:) + wdtrainS(:,:)
+
 IF (CPPKEY_DUST) THEN
-    !  Avec SPLA, iflag_phytrac est forcé =1 
+    !  Avec SPLA, iflag_phytrac est force =1 
+
     CALL       phytracr_spl ( debut,lafin , jD_cur,jH_cur,iflag_con,       &
                       pdtphys,ftsol,                                       &
@@ -6932 +6961 @@
                       da,phi,phi2,d1a,dam,mp,ep,sigd,sij,clw,elij,         &
                       epmlmMm,eplaMm,upwd,dnwd,itop_con,ibas_con,          &
-                      ev,wdtrainA,  wdtrainM,wght_cvfd,                    &
+                      ev,wdtrainAS,  wdtrainM,wght_cvfd,                   &
                       fm_therm, entr_therm, rneb,                          &
                       beta_prec_fisrt,beta_prec,                           &
@@ -6958 +6987 @@
          da,       phi,       mp,       upwd, &
          phi2,     d1a,       dam,      sij, wght_cvfd, &        !<<RomP+RL
-         wdtrainA, wdtrainM,  sigd,     clw,elij, &   !<<RomP
+         wdtrainAS, wdtrainM,  sigd,     clw,elij, &   !<<RomP
          ev,       ep,        epmlmMm,  eplaMm, &     !<<RomP
          dnwd,     aerosol_couple,      flxmass_w, &