Changeset 2220 for LMDZ5/branches/testing/libf/phylmd/conf_phys_m.F90

Timestamp:

Mar 3, 2015, 2:41:13 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2186:2216 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/conf_phys_m.F90 (modified) (11 diffs)

LMDZ5/branches/testing/libf/phylmd/conf_phys_m.F90

@@ -15 +15 @@
        solarlong0,seuil_inversion, &
        fact_cldcon, facttemps,ok_newmicro,iflag_radia,&
-       iflag_cldcon, &
+       iflag_cldth, &
        iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
        ok_ade, ok_aie, ok_cdnc, aerosol_couple, &
@@ -81 +81 @@
     REAL                 :: bl95_b0, bl95_b1
     real                 :: fact_cldcon, facttemps,ratqsbas,ratqshaut,tau_ratqs
-    integer              :: iflag_cldcon
+    integer              :: iflag_cldth
     integer              :: iflag_ratqs
 
@@ -101 +101 @@
     REAL,SAVE           :: freq_COSP_omp
     real,SAVE           :: fact_cldcon_omp, facttemps_omp,ratqsbas_omp
+    real,SAVE           :: tau_cld_cv_omp, coefw_cld_cv_omp
+    integer,SAVE        :: iflag_cld_cv_omp
+
+
     real,SAVE           :: ratqshaut_omp
     real,SAVE           :: tau_ratqs_omp
@@ -107 +111 @@
     integer,SAVE        :: iflag_rrtm_omp
     integer,SAVE        :: NSW_omp
-    integer,SAVE        :: iflag_cldcon_omp, ip_ebil_phy_omp
+    integer,SAVE        :: iflag_cldth_omp, ip_ebil_phy_omp
     integer,SAVE        :: iflag_ratqs_omp
 
@@ -132 +136 @@
     integer,SAVE :: iflag_coupl_omp,iflag_clos_omp,iflag_wake_omp
     integer,SAVE :: iflag_cvl_sigd_omp
+    REAL, SAVE :: coef_clos_ls_omp
     REAL, SAVE :: supcrit1_omp, supcrit2_omp
     INTEGER, SAVE :: iflag_mix_omp
@@ -886 +891 @@
 
     !
-    !Config Key  = iflag_cldcon 
+    !Config Key  = iflag_cldth 
     !Config Desc =  
     !Config Def  = 1
     !Config Help = 
     !
-    iflag_cldcon_omp = 1
-    call getin('iflag_cldcon',iflag_cldcon_omp)
+    iflag_cldth_omp = 1
+! On lit deux fois avec l'ancien et le nouveau nom 
+! pour assurer une retrocompatiblite.
+! A abandonner un jour
+    call getin('iflag_cldcon',iflag_cldth_omp)
+    call getin('iflag_cldth',iflag_cldth_omp)
+
+    !
+    !Config Key  = iflag_cld_cv
+    !Config Desc =
+    !Config Def  = 1
+    !Config Help =
+    !
+    iflag_cld_cv_omp = 1
+    call getin('iflag_cld_cv',iflag_cld_cv_omp)
+
+    !
+    !Config Key  = tau_cld_cv
+    !Config Desc =
+    !Config Def  = 10.
+    !Config Help =
+    !
+    tau_cld_cv_omp = 10.
+    call getin('tau_cld_cv',tau_cld_cv_omp)
+
+    !
+    !Config Key  = coefw_cld_cv
+    !Config Desc =
+    !Config Def  = 0.1
+    !Config Help =
+    !
+    coefw_cld_cv_omp = 0.1
+    call getin('coefw_cld_cv',coefw_cld_cv_omp)
+
+
+
 
     !
@@ -1343 +1382 @@
     iflag_clos_omp = 1
     call getin('iflag_clos',iflag_clos_omp)
+    !
+    !Config Key  = coef_clos_ls
+    !Config Desc =  
+    !Config Def  = 0
+    !Config Help = 
+    !
+    coef_clos_ls_omp = 0.
+    call getin('coef_clos_ls',coef_clos_ls_omp)
+
     !
     !Config Key  = iflag_cvl_sigd
@@ -1925 +1973 @@
     iflag_rrtm = iflag_rrtm_omp
     NSW = NSW_omp
-    iflag_cldcon = iflag_cldcon_omp
+    iflag_cldth = iflag_cldth_omp
+    iflag_cld_cv = iflag_cld_cv_omp
+    tau_cld_cv = tau_cld_cv_omp
+    coefw_cld_cv = coefw_cld_cv_omp
     iflag_ratqs = iflag_ratqs_omp
     ip_ebil_phy = ip_ebil_phy_omp
@@ -1946 +1997 @@
     iflag_clos = iflag_clos_omp
     iflag_wake = iflag_wake_omp
+    coef_clos_ls = coef_clos_ls_omp
     alp_offset = alp_offset_omp
     iflag_cvl_sigd = iflag_cvl_sigd_omp
@@ -2076 +2128 @@
     write(lunout,*)' reevap_ice = ', reevap_ice
     write(lunout,*)' iflag_pdf = ', iflag_pdf
-    write(lunout,*)' iflag_cldcon = ', iflag_cldcon
+    write(lunout,*)' iflag_cldth = ', iflag_cldth
+    write(lunout,*)' iflag_cld_cv = ', iflag_cld_cv
+    write(lunout,*)' tau_cld_cv = ', tau_cld_cv
+    write(lunout,*)' coefw_cld_cv = ', coefw_cld_cv
     write(lunout,*)' iflag_radia = ', iflag_radia
     write(lunout,*)' iflag_rrtm = ', iflag_rrtm
@@ -2135 +2190 @@
     write(lunout,*)' iflag_thermals_closure = ', iflag_thermals_closure
     write(lunout,*)' iflag_clos = ', iflag_clos
+    write(lunout,*)' coef_clos_ls = ', coef_clos_ls
     write(lunout,*)' type_run = ',type_run 
     write(lunout,*)' ok_cosp = ',ok_cosp