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

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -141 +141 @@
   LOGICAL,SAVE :: reevap_ice_omp
   INTEGER,SAVE :: iflag_pdf_omp
+  INTEGER,SAVE :: iflag_ice_thermo_omp
   REAL,SAVE :: rad_froid_omp, rad_chau1_omp, rad_chau2_omp
   REAL,SAVE :: t_glace_min_omp, t_glace_max_omp
@@ -155 +156 @@
   Integer, save :: lev_histins_omp, lev_histLES_omp 
   INTEGER, SAVE :: lev_histdayNMC_omp
+  INTEGER, SAVE :: levout_histNMC_omp(3)
   LOGICAL, SAVE :: ok_histNMC_omp(3)
   REAL, SAVE :: freq_outNMC_omp(3), freq_calNMC_omp(3)
@@ -966 +968 @@
   call getin('t_glace_max',t_glace_max_omp)
 
+!
+!Config Key  = iflag_ice_thermo
+!Config Desc =  
+!Config Def  = 0
+!Config Help = 
+!
+  iflag_ice_thermo_omp = 0
+  call getin('iflag_ice_thermo',iflag_ice_thermo_omp)
+
 !Config Key  = rei_min
 !Config Desc =  
@@ -1267 +1278 @@
   lev_histLES_omp = 1
   call getin('lev_histLES',lev_histLES_omp)
-!
+! 
 !Config Key  = lev_histdayNMC
 !Config Desc =
@@ -1275 +1286 @@
   lev_histdayNMC_omp = 8
   call getin('lev_histdayNMC',lev_histdayNMC_omp)
+!
+!Config Key  = levout_histNMC
+!Config Desc =
+!Config Def  = 5
+!Config Help =
+!
+  levout_histNMC_omp(1) = 5
+  levout_histNMC_omp(2) = 5
+  levout_histNMC_omp(3) = 5
+  call getin('levout_histNMC',levout_histNMC_omp)
 !
 !histNMC BEG
@@ -1296 +1317 @@
 !Config Help =
 !
-! freq_outNMC_omp(1) = 2592000.
   freq_outNMC_omp(1) = mth_len*86400.
   freq_outNMC_omp(2) = 86400.
@@ -1684 +1704 @@
     t_glace_min = t_glace_min_omp
     t_glace_max = t_glace_max_omp
+    iflag_ice_thermo = iflag_ice_thermo_omp
     rei_min = rei_min_omp
     rei_max = rei_max_omp
@@ -1702 +1723 @@
     lev_histLES = lev_histLES_omp
     lev_histdayNMC = lev_histdayNMC_omp
+    levout_histNMC = levout_histNMC_omp
     ok_histNMC(:) = ok_histNMC_omp(:)
     freq_outNMC(:) = freq_outNMC_omp(:)
@@ -1900 +1922 @@
   write(lunout,*)' t_glace_min = ',t_glace_min
   write(lunout,*)' t_glace_max = ',t_glace_max
+  write(lunout,*)' iflag_ice_thermo = ',iflag_ice_thermo
   write(lunout,*)' rei_min = ',rei_min
   write(lunout,*)' rei_max = ',rei_max
@@ -1925 +1948 @@
   write(lunout,*)' lev_histLES = ',lev_histLES
   write(lunout,*)' lev_histdayNMC = ',lev_histdayNMC
+  write(lunout,*)' levout_histNMC = ',levout_histNMC
   write(lunout,*)' ok_histNMC = ',ok_histNMC
   write(lunout,*)' freq_outNMC = ',freq_outNMC