Index: /trunk/LMDZ.GENERIC/deftank/callphys.GJ581d
===================================================================
--- /trunk/LMDZ.GENERIC/deftank/callphys.GJ581d	(revision 538)
+++ /trunk/LMDZ.GENERIC/deftank/callphys.GJ581d	(revision 539)
@@ -17,4 +17,6 @@
 # Test energy conservation of model physics ?
 enertest  = .true.
+# Check to see if cpp, mugaz values used match gas mixture defined in gases.def (recommended) ?
+check_cpp_match=.true.
 
 ## Radiative transfer options
@@ -26,4 +28,6 @@
 # call multilayer correlated-k radiative transfer ?
 corrk      = .true.
+# Include continuum absorption in radiative transfer (note CO2 is treated separately) ?
+continuum  = .true.
 # folder in which correlated-k data is stored ?
 corrkdir   = CO2_H2Ovar
@@ -109,5 +113,5 @@
 waterrain     = .true.
 # WATER: Precipitation threshold (simple scheme only) ?
-rainthreshold = 0.0
+rainthreshold = 0.001
 # Include hydrology ?
 hydrology     = .true.
Index: /trunk/LMDZ.GENERIC/deftank/callphys.earlymars
===================================================================
--- /trunk/LMDZ.GENERIC/deftank/callphys.earlymars	(revision 538)
+++ /trunk/LMDZ.GENERIC/deftank/callphys.earlymars	(revision 539)
@@ -17,4 +17,6 @@
 # Test energy conservation of model physics ?
 enertest  = .false.
+# Check to see if cpp, mugaz values used match gas mixture defined in gases.def (recommended) ?
+check_cpp_match=.true.
 
 ## Radiative transfer options
@@ -26,4 +28,6 @@
 # call multilayer correlated-k radiative transfer ?
 corrk      = .true.
+# Include continuum absorption in radiative transfer (note CO2 is treated separately) ?
+continuum  = .true.
 # folder in which correlated-k data is stored ?
 corrkdir   = earlymars
@@ -79,5 +83,5 @@
 
 #########################################################################
-## extra non-standard definitions for Gliese 581d
+## extra non-standard definitions for Early Mars
 #########################################################################
 
@@ -104,7 +108,17 @@
 waterrain     = .true.
 # WATER: Precipitation threshold (simple scheme only) ?
-rainthreshold = 0.011
-# WATER: hydrology ?
+rainthreshold = 0.001
+# Include hydrology ?
 hydrology     = .true.
+# H2O snow (and ice) albedo ?
+albedosnow    = 0.5
+# Maximum sea ice thickness ?
+maxicethick   = 0.05
+# Freezing point of seawater (degrees C) ?
+Tsaldiff      = 0.0
+# Evolve surface water sources ?
+sourceevol    = .true.
+# Ice evolution timestep ?
+icetstep      = 10
 
 ## CO2 options 
@@ -117,14 +131,2 @@
 nearco2cond   = .false.
 
-## N2 options
-## ~~~~~~~~~~
-# include N2 in cp and Rayleigh scattering calculation ?
-addn2 = .false.
-# N2 mixing ratio
-n2mixratio = 0.0
-
-## H2 options
-## ~~~~~~~~~~
-# include H2 in cp and Rayleigh scattering calculation ?
-# for now we assume H2 dominant if included
-addh2 = .false.
Index: /trunk/LMDZ.GENERIC/deftank/callphys.earth
===================================================================
--- /trunk/LMDZ.GENERIC/deftank/callphys.earth	(revision 538)
+++ /trunk/LMDZ.GENERIC/deftank/callphys.earth	(revision 539)
@@ -17,4 +17,6 @@
 # Test energy conservation of model physics ?
 enertest  = .false.
+# Check to see if cpp, mugaz values used match gas mixture defined in gases.def (recommended) ?
+check_cpp_match=.true.
 
 ## Radiative transfer options
@@ -26,4 +28,6 @@
 # call multilayer correlated-k radiative transfer ?
 corrk      = .true.
+# Include continuum absorption in radiative transfer (note CO2 is treated separately) ?
+continuum  = .true.
 # folder in which correlated-k data is stored ?
 corrkdir   = N2CO2poor_H2Ovar
@@ -116,14 +120,2 @@
 nearco2cond   = .false.
 
-## N2 options
-## ~~~~~~~~~~
-# include N2 in cp and Rayleigh scattering calculation ?
-addn2 = .false.
-# N2 mixing ratio
-n2mixratio = 0.0
-
-## H2 options
-## ~~~~~~~~~~
-# include H2 in cp and Rayleigh scattering calculation ?
-# for now we assume H2 dominant if included
-addh2 = .false.
Index: /trunk/LMDZ.GENERIC/deftank/gases.def.CO2
===================================================================
--- /trunk/LMDZ.GENERIC/deftank/gases.def.CO2	(revision 538)
+++ /trunk/LMDZ.GENERIC/deftank/gases.def.CO2	(revision 539)
@@ -8,2 +8,4 @@
 # and then mixing ratios.
 # mixing ratio -1 means the gas is variable.
+# Gases should be in the same order as in the Q.dat
+# correlated-k radiative transfer file.
Index: /trunk/LMDZ.GENERIC/deftank/gases.def.CO2H2Ovar
===================================================================
--- /trunk/LMDZ.GENERIC/deftank/gases.def.CO2H2Ovar	(revision 538)
+++ /trunk/LMDZ.GENERIC/deftank/gases.def.CO2H2Ovar	(revision 539)
@@ -10,2 +10,4 @@
 # and then mixing ratios.
 # mixing ratio -1 means the gas is variable.
+# Gases should be in the same order as in the Q.dat
+# correlated-k radiative transfer file.