Changeset 4664 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Sep 2, 2023, 10:52:57 AM (18 months ago)

Author:

fhourdin

Message:

standardisatio des noms pour lscp et fisrtilp

fisrtilp passe dans le module lmdz_lscp_old.F90
Prepartation de la replaysation de fisrtilp (deja fait pour lscp)

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• lmdz_lscp.F90 (added)
• lmdz_lscp_ini.F90 (added)
• lmdz_lscp_old.F90 (moved) (moved from LMDZ6/trunk/libf/phylmdiso/fisrtilp.F90) (3 diffs)
• lmdz_lscp_tools.F90 (added)
• lscp_ini_mod.F90 (deleted)
• lscp_mod.F90 (deleted)
• lscp_tools_mod.F90 (deleted)
• physiq_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmdiso/lmdz_lscp_old.F90

@@ -3 +3 @@
 !
 !
+MODULE lmdz_lscp_old
+CONTAINS
 SUBROUTINE fisrtilp(dtime,paprs,pplay,t,q,ptconv,ratqs, &
      d_t, d_q, d_ql, d_qi, rneb, radliq, rain, snow,          &
@@ -26 +28 @@
   ! flag to include modifications to ensure energy conservation (if flag >0)
   USE add_phys_tend_mod, only : fl_cor_ebil 
-  USE lscp_ini_mod, ONLY: iflag_t_glace,t_glace_min, t_glace_max, exposant_glace
-  USE lscp_ini_mod, ONLY: iflag_cloudth_vert, iflag_rain_incloud_vol 
-  USE lscp_ini_mod, ONLY: coef_eva, coef_eva_i, ffallv_lsc, ffallv_con
-  USE lscp_ini_mod, ONLY: cld_tau_lsc, cld_tau_con, cld_lc_lsc, cld_lc_con
-  USE lscp_ini_mod, ONLY: reevap_ice, iflag_bergeron, iflag_fisrtilp_qsat, iflag_pdf 
+  USE lmdz_lscp_ini, ONLY: iflag_t_glace,t_glace_min, t_glace_max, exposant_glace
+  USE lmdz_lscp_ini, ONLY: iflag_cloudth_vert, iflag_rain_incloud_vol 
+  USE lmdz_lscp_ini, ONLY: coef_eva, coef_eva_i, ffallv_lsc, ffallv_con
+  USE lmdz_lscp_ini, ONLY: cld_tau_lsc, cld_tau_con, cld_lc_lsc, cld_lc_con
+  USE lmdz_lscp_ini, ONLY: reevap_ice, iflag_bergeron, iflag_fisrtilp_qsat, iflag_pdf 
       use phys_output_var_mod, ONLY : cloudth_sth,cloudth_senv
       use phys_output_var_mod, ONLY : cloudth_sigmath,cloudth_sigmaenv
@@ -2741 +2743 @@
 
 END SUBROUTINE fisrtilp
+END MODULE lmdz_lscp_old

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -77 +77 @@
     USE write_field_phy
     USE wxios, ONLY: g_ctx, wxios_set_context, using_xios
-    USE lscp_mod, ONLY : lscp
+    USE lmdz_lscp, ONLY : lscp
+    USE lmdz_lscp_old, ONLY : fisrtilp
     USE lmdz_wake_ini, ONLY : wake_ini
     USE yamada_ini_mod, ONLY : yamada_ini
@@ -84 +85 @@
     USE lmdz_thermcell_dtke, ONLY : thermcell_dtke
     USE blowing_snow_ini_mod, ONLY : blowing_snow_ini , qbst_bs 
-    USE lscp_ini_mod, ONLY : lscp_ini
+    USE lmdz_lscp_ini, ONLY : lscp_ini
     USE lmdz_ratqs_main, ONLY : ratqs_main
     USE lmdz_ratqs_ini, ONLY : ratqs_ini
@@ -885 +886 @@
     !KE43
     EXTERNAL conema3  ! convect4.3
-    EXTERNAL fisrtilp  ! schema de condensation a grande echelle (pluie)
     !AA 
     ! JBM (3/14) fisrtilp_tr not loaded