Changeset 4089 for LMDZ6/trunk/libf/phylmd/thermcell_plume.F90

Timestamp:

Mar 10, 2022, 7:23:47 PM (2 years ago)

Author:

fhourdin

Message:

Reecriture des thermiques

File:

• LMDZ6/trunk/libf/phylmd/thermcell_plume.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/thermcell_plume.F90

@@ -21 +21 @@
 !   = 29 : an other way to compute the modified buoyancy (to be tested)
 !--------------------------------------------------------------------------
-USE IOIPSL, ONLY : getin
-USE ioipsl_getin_p_mod, ONLY : getin_p
-
-       USE print_control_mod, ONLY: prt_level
+       USE thermcell_ini_mod, ONLY: prt_level,fact_thermals_ed_dz,iflag_thermals_ed,RLvCP,RETV,RG
+       USE thermcell_ini_mod, ONLY: fact_epsilon, betalpha, afact, fact_shell
+       USE thermcell_ini_mod, ONLY: detr_min, entr_min, detr_q_coef, detr_q_power
+       USE thermcell_ini_mod, ONLY: mix0, thermals_flag_alim
+
+
        IMPLICIT NONE
-
-#include "YOMCST.h"
-#include "YOETHF.h"
-#include "FCTTRE.h"
-#include "thermcell.h"
 
       INTEGER itap
@@ -101 +98 @@
       real zbetalpha, coefzlmel
       real eps
-      REAL REPS,RLvCp,DDT0
-      PARAMETER (DDT0=.01)
       logical Zsat
       LOGICAL active(ngrid),activetmp(ngrid)
       REAL fact_gamma,fact_gamma2,fact_epsilon2
 
-      REAL, SAVE :: fact_epsilon=0.002
-      REAL, SAVE :: betalpha=0.9
-      REAL, SAVE :: afact=2./3.
-      REAL, SAVE :: fact_shell=1.
-      REAL,SAVE :: detr_min=1.e-5
-      REAL,SAVE :: entr_min=1.e-5
-      REAL,SAVE :: detr_q_coef=0.012
-      REAL,SAVE :: detr_q_power=0.5
-      REAL,SAVE :: mix0=0.
-      INTEGER,SAVE :: thermals_flag_alim=0
-
-!$OMP THREADPRIVATE(fact_epsilon, betalpha, afact, fact_shell)
-!$OMP THREADPRIVATE(detr_min, entr_min, detr_q_coef, detr_q_power)
-!$OMP THREADPRIVATE( mix0, thermals_flag_alim)
-
-      LOGICAL, SAVE :: first=.true.
-  !$OMP THREADPRIVATE(first)
-
 
       REAL c2(ngrid,klev)
@@ -132 +109 @@
 ! Initialisation
 
-      RLvCp = RLVTT/RCPD
-      IF (first) THEN
-
-     CALL getin_p('thermals_fact_epsilon',fact_epsilon)
-     CALL getin_p('thermals_betalpha',betalpha)
-     CALL getin_p('thermals_afact',afact)
-     CALL getin_p('thermals_fact_shell',fact_shell)
-     CALL getin_p('thermals_detr_min',detr_min)
-     CALL getin_p('thermals_entr_min',entr_min)
-     CALL getin_p('thermals_detr_q_coef',detr_q_coef)
-     CALL getin_p('thermals_detr_q_power',detr_q_power)
-     CALL getin_p('thermals_mix0',mix0)
-     CALL getin_p('thermals_flag_alim',thermals_flag_alim)
-
-
-      first=.false.
-      ENDIF
 
       zbetalpha=betalpha/(1.+betalpha)