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

Timestamp:

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

Author:

fhourdin

Message:

Reecriture des thermiques

File:

• LMDZ6/trunk/libf/phylmd/conf_phys_m.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmd/conf_phys_m.F90

@@ -39 +39 @@
     INCLUDE "YOMCST.h"
     INCLUDE "YOMCST2.h"
-    INCLUDE "thermcell.h"
+    INCLUDE "alpale.h"
 
     !IM : on inclut/initialise les taux de CH4, N2O, CFC11 et CFC12
@@ -142 +142 @@
     REAL,SAVE :: seuil_inversion_omp
 
-    INTEGER,SAVE :: iflag_thermals_ed_omp,iflag_thermals_optflux_omp,iflag_thermals_closure_omp
-    REAL, SAVE :: fact_thermals_ed_dz_omp
     INTEGER,SAVE :: iflag_thermals_omp,nsplit_thermals_omp
     REAL,SAVE :: tau_thermals_omp,alp_bl_k_omp
@@ -1718 +1716 @@
     CALL getin('iflag_thermals',iflag_thermals_omp)
     !
-    !Config Key  = iflag_thermals_ed
-    !Config Desc =
-    !Config Def  = 0
-    !Config Help =
-    !
-    fact_thermals_ed_dz_omp = 0.1
-
-    CALL getin('fact_thermals_ed_dz',fact_thermals_ed_dz_omp)
-    !
-    !
-    !Config Key  = iflag_thermals_ed
-    !Config Desc =
-    !Config Def  = 0
-    !Config Help =
-    !
-    iflag_thermals_ed_omp = 0
-    CALL getin('iflag_thermals_ed',iflag_thermals_ed_omp)
-    !
-    !
-    !Config Key  = iflag_thermals_optflux
-    !Config Desc =
-    !Config Def  = 0
-    !Config Help =
-    !
-    iflag_thermals_optflux_omp = 0
-    CALL getin('iflag_thermals_optflux',iflag_thermals_optflux_omp)
-    !
-    !Config Key  = iflag_thermals_closure
-    !Config Desc =
-    !Config Def  = 0
-    !Config Help =
-    !
-    iflag_thermals_closure_omp = 1
-    CALL getin('iflag_thermals_closure',iflag_thermals_closure_omp)
-    !
     !Config Key  = nsplit_thermals
     !Config Desc =
-    !Config Def  = 1
+    !Config Def  = 0
     !Config Help =
     !
@@ -2633 +2596 @@
     ip_ebil_phy = ip_ebil_phy_omp
     iflag_thermals = iflag_thermals_omp
-    iflag_thermals_ed = iflag_thermals_ed_omp
-    fact_thermals_ed_dz = fact_thermals_ed_dz_omp
-    iflag_thermals_optflux = iflag_thermals_optflux_omp
-    iflag_thermals_closure = iflag_thermals_closure_omp
     nsplit_thermals = nsplit_thermals_omp
     tau_thermals = tau_thermals_omp
@@ -3002 +2961 @@
     WRITE(lunout,*) ' iflag_order2_sollw = ', iflag_order2_sollw
     WRITE(lunout,*) ' iflag_thermals = ', iflag_thermals
-    WRITE(lunout,*) ' iflag_thermals_ed = ', iflag_thermals_ed
-    WRITE(lunout,*) ' fact_thermals_ed_dz = ', fact_thermals_ed_dz
-    WRITE(lunout,*) ' iflag_thermals_optflux = ', iflag_thermals_optflux
-    WRITE(lunout,*) ' iflag_thermals_closure = ', iflag_thermals_closure
     WRITE(lunout,*) ' iflag_clos = ', iflag_clos
     WRITE(lunout,*) ' coef_clos_ls = ', coef_clos_ls