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

Timestamp:

Jul 18, 2016, 9:41:10 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2545:2589 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -98 +98 @@
     REAL,SAVE           :: bl95_b0_omp, bl95_b1_omp
     REAL,SAVE           :: freq_ISCCP_omp, ecrit_ISCCP_omp
-    REAL,SAVE           :: freq_COSP_omp
+    REAL,SAVE           :: freq_COSP_omp, freq_AIRS_omp 
     real,SAVE           :: fact_cldcon_omp, facttemps_omp,ratqsbas_omp
     real,SAVE           :: tau_cld_cv_omp, coefw_cld_cv_omp
@@ -165 +165 @@
     INTEGER,SAVE :: iflag_ice_thermo_omp
     INTEGER,SAVE :: iflag_t_glace_omp
+    INTEGER,SAVE :: iflag_cloudth_vert_omp
     REAL,SAVE :: rad_froid_omp, rad_chau1_omp, rad_chau2_omp
     REAL,SAVE :: t_glace_min_omp, t_glace_max_omp
@@ -178 +179 @@
     REAL,SAVE :: cdmmax_omp,cdhmax_omp,ksta_omp,ksta_ter_omp,f_ri_cd_min_omp
     LOGICAL,SAVE :: ok_kzmin_omp
+    REAL, SAVE   :: pbl_lmixmin_alpha_omp
     REAL, SAVE ::  fmagic_omp, pmagic_omp
     INTEGER,SAVE :: iflag_pbl_omp,lev_histhf_omp,lev_histday_omp,lev_histmth_omp
@@ -188 +190 @@
     REAL, SAVE :: freq_outNMC_omp(3), freq_calNMC_omp(3)
     CHARACTER*4, SAVE :: type_run_omp
-    LOGICAL,SAVE :: ok_cosp_omp
+    LOGICAL,SAVE :: ok_cosp_omp, ok_airs_omp
     LOGICAL,SAVE :: ok_mensuelCOSP_omp,ok_journeCOSP_omp,ok_hfCOSP_omp
     REAL,SAVE :: lonmin_ins_omp, lonmax_ins_omp, latmin_ins_omp, latmax_ins_omp
@@ -460 +462 @@
     call getin('freq_COSP', freq_COSP_omp)
 
+    !Config Key  = freq_AIRS
+    !Config Desc = Frequence d'appel du simulateur AIRS en secondes;
+    !              par defaut 10800, i.e. 3 heures
+    !Config Def  = 10800.
+    !Config Help = Used in ini_histdayAIRS.h
+    !
+    freq_AIRS_omp = 10800.
+    call getin('freq_AIRS', freq_AIRS_omp)
+
     !
     !Config Key  = ip_ebil_phy
@@ -1161 +1172 @@
 
     !
+    !Config Key  = iflag_cloudth_vert
+    !Config Desc =  
+    !Config Def  = 0
+    !Config Help = 
+    !
+    iflag_cloudth_vert_omp = 0
+    call getin('iflag_cloudth_vert',iflag_cloudth_vert_omp)
+
+    !
     !Config Key  = iflag_ice_thermo
     !Config Desc =  
@@ -1259 +1279 @@
     ok_kzmin_omp = .true.
     call getin('ok_kzmin',ok_kzmin_omp)
+
+    pbl_lmixmin_alpha_omp=0.0
+    call getin('pbl_lmixmin_alpha',pbl_lmixmin_alpha_omp)
+
 
     !
@@ -1594 +1618 @@
     ok_cosp_omp = .false.
     call getin('ok_cosp',ok_cosp_omp)
+
+    !
+    !Config Key  = ok_airs
+    !Config Desc =
+    !Config Def  = .false.
+    !Config Help =
+    !
+    ok_airs_omp = .false.
+    call getin('ok_airs',ok_airs_omp)
 
     !
@@ -2044 +2077 @@
     exposant_glace = exposant_glace_omp
     iflag_t_glace = iflag_t_glace_omp
+    iflag_cloudth_vert=iflag_cloudth_vert_omp
     iflag_ice_thermo = iflag_ice_thermo_omp
     rei_min = rei_min_omp
@@ -2055 +2089 @@
     f_ri_cd_min = f_ri_cd_min_omp
     ok_kzmin = ok_kzmin_omp
+    pbl_lmixmin_alpha=pbl_lmixmin_alpha_omp
     fmagic = fmagic_omp
     pmagic = pmagic_omp
@@ -2094 +2129 @@
     ecrit_ISCCP = ecrit_ISCCP_omp
     freq_COSP = freq_COSP_omp
+    freq_AIRS = freq_AIRS_omp
     ok_ade = ok_ade_omp
     ok_aie = ok_aie_omp
@@ -2144 +2180 @@
     type_run = type_run_omp
     ok_cosp = ok_cosp_omp
+    ok_airs = ok_airs_omp
+
     ok_mensuelCOSP = ok_mensuelCOSP_omp
     ok_journeCOSP = ok_journeCOSP_omp
@@ -2291 +2329 @@
     write(lunout,*)' Frequence appel simulateur ISCCP, ecrit_ISCCP =', ecrit_ISCCP
     write(lunout,*)' Frequence appel simulateur COSP, freq_COSP =', freq_COSP
+    write(lunout,*)' Frequence appel simulateur AIRS, freq_AIRS =', freq_AIRS
     write(lunout,*)' Sortie bilan d''energie, ip_ebil_phy =', ip_ebil_phy
     write(lunout,*)' Excentricite = ',R_ecc
@@ -2361 +2400 @@
     write(lunout,*)' exposant_glace = ',exposant_glace
     write(lunout,*)' iflag_t_glace = ',iflag_t_glace
+    write(lunout,*)' iflag_cloudth_vert = ',iflag_cloudth_vert
     write(lunout,*)' iflag_ice_thermo = ',iflag_ice_thermo
     write(lunout,*)' rei_min = ',rei_min
@@ -2371 +2411 @@
     write(lunout,*)' f_ri_cd_min = ',f_ri_cd_min 
     write(lunout,*)' ok_kzmin = ',ok_kzmin 
+    write(lunout,*)' pbl_lmixmin_alpha = ',pbl_lmixmin_alpha
     write(lunout,*)' fmagic = ',fmagic
     write(lunout,*)' pmagic = ',pmagic
@@ -2404 +2445 @@
     write(lunout,*)' type_run = ',type_run 
     write(lunout,*)' ok_cosp = ',ok_cosp
+    write(lunout,*)' ok_airs = ',ok_airs
+
     write(lunout,*)' ok_mensuelCOSP = ',ok_mensuelCOSP
     write(lunout,*)' ok_journeCOSP = ',ok_journeCOSP