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

Timestamp:

Nov 29, 2013, 9:40:25 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1860:1909 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -83 +83 @@
   character (len = 10),SAVE  :: type_veget_omp
   CHARACTER(len = 8),SAVE   :: aer_type_omp
+  logical,SAVE              :: ok_snow_omp
   logical,SAVE              :: ok_newmicro_omp
   logical,SAVE        :: ok_journe_omp, ok_mensuel_omp, ok_instan_omp, ok_hf_omp        
@@ -147 +148 @@
   REAL,SAVE :: inertie_sol_omp,inertie_sno_omp,inertie_ice_omp
   REAL,SAVE :: qsol0_omp
+  REAL,SAVE :: evap0_omp
+  REAL,SAVE :: albsno0_omp
   REAL      :: solarlong0
   REAL,SAVE :: solarlong0_omp
@@ -160 +163 @@
   REAL, SAVE :: freq_outNMC_omp(3), freq_calNMC_omp(3)
   CHARACTER*4, SAVE :: type_run_omp
-  LOGICAL,SAVE :: ok_isccp_omp
   LOGICAL,SAVE :: ok_cosp_omp
   LOGICAL,SAVE :: ok_mensuelCOSP_omp,ok_journeCOSP_omp,ok_hfCOSP_omp
@@ -175 +177 @@
   INTEGER, SAVE :: nbapp_rad_omp, iflag_con_omp
   INTEGER, SAVE :: iflag_ener_conserv_omp
+  INTEGER, SAVE :: iflag_fisrtilp_qsat_omp
   LOGICAL,SAVE :: ok_strato_omp
   LOGICAL,SAVE :: ok_hines_omp
@@ -227 +230 @@
   call getin('VEGET', type_veget_omp)
 !
+
+! Martin
+!Config Key  = ok_snow
+!Config Desc = Flag to activate snow model SISVAT
+!Config Def  = .false.
+  ok_snow_omp = .false.
+  call getin('ok_snow', ok_snow_omp)
+! Martin
+
 !Config Key  = OK_journe
 !Config Desc = Pour des sorties journalieres 
@@ -677 +689 @@
        CALL getin('iflag_ener_conserv',iflag_ener_conserv_omp)
 
+!Config  Key  = iflag_fisrtilp_qsat
+!Config  Desc = Flag de convection
+!Config  Def  = 1
+!Config  Help = Flag  pour la convection les options suivantes existent :
+!Config         -1 pour Kinetic energy correction
+!Config         1  conservation kinetic and enthalpy
+       iflag_fisrtilp_qsat_omp = 0
+       CALL getin('iflag_fisrtilp_qsat',iflag_fisrtilp_qsat_omp)
+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -888 +909 @@
 !
 !-----------------------------------------------------------------------
-!  Valeur imposee de l'humidite du sol pour le modele bucket.
-!Config Key  = qsol0
-!Config Desc =  
-!Config Def  = -1.
-!Config Help = 
-!
+!  Valeur imposee pour configuration idealisees
+!Config Key  = qsol0 pour le bucket, evap0 pour aquaplanetes, albsno0
+! Default value -1 to activate the full computation
   qsol0_omp = -1.
   call getin('qsol0',qsol0_omp)
+  evap0_omp = -1.
+  call getin('evap0',evap0_omp)
+  albsno0_omp = -1.
+  call getin('albsno0',albsno0_omp)
 !
 !-----------------------------------------------------------------------
@@ -1341 +1363 @@
   type_run_omp = 'AMIP'
   call getin('type_run',type_run_omp)
-
-!
-!Config Key  = ok_isccp
-!Config Desc =
-!Config Def  = .true.
-!Config Help =
-!
-! ok_isccp = .true.
-  ok_isccp_omp = .false.
-  call getin('ok_isccp',ok_isccp_omp)
 
 !
@@ -1681 +1693 @@
     iflag_con = iflag_con_omp
     iflag_ener_conserv = iflag_ener_conserv_omp
+    iflag_fisrtilp_qsat = iflag_fisrtilp_qsat_omp
 
     epmax = epmax_omp
@@ -1696 +1709 @@
     solarlong0 = solarlong0_omp
     qsol0 = qsol0_omp
+    evap0 = evap0_omp
+    albsno0 = albsno0_omp
     inertie_sol = inertie_sol_omp
     inertie_ice = inertie_ice_omp
@@ -1737 +1752 @@
          ok_veget=.false.
     endif
+    ! Martin
+    ok_snow = ok_snow_omp
+    ! Martin
 
     ok_newmicro = ok_newmicro_omp
@@ -1786 +1804 @@
     iflag_cvl_sigd = iflag_cvl_sigd_omp
     type_run = type_run_omp
-    ok_isccp = ok_isccp_omp
     ok_cosp = ok_cosp_omp
     ok_mensuelCOSP = ok_mensuelCOSP_omp
@@ -1860 +1877 @@
   write(lunout,*)' Version ocean = ', version_ocean
   write(lunout,*)' Config veget = ', ok_veget,type_veget
+  write(lunout,*)' Snow model SISVAT : ok_snow = ', ok_snow
   write(lunout,*)' Sortie journaliere = ', ok_journe
   write(lunout,*)' Sortie haute frequence = ', ok_hf
@@ -1893 +1911 @@
   write(lunout,*)'iflag_con=',iflag_con
   write(lunout,*)'iflag_ener_conserv=',iflag_ener_conserv
+  write(lunout,*)'iflag_fisrtilp_qsat=',iflag_fisrtilp_qsat
   write(lunout,*)' epmax = ', epmax
   write(lunout,*)' ok_adj_ema = ', ok_adj_ema
@@ -1958 +1977 @@
   write(lunout,*)' iflag_clos = ', iflag_clos
   write(lunout,*)' type_run = ',type_run 
-  write(lunout,*)' ok_isccp = ',ok_isccp 
   write(lunout,*)' ok_cosp = ',ok_cosp
   write(lunout,*)' ok_mensuelCOSP = ',ok_mensuelCOSP
@@ -1965 +1983 @@
   write(lunout,*)' solarlong0 = ', solarlong0
   write(lunout,*)' qsol0 = ', qsol0
+  write(lunout,*)' evap0 = ', evap0
+  write(lunout,*)' albsno0 = ', albsno0
   write(lunout,*)' inertie_sol = ', inertie_sol
   write(lunout,*)' inertie_ice = ', inertie_ice