Index: trunk/cosp_input_nl.txt
===================================================================
--- trunk/cosp_input_nl.txt	(revision 1)
+++ 	(revision )
@@ -1,104 +1,0 @@
-! (c) British Crown Copyright 2008, the Met Office.
-! All rights reserved.
-! 
-! Redistribution and use in source and binary forms, with or without modification, are permitted 
-! provided that the following conditions are met:
-! 
-!     * Redistributions of source code must retain the above copyright notice, this list 
-!       of conditions and the following disclaimer.
-!     * Redistributions in binary form must reproduce the above copyright notice, this list
-!       of conditions and the following disclaimer in the documentation and/or other materials 
-!       provided with the distribution.
-!     * Neither the name of the Met Office nor the names of its contributors may be used 
-!       to endorse or promote products derived from this software without specific prior written 
-!       permission.
-! 
-! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR 
-! IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-! FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
-! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-! DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-! DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-! IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 
-! OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-! Namelist that sets up the main COSP options
-&COSP_INPUT
-  CMOR_NL='./cmor/cosp_cmor_nl.txt', ! CMOR namelist
-  NPOINTS=9026,! Number of gridpoints (klon dans LMDZi : ici correspond a klon de 96x95)
-  NPOINTS_IT=10000,! Max number of gridpoints to be processed in one iteration
-  NCOLUMNS=20,  ! Number of subcolumns
-  NLEVELS=39,   ! Number of model levels 
-  USE_VGRID=.true., ! Use fixed vertical grid for outputs? (if .true. then you need to define number of levels with Nlr)
-  NLR=40,       ! Number of levels in statistical outputs (only used if USE_VGRID=.true.)
-  CSAT_VGRID=.true., ! CloudSat vertical grid? (if .true. then the CloudSat standard grid is used for the outputs.
-                     !  USE_VGRID needs also be .true.)
-  FINPUT='histday.nc', ! NetCDF file with 1D inputs
-!  FINPUT='cosp_input_um_2d.nc', ! NetCDF file with 2D inputs
-  !----------------------------------------------------------------------------------
-  !--------------- Inputs related to radar simulations
-  !----------------------------------------------------------------------------------
-  RADAR_FREQ=94.0, ! CloudSat radar frequency (GHz)
-  SURFACE_RADAR=0, ! surface=1, spaceborne=0
-  use_mie_tables=0,! use a precomputed lookup table? yes=1,no=0
-  use_gas_abs=1,   ! include gaseous absorption? yes=1,no=0
-  do_ray=0,        ! calculate/output Rayleigh refl=1, not=0
-  melt_lay=0,      ! melting layer model off=0, on=1
-  k2=-1,           ! |K|^2, -1=use frequency dependent default
-  use_reff=.true., ! True if you want effective radius to be used by radar simulator (always used by lidar)
-  use_precipitation_fluxes=.true.,  ! True if precipitation fluxes are input to the algorithm 
-  !----------------------------------------------------------------------------------
-  !---------------- Inputs related to lidar simulations
-  !----------------------------------------------------------------------------------
-  Nprmts_max_hydro=12, ! Max number of parameters for hydrometeor size distributions
-  Naero=1,             ! Number of aerosol species (Not used)
-  Nprmts_max_aero=1,   ! Max number of parameters for aerosol size distributions (Not used)
-  lidar_ice_type=0,    ! Ice particle shape in lidar calculations (0=ice-spheres ; 1=ice-non-spherical)
-  OVERLAP=3,   !  overlap type: 1=max, 2=rand, 3=max/rand
-  !----------------------------------------------------------------------------------
-  !---------------- Inputs related to ISCCP simulator
-  !----------------------------------------------------------------------------------
-  ISCCP_TOPHEIGHT=1,  !  1 = adjust top height using both a computed
-                       !  infrared brightness temperature and the visible
-                       !  optical depth to adjust cloud top pressure. Note
-                       !  that this calculation is most appropriate to compare
-                       !  to ISCCP data during sunlit hours.
-                      !  2 = do not adjust top height, that is cloud top
-                       !  pressure is the actual cloud top pressure
-                       !  in the model
-                      !  3 = adjust top height using only the computed
-                       !  infrared brightness temperature. Note that this
-                       !  calculation is most appropriate to compare to ISCCP
-                       !  IR only algortihm (i.e. you can compare to nighttime
-                       !  ISCCP data with this option)
-  ISCCP_TOPHEIGHT_DIRECTION=1,   ! direction for finding atmosphere pressure level
-                                 ! with interpolated temperature equal to the radiance
-                                 ! determined cloud-top temperature
-                                 ! 1 = find the *lowest* altitude (highest pressure) level
-                                 ! with interpolated temperature equal to the radiance
-                                 ! determined cloud-top temperature
-                                 ! 2 = find the *highest* altitude (lowest pressure) level
-                                 ! with interpolated temperature equal to the radiance 
-                                 ! determined cloud-top temperature
-                                 ! ONLY APPLICABLE IF top_height EQUALS 1 or 3
-                                 ! 1 = default setting, and matches all versions of 
-                                 ! ISCCP simulator with versions numbers 3.5.1 and lower
-                                 ! 2 = experimental setting  
-  !----------------------------------------------------------------------------------
-  !-------------- RTTOV inputs
-  !----------------------------------------------------------------------------------
-  Platform=1,    ! satellite platform
-  Satellite=15,  ! satellite
-  Instrument=0,  ! instrument
-  Nchannels=8,   ! Number of channels to be computed
-  Channels=1,3,5,6,8,10,11,13,        ! Channel numbers (please be sure that you supply Nchannels)
-  Surfem=0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,  ! Surface emissivity (please be sure that you supply Nchannels)
-  ZenAng=50.0, ! Satellite Zenith Angle
-  CO2=5.241e-04, ! Mixing ratios of trace gases
-  CH4=9.139e-07,
-  N2O=4.665e-07,
-  CO=2.098e-07
-/
-
-
Index: trunk/cosp_output_nl.txt
===================================================================
--- trunk/cosp_output_nl.txt	(revision 1)
+++ 	(revision )
@@ -1,63 +1,0 @@
-! (c) British Crown Copyright 2008, the Met Office.
-! All rights reserved.
-! 
-! Redistribution and use in source and binary forms, with or without modification, are permitted 
-! provided that the following conditions are met:
-! 
-!     * Redistributions of source code must retain the above copyright notice, this list 
-!       of conditions and the following disclaimer.
-!     * Redistributions in binary form must reproduce the above copyright notice, this list
-!       of conditions and the following disclaimer in the documentation and/or other materials 
-!       provided with the distribution.
-!     * Neither the name of the Met Office nor the names of its contributors may be used 
-!       to endorse or promote products derived from this software without specific prior written 
-!       permission.
-! 
-! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR 
-! IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-! FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
-! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-! DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-! DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
-! IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 
-! OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-! Namelist that sets up output-related variables. It controls 
-! the instrument simulators to run and the list of variables 
-! to be written to file
-&COSP_OUTPUT
-  ! Simulator flags
-  Lradar_sim=.false.,
-  Llidar_sim=.true.,
-  Lisccp_sim=.true.,
-  Lmisr_sim=.false.,
-  ! Output variables
-  Lalbisccp=.true.,
-  Latb532=.true.,
-  Lboxptopisccp=.true.,
-  Lboxtauisccp=.true.,
-  Lcfad_dbze94=.false.,
-  Lcfad_lidarsr532=.true.,
-  Lclcalipso=.true.,
-  Lclhcalipso=.true.,
-  Lclisccp2=.true.,
-  Lcllcalipso=.true.,
-  Lclmcalipso=.true.,
-  Lcltcalipso=.true.,
-  Lctpisccp=.true.,
-  Ldbze94=.false.,
-  Ltauisccp=.true.,
-  Ltclisccp=.true.,
-  Llongitude=.false.,
-  Llatitude=.false.,
-  Lparasol_refl=.true.,
-  LclMISR=.false.,
-  Lmeantbisccp=.true.,
-  Lmeantbclrisccp=.true.,
-  ! Use lidar and radar
-  Lclcalipso2=.false.,
-  Lcltlidarradar=.false.,
-  ! These are provided for debugging or special purposes
-  Lfrac_out=.false.,
-  Lbeta_mol532=.true.,  
-/
Index: trunk/deftanks/terre/cosp_input_nl.txt
===================================================================
--- trunk/deftanks/terre/cosp_input_nl.txt	(revision 2)
+++ trunk/deftanks/terre/cosp_input_nl.txt	(revision 2)
@@ -0,0 +1,104 @@
+! (c) British Crown Copyright 2008, the Met Office.
+! All rights reserved.
+! 
+! Redistribution and use in source and binary forms, with or without modification, are permitted 
+! provided that the following conditions are met:
+! 
+!     * Redistributions of source code must retain the above copyright notice, this list 
+!       of conditions and the following disclaimer.
+!     * Redistributions in binary form must reproduce the above copyright notice, this list
+!       of conditions and the following disclaimer in the documentation and/or other materials 
+!       provided with the distribution.
+!     * Neither the name of the Met Office nor the names of its contributors may be used 
+!       to endorse or promote products derived from this software without specific prior written 
+!       permission.
+! 
+! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR 
+! IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+! FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+! DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+! DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
+! IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 
+! OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+! Namelist that sets up the main COSP options
+&COSP_INPUT
+  CMOR_NL='./cmor/cosp_cmor_nl.txt', ! CMOR namelist
+  NPOINTS=9026,! Number of gridpoints (klon dans LMDZi : ici correspond a klon de 96x95)
+  NPOINTS_IT=10000,! Max number of gridpoints to be processed in one iteration
+  NCOLUMNS=20,  ! Number of subcolumns
+  NLEVELS=39,   ! Number of model levels 
+  USE_VGRID=.true., ! Use fixed vertical grid for outputs? (if .true. then you need to define number of levels with Nlr)
+  NLR=40,       ! Number of levels in statistical outputs (only used if USE_VGRID=.true.)
+  CSAT_VGRID=.true., ! CloudSat vertical grid? (if .true. then the CloudSat standard grid is used for the outputs.
+                     !  USE_VGRID needs also be .true.)
+  FINPUT='histday.nc', ! NetCDF file with 1D inputs
+!  FINPUT='cosp_input_um_2d.nc', ! NetCDF file with 2D inputs
+  !----------------------------------------------------------------------------------
+  !--------------- Inputs related to radar simulations
+  !----------------------------------------------------------------------------------
+  RADAR_FREQ=94.0, ! CloudSat radar frequency (GHz)
+  SURFACE_RADAR=0, ! surface=1, spaceborne=0
+  use_mie_tables=0,! use a precomputed lookup table? yes=1,no=0
+  use_gas_abs=1,   ! include gaseous absorption? yes=1,no=0
+  do_ray=0,        ! calculate/output Rayleigh refl=1, not=0
+  melt_lay=0,      ! melting layer model off=0, on=1
+  k2=-1,           ! |K|^2, -1=use frequency dependent default
+  use_reff=.true., ! True if you want effective radius to be used by radar simulator (always used by lidar)
+  use_precipitation_fluxes=.true.,  ! True if precipitation fluxes are input to the algorithm 
+  !----------------------------------------------------------------------------------
+  !---------------- Inputs related to lidar simulations
+  !----------------------------------------------------------------------------------
+  Nprmts_max_hydro=12, ! Max number of parameters for hydrometeor size distributions
+  Naero=1,             ! Number of aerosol species (Not used)
+  Nprmts_max_aero=1,   ! Max number of parameters for aerosol size distributions (Not used)
+  lidar_ice_type=0,    ! Ice particle shape in lidar calculations (0=ice-spheres ; 1=ice-non-spherical)
+  OVERLAP=3,   !  overlap type: 1=max, 2=rand, 3=max/rand
+  !----------------------------------------------------------------------------------
+  !---------------- Inputs related to ISCCP simulator
+  !----------------------------------------------------------------------------------
+  ISCCP_TOPHEIGHT=1,  !  1 = adjust top height using both a computed
+                       !  infrared brightness temperature and the visible
+                       !  optical depth to adjust cloud top pressure. Note
+                       !  that this calculation is most appropriate to compare
+                       !  to ISCCP data during sunlit hours.
+                      !  2 = do not adjust top height, that is cloud top
+                       !  pressure is the actual cloud top pressure
+                       !  in the model
+                      !  3 = adjust top height using only the computed
+                       !  infrared brightness temperature. Note that this
+                       !  calculation is most appropriate to compare to ISCCP
+                       !  IR only algortihm (i.e. you can compare to nighttime
+                       !  ISCCP data with this option)
+  ISCCP_TOPHEIGHT_DIRECTION=1,   ! direction for finding atmosphere pressure level
+                                 ! with interpolated temperature equal to the radiance
+                                 ! determined cloud-top temperature
+                                 ! 1 = find the *lowest* altitude (highest pressure) level
+                                 ! with interpolated temperature equal to the radiance
+                                 ! determined cloud-top temperature
+                                 ! 2 = find the *highest* altitude (lowest pressure) level
+                                 ! with interpolated temperature equal to the radiance 
+                                 ! determined cloud-top temperature
+                                 ! ONLY APPLICABLE IF top_height EQUALS 1 or 3
+                                 ! 1 = default setting, and matches all versions of 
+                                 ! ISCCP simulator with versions numbers 3.5.1 and lower
+                                 ! 2 = experimental setting  
+  !----------------------------------------------------------------------------------
+  !-------------- RTTOV inputs
+  !----------------------------------------------------------------------------------
+  Platform=1,    ! satellite platform
+  Satellite=15,  ! satellite
+  Instrument=0,  ! instrument
+  Nchannels=8,   ! Number of channels to be computed
+  Channels=1,3,5,6,8,10,11,13,        ! Channel numbers (please be sure that you supply Nchannels)
+  Surfem=0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,  ! Surface emissivity (please be sure that you supply Nchannels)
+  ZenAng=50.0, ! Satellite Zenith Angle
+  CO2=5.241e-04, ! Mixing ratios of trace gases
+  CH4=9.139e-07,
+  N2O=4.665e-07,
+  CO=2.098e-07
+/
+
+
Index: trunk/deftanks/terre/cosp_output_nl.txt
===================================================================
--- trunk/deftanks/terre/cosp_output_nl.txt	(revision 2)
+++ trunk/deftanks/terre/cosp_output_nl.txt	(revision 2)
@@ -0,0 +1,63 @@
+! (c) British Crown Copyright 2008, the Met Office.
+! All rights reserved.
+! 
+! Redistribution and use in source and binary forms, with or without modification, are permitted 
+! provided that the following conditions are met:
+! 
+!     * Redistributions of source code must retain the above copyright notice, this list 
+!       of conditions and the following disclaimer.
+!     * Redistributions in binary form must reproduce the above copyright notice, this list
+!       of conditions and the following disclaimer in the documentation and/or other materials 
+!       provided with the distribution.
+!     * Neither the name of the Met Office nor the names of its contributors may be used 
+!       to endorse or promote products derived from this software without specific prior written 
+!       permission.
+! 
+! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR 
+! IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+! FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+! DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+! DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
+! IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 
+! OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+! Namelist that sets up output-related variables. It controls 
+! the instrument simulators to run and the list of variables 
+! to be written to file
+&COSP_OUTPUT
+  ! Simulator flags
+  Lradar_sim=.false.,
+  Llidar_sim=.true.,
+  Lisccp_sim=.true.,
+  Lmisr_sim=.false.,
+  ! Output variables
+  Lalbisccp=.true.,
+  Latb532=.true.,
+  Lboxptopisccp=.true.,
+  Lboxtauisccp=.true.,
+  Lcfad_dbze94=.false.,
+  Lcfad_lidarsr532=.true.,
+  Lclcalipso=.true.,
+  Lclhcalipso=.true.,
+  Lclisccp2=.true.,
+  Lcllcalipso=.true.,
+  Lclmcalipso=.true.,
+  Lcltcalipso=.true.,
+  Lctpisccp=.true.,
+  Ldbze94=.false.,
+  Ltauisccp=.true.,
+  Ltclisccp=.true.,
+  Llongitude=.false.,
+  Llatitude=.false.,
+  Lparasol_refl=.true.,
+  LclMISR=.false.,
+  Lmeantbisccp=.true.,
+  Lmeantbclrisccp=.true.,
+  ! Use lidar and radar
+  Lclcalipso2=.false.,
+  Lcltlidarradar=.false.,
+  ! These are provided for debugging or special purposes
+  Lfrac_out=.false.,
+  Lbeta_mol532=.true.,  
+/
Index: trunk/deftanks/terre/gcm.def
===================================================================
--- trunk/deftanks/terre/gcm.def	(revision 2)
+++ trunk/deftanks/terre/gcm.def	(revision 2)
@@ -0,0 +1,62 @@
+## $Id: gcm.def 1403 2010-07-01 09:02:53Z fairhead $
+## nombre de pas par jour (multiple de iperiod) ( ici pour  dt = 1 min )      
+day_step=480
+## periode pour le pas Matsuno (en pas)
+iperiod=5
+## periode de la dissipation (en pas)
+idissip=5
+## choix de l'operateur de dissipation (star ou  non star )
+lstardis=y
+## nombre d'iterations de l'operateur de dissipation   gradiv
+nitergdiv=1
+## nombre d'iterations de l'operateur de dissipation  nxgradrot
+nitergrot=2
+## nombre d'iterations de l'operateur de dissipation  divgrad            
+niterh=2
+## temps de dissipation des plus petites long.d ondes pour u,v (gradiv)  
+tetagdiv=5400.
+## temps de dissipation des plus petites long.d ondes pour u,v(nxgradrot)
+tetagrot=5400.
+## temps de dissipation des plus petites long.d ondes pour  h ( divgrad) 
+tetatemp=5400.
+## coefficient pour gamdissip                                            
+coefdis=0.
+## choix du shema d'integration temporelle (Matsuno:y ou Matsuno-leapfrog:n) 
+purmats=n
+## avec ou sans physique
+## 0: pas de physique (e.g. en mode Shallow Water)
+## 1: avec physique (e.g. physique phylmd)
+## 2: avec rappel newtonien dans la dynamique                                         
+iflag_phys=1
+## avec ou sans fichiers de demarrage (start.nc, startphy.nc) ?
+## (sans fichiers de demarrage, initialisation des champs par iniacademic
+##  dans la dynamique)
+read_start=y
+## periode de la physique (en pas dynamiques, n'a de sens que si iflag_phys=1)                                       
+iphysiq=10
+##  Avec ou sans strato
+ok_strato=n 
+#  Couche eponge dans les couches de pression plus faible que 100 fois la pression de la derniere couche
+iflag_top_bound=2
+#  Coefficient pour la couche eponge (valeur derniere couche)
+tau_top_bound=5.e-5
+## longitude en degres du centre du zoom                                 
+clon=0.
+## latitude en degres du centre du zoom                                  
+clat=0.
+## facteur de grossissement du zoom,selon longitude                      
+grossismx=1.0
+## facteur de grossissement du zoom ,selon latitude                      
+grossismy=1.0
+##  Fonction  f(y)  hyperbolique  si = .true.  , sinon  sinusoidale         
+fxyhypb=y
+## extension en longitude  de la zone du zoom  ( fraction de la zone totale)
+dzoomx=0.0
+## extension en latitude de la zone  du zoom  ( fraction de la zone totale)
+dzoomy=0.0
+##raideur du zoom en  X
+taux=3.
+##raideur du zoom en  Y
+tauy=3.
+##  Fonction  f(y) avec y = Sin(latit.) si = .true. , sinon y = latit.         
+ysinus=y
Index: trunk/deftanks/terre/guide.def
===================================================================
--- trunk/deftanks/terre/guide.def	(revision 2)
+++ trunk/deftanks/terre/guide.def	(revision 2)
@@ -0,0 +1,37 @@
+ok_guide=y
+# guidage sur niveaux modèle (y) ou standard
+guide_modele=y
+# inversion de l'ordre des niveaux verticaux
+ok_invertp=y
+ncep=y
+ ######################################
+ #### guidage de u #####
+ guide_u=y
+ ######################################
+ #### guidage de v #####
+ guide_v=y
+ ######################################
+ #### guidage de T #####
+ guide_T=y
+ ######################################
+ #### guidage de P #####
+ guide_P=n
+ ######################################
+ #### guidage de Q (hr=y:hum.rel,n:hum.spec) #####
+ guide_Q=n
+ guide_hr=n
+ ######################################
+ ## guidage dans la couche limite
+ guide_BL=n
+ ######################################
+ini_anal=n
+tau_min_u=0.04166667
+tau_max_u=0.125
+tau_min_v=0.04166667
+tau_max_v=0.125
+tau_min_T=0.04166667
+tau_max_T=10.
+tau_min_Q=0.2
+tau_max_Q=10.
+# gamma limité
+gamma4=n
Index: trunk/deftanks/terre/offline.def
===================================================================
--- trunk/deftanks/terre/offline.def	(revision 2)
+++ trunk/deftanks/terre/offline.def	(revision 2)
@@ -0,0 +1,12 @@
+#
+# $Header$
+#
+T
+4
+T
+-2.
+48.1
+1
+T
+6
+2
Index: trunk/deftanks/terre/orchidee.def
===================================================================
--- trunk/deftanks/terre/orchidee.def	(revision 2)
+++ trunk/deftanks/terre/orchidee.def	(revision 2)
@@ -0,0 +1,63 @@
+#
+#
+# Parameter file for LMDZ4OR_v2 configuration
+# See comments : http://forge.ipsl.jussieu.fr/orchidee/
+#
+STOMATE_OK_CO2=TRUE
+# STOMATE_OK_STOMATE is not set
+# STOMATE_OK_DGVM is not set
+# STOMATE_WATCHOUT is not set
+SECHIBA_restart_in=default
+SECHIBA_rest_out=sechiba_rest.nc
+SECHIBA_reset_time=y
+#
+OUTPUT_FILE=sechiba_out.nc
+WRITE_STEP=2592000
+SECHIBA_HISTLEVEL=5
+#
+SECHIBA_HISTFILE2 = FALSE
+SECHIBA_OUTPUT_FILE2 = sechiba_out_2.nc
+WRITE_STEP2 = 86400.0
+SECHIBA_HISTLEVEL2 = 1
+#
+STOMATE_OUTPUT_FILE=stomate_history.nc
+STOMATE_HIST_DT=10.
+STOMATE_HISTLEVEL=0
+SECHIBA_DAY=0.0
+SECHIBA_ZCANOP=0.5
+DT_SLOW=86400.
+# IMPOSE_VEG is not set
+VEGETATION_FILE=carteveg5km.nc
+# VEGETATION_FILE=pft_new.nc
+DIFFUCO_LEAFCI=233.
+CONDVEG_SNOWA=default
+# IMPOSE_AZE is not set
+SOILALB_FILE=soils_param.nc
+SOILTYPE_FILE=soils_param.nc 
+ENERBIL_TSURF=280.
+HYDROL_SNOW=0.0
+HYDROL_SNOWAGE=0.0
+HYDROL_SNOWICE=0.0
+HYDROL_SNOWICEAGE=0.0
+HYDROL_HDRY=1.0
+HYDROL_HUMR=1.0
+HYDROL_BQSB=default
+HYDROL_GQSB=0.0
+HYDROL_DSG=0.0
+HYDROL_DSP=default
+HYDROL_QSV=0.0
+HYDROL_OK_HDIFF=n
+HYDROL_TAU_HDIFF=1800.
+THERMOSOIL_TPRO=280.
+RIVER_ROUTING=y
+ROUTING_FILE=routing.nc
+LAI_MAP=y
+LAI_FILE=lai2D.nc
+SECHIBA_QSINT=0.02
+ALB_BARE_MODEL = FALSE
+PERCENT_THROUGHFALL_PFT = 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.
+RVEG_PFT = .5, .5, .5, .5, .5, .5, .5, .5, .5, .5, .5, .5, .5
+CDRAG_FROM_GCM = .TRUE.
+#LAND_USE=y
+#VEGET_YEAR=0
+#VEGET_UPDATE=1Y
Index: trunk/deftanks/terre/output.def
===================================================================
--- trunk/deftanks/terre/output.def	(revision 2)
+++ trunk/deftanks/terre/output.def	(revision 2)
@@ -0,0 +1,794 @@
+######## Abderrahmane le 20 11 08 ########################
+# Niveaux de sorties et nom pour chaque variable dans les#
+# fichiers histmth histday histhf histins histLES        #
+##########################################################
+# Surface geop.height
+flag_phis         =  1, 1, 10, 1, 1    
+name_phis         =  phis
+# Grid area
+flag_aire         =  1, 1, 10,  1, 1    
+name_aire         =  aire
+# Surfac ter+lic
+flag_contfracATM  =  10, 1,  1, 10, 10    
+name_contfracATM  =  contfracATM
+# Surface terre OR  
+flag_contfracOR   =  10, 1,  1, 10, 10    
+name_contfracOR   =  contfracOR
+# Grid area CONT
+flag_aireTER      =  10, 10, 1, 10, 10    
+name_aireTER      =  aireTER
+# Latent heat flux
+flag_flat         =  10, 1, 10, 10, 1    
+name_flat         =  flat
+# Sea Level Pressure
+flag_slp          =  1, 1, 1, 10, 1    
+name_slp          =  slp
+# Surface Temperature
+flag_tsol         =  1, 1, 1, 1, 1    
+name_tsol         =  tsol
+# Temperature 2m
+flag_t2m          =  1, 1, 1, 1, 1    
+name_t2m          =  t2m
+# Temperature min 2m
+flag_t2m_min      =  1, 1, 10, 10, 10    
+name_t2m_min      =  t2m_min
+# Temperature max 2m
+flag_t2m_max      =  1, 1, 10, 10, 10    
+name_t2m_max      =  t2m_max
+# Temperature ter lic oce sic at 2m
+flag_t2m_ter      =  10, 4, 10, 10, 10    
+name_t2m_ter      =  t2m_ter 
+flag_t2m_lic      =  10, 4, 10, 10, 10    
+name_t2m_lic      =  t2m_lic
+flag_t2m_oce      =  10, 4, 10, 10, 10    
+name_t2m_oce      =  t2m_oce
+flag_t2m_sic      =  10, 4, 10, 10, 10    
+name_t2m_sic      =  t2m_sic 
+# 10-m wind speed
+flag_wind10m      =  1, 1, 1, 10, 10    
+name_wind10m      =  wind10m
+# 10-m wind speed max
+flag_wind10max    =  10, 1, 10, 10, 10    
+name_wind10max    =  wind10max
+# Sea-ice fraction
+flag_sicf         =  1, 1, 10, 10, 10    
+name_sicf         =  sicf
+# Specific humidity 2m
+flag_q2m          =  1, 1, 1, 1, 1    
+name_q2m          =  q2m
+# 10m zonal wind
+flag_u10m         =  1, 1, 1, 1, 1    
+name_u10m         =  u10m
+# 10m meridional wind
+flag_v10m         =  1, 1, 1, 1, 1    
+name_v10m         =  v10m
+# Surface Pressure
+flag_psol         =  1, 1, 1, 1, 1    
+name_psol         =  psol
+# Surface Air humidity
+flag_qsurf        =  1, 10, 10, 10, 10    
+name_qsurf        =  qsurf
+# 10m zonal wind (ter lic oce sic)
+flag_u10m_ter     =  10, 4, 10, 10, 10    
+name_u10m_ter     =  u10m_ter
+flag_u10m_lic     =  10, 4, 10, 10, 10    
+name_u10m_lic     =  u10m_lic
+flag_u10m_oce     =  10, 4, 10, 10, 10    
+name_u10m_oce     =  u10m_oce
+flag_u10m_sic     =  10, 4, 10, 10, 10    
+name_u10m_sic     =  u10m_sic
+# 10m meridien  wind (ter oce ice lic)
+flag_v10m_ter     =  10, 4, 10, 10, 10    
+name_v10m_ter     =  v10m_ter
+flag_v10m_lic     =  10, 4, 10, 10, 10    
+name_v10m_lic     =  v10m_lic
+flag_v10m_oce     =  10, 4, 10, 10, 10    
+name_v10m_oce     =  v10m_oce
+flag_v10m_sic     =  10, 4, 10, 10, 10    
+name_v10m_sic     =  v10m_sic
+# Soil watter content
+flag_qsol         =  1, 10, 10, 1, 1    
+name_qsol         =  qsol
+# Number of dayrain(liq+sol)
+flag_ndayrain     =  1, 10, 10, 10, 10    
+name_ndayrain     =  ndayrain
+# Precip Totale liq+sol
+flag_precip       =  1, 1, 1, 1, 1    
+name_precip       =  precip
+# Large-scale Precip
+flag_plul         =  1, 1, 1, 1, 10    
+name_plul         =  plul 
+# Convective Precip
+flag_pluc         =  1, 1, 1, 1, 10    
+name_pluc         =  pluc
+# Snow fall
+flag_snow         =  1, 1, 10, 1, 10    
+name_snow         =  snow
+# Evaporation
+flag_evap         =  1, 1, 10, 1, 10    
+name_evap         =  evap
+# Solar rad. at TOA
+flag_tops         =  1, 1, 10, 10, 10    
+name_tops         =  tops
+# CS Solar rad. at TOA
+flag_tops0        =  1, 5, 10, 10, 10    
+name_tops0        =  tops0
+# IR rad. at TOA
+flag_topl         =  1, 1, 10, 1, 10    
+name_topl         =  topl
+# CR IR rad. at TOA
+flag_topl0        =  1, 5, 10, 10, 10    
+name_topl0        =  topl0
+# SWup at TOA
+flag_SWupTOA      =  1, 4, 10, 10, 10    
+name_SWupTOA      =  SWupTOA
+# CR SWup at TOA
+flag_SWupTOAclr   =  1, 4, 10, 10, 10    
+name_SWupTOAclr   =  SWupTOAclr
+# SWdn at TOA
+flag_SWdnTOA      =  1, 4, 10, 10, 10    
+name_SWdnTOA      =  SWdnTOA
+# CR SWdn at TOA
+flag_SWdnTOAclr   =  1, 4, 10, 10, 10    
+name_SWdnTOAclr   =  SWdnTOAclr
+# SWup at 200hPa
+flag_SWup200      =  1, 10, 10, 10, 10    
+name_SWup200      =  SWup200
+# CR SWup at 200hPa
+flag_SWup200clr   =  10, 1, 10, 10, 10    
+name_SWup200clr   =  SWup200clr
+# SWdn at 200hPa
+flag_SWdn200      =  1, 10, 10, 10, 10    
+name_SWdn200      =  SWdn200
+# CR SWdn at 200hPa
+flag_SWdn200clr   =  10, 1, 10, 10, 10    
+name_SWdn200clr   =  SWdn200clr
+# LWup at 200mb
+flag_LWup200      =  1, 10, 10, 10, 10    
+name_LWup200      =  LWup200
+# CR LWup at 200mb
+flag_LWup200clr   =  1, 10, 10, 10, 10    
+name_LWup200clr   =  LWup200clr
+# LWdn at 200mb
+flag_LWdn200      =  1, 10, 10, 10, 10    
+name_LWdn200      =  LWdn200
+# CR LWdn at 200mb
+flag_LWdn200clr   =  1, 10, 10, 10, 10    
+name_LWdn200clr   =  LWdn200clr
+# Solar rad. at surf
+flag_sols         =  1, 1, 10, 1, 10    
+name_sols         =  sols
+# CR Solar rad. at surf
+flag_sols0        =  1, 5, 10, 10, 10    
+name_sols0        =  sols0
+# IR rad. at surface
+flag_soll         =  1, 1, 10, 1, 10    
+name_soll         =  soll
+# CR IR rad. at surface
+flag_soll0        =  1, 5, 10, 10, 10    
+name_soll0        =  soll0
+# Rayonnement au sol
+flag_radsol       =  1, 1, 10, 10, 10    
+name_radsol       =  radsol
+# SWup at surface
+flag_SWupSFC      =  1, 4, 10, 10, 10    
+name_SWupSFC      =  SWupSFC
+# CR SWup at surface
+flag_SWupSFCclr   =  1, 4, 10, 10, 10    
+name_SWupSFCclr   =  SWupSFCclr
+# SWdn at surface
+flag_SWdnSFC      =  1, 1, 10, 10, 10    
+name_SWdnSFC      =  SWdnSFC
+# CR at surface
+flag_SWdnSFCclr   =  1, 4, 10, 10, 10    
+name_SWdnSFCclr   =  SWdnSFCclr
+# LWup at surface
+flag_LWupSFC      =  1, 4, 10, 10, 10    
+name_LWupSFC      =  LWupSFC
+# CR LWup at surface
+flag_LWupSFCclr   =  1, 4, 10, 10, 10    
+name_LWupSFCclr   =  LWupSFCclr
+# LWdn  at surface
+flag_LWdnSFC      =  1, 4, 10, 10, 10    
+name_LWdnSFC      =  LWdnSFC
+# CR LWdn  at surface
+flag_LWdnSFCclr   =  1, 4, 10, 10, 10    
+name_LWdnSFCclr   =  LWdnSFCclr
+# Surf. total heat flux
+flag_bils         =  1, 2, 10, 1, 10    
+name_bils         =  bils
+# Sensible heat flux
+flag_sens         =  1, 1, 10, 1, 1    
+name_sens         =  sens
+# Heat flux derivation
+flag_fder         =  1, 2, 10, 1, 10    
+name_fder         =  fder
+# Thermal flux for snow melting
+flag_ffonte       =  1, 10, 10, 10, 10    
+name_ffonte       =  ffonte
+# Ice Calving
+flag_fqcalving    =  1, 10, 10, 10, 10    
+name_fqcalving    =  fqcalving
+# Land ice melt
+flag_fqfonte      =  1, 10, 10, 10, 10    
+name_fqfonte      =  fqfonte
+# Zonal wind stress (ter ice liq oce)
+flag_taux_ter     =  1, 4, 10, 1, 10    
+name_taux_ter     =  taux_ter
+flag_taux_lic     =  1, 4, 10, 1, 10    
+name_taux_lic     =  taux_lic                                          
+flag_taux_oce     =  1, 4, 10, 1, 10    
+name_taux_oce     =  taux_oce
+flag_taux_sic     =  1, 4, 10, 1, 10    
+name_taux_sic     =  taux_sic
+# Meridien wind stress (ter ice liq oce)
+flag_tauy_ter     =  1, 4, 10, 1, 10    
+name_tauy_ter     =  tauy_ter
+flag_tauy_lic     =  1, 4, 10, 1, 10    
+name_tauy_lic     =  tauy_lic
+flag_tauy_oce     =  1, 4, 10, 1, 10    
+name_tauy_oce     =  tauy_oce
+flag_tauy_sic     =  1, 4, 10, 1, 10    
+name_tauy_sic     =  tauy_sic
+# % surface (ter ice liq oce)
+flag_pourc_ter    =  1, 4, 10, 1, 10    
+name_pourc_ter    =  pourc_ter  
+flag_pourc_lic    =  1, 4, 10, 1, 10    
+name_pourc_lic    =  pourc_lic
+flag_pourc_oce    =  1, 4, 10, 1, 10    
+name_pourc_oce    =  pourc_oce
+flag_pourc_sic    =  1, 4, 10, 1, 10    
+name_pourc_sic    =  pourc_sic
+# Fraction (ter ice liq oce)
+flag_fract_ter    =  1, 4, 10, 1, 10    
+name_fract_ter    =  fract_ter
+flag_fract_lic    =  1, 4, 10, 1, 10    
+name_fract_lic    =  fract_lic
+flag_fract_oce     =  1, 4, 10, 1, 10    
+name_fract_oce    =  fract_oce
+flag_fract_sic    =  1, 4, 10, 1, 10    
+name_fract_sic    =  fract_sic
+# Surface temperature (ter ice liq oce)
+flag_tsol_ter     =  1, 4, 10, 1, 10    
+name_tsol_ter     =  tsol_ter
+flag_tsol_lic     =  1, 4, 10, 1, 10    
+name_tsol_lic     =  tsol_lic
+flag_tsol_oce     =  1, 4, 10, 1, 10    
+name_tsol_oce     =  tsol_oce
+flag_tsol_sic     =  1, 4, 10, 1, 10    
+name_tsol_sic     =  tsol_sic
+# Sensible heat flux (ter ice liq oce)
+flag_sens_ter     =  1, 4, 10, 1, 10    
+name_sens_ter     =  sens_ter
+flag_sens_lic     =  1, 4, 10, 1, 10    
+name_sens_lic     =  sens_lic
+flag_sens_oce     =  1, 4, 10, 1, 10    
+name_sens_oce     =  sens_oce
+flag_sens_sic     =  1, 4, 10, 1, 10    
+name_sens_sic     =  sens_sic
+# Latent heat flux (ter ice liq oce)
+flag_lat_ter      =  1, 4, 10, 1, 10    
+name_lat_ter      =  lat_ter 
+flag_lat_lic      =  1, 4, 10, 1, 10    
+name_lat_lic      =  lat_lic
+flag_lat_oce      =  1, 4, 10, 1, 10    
+name_lat_oce      =  lat_oce
+flag_lat_sic      =  1, 4, 10, 1, 10    
+name_lat_sic      =  lat_sic 
+# LW (ter ice liq oce)
+flag_flw_ter      =  1, 10, 10, 10, 10    
+name_flw_ter      =  flw_ter
+flag_flw_lic      =  1, 10, 10, 10, 10    
+name_flw_lic      =  flw_lic
+flag_flw_oce      =  1, 10, 10, 10, 10    
+name_flw_oce      =  flw_oce
+flag_flw_sic      =  1, 10, 10, 10, 10    
+name_flw_sic      =  flw_sic
+# SW (ter ice liq oce)
+flag_fsw_ter      =  1, 10, 10, 10, 10    
+name_fsw_ter      =  fsw_ter
+flag_fsw_lic      =  1, 10, 10, 10, 10    
+name_fsw_lic      =  fsw_lic
+flag_fsw_oce      =  1, 10, 10, 10, 10    
+name_fsw_oce      =  fsw_oce
+flag_fsw_sic      =  1, 10, 10, 10, 10    
+name_fsw_sic      =  fsw_sic
+# Bilan sol (ter ice liq oce)
+flag_wbils_ter    =  1, 10, 10, 10, 10    
+name_wbils_ter    =  wbils_ter
+flag_wbils_lic    =  1, 10, 10, 10, 10    
+name_wbils_lic    =  wbils_lic
+flag_wbils_oce    =  1, 10, 10, 10, 10    
+name_wbils_oce    =  wbils_oce
+flag_wbils_sic   =  1, 10, 10, 10, 10    
+name_wbils_sic    =  wbils_sic 
+# Bilan eau (ter ice liq oce)
+flag_wbilo_ter    =  1, 10, 10, 10, 10    
+name_wbilo_ter    =  wbilo_ter
+flag_wbilo_lic    =  1, 10, 10, 10, 10    
+name_wbilo_lic    =  wbilo_lic
+flag_wbilo_oce    =  1, 10, 10, 10, 10    
+name_wbilo_oce    =  wbilo_oce
+flag_wbilo_sic    =  1, 10, 10, 10, 10    
+name_wbilo_sic    =  wbilo_sic
+# Momentum drag coef
+flag_cdrm         =  1, 10, 10, 1, 10    
+name_cdrm         =  cdrm
+# Heat drag coef
+flag_cdrh         =  1, 10, 10, 1, 10    
+name_cdrh         =  cdrh 
+# Low-level cloudiness
+flag_cldl         =  1, 1, 10, 10, 10    
+name_cldl         =  cldl
+# Mid-level cloudiness
+flag_cldm         =  1, 1, 10, 10, 10    
+name_cldm         =  cldm
+# High-level cloudiness
+flag_cldh         =  1, 1, 10, 10, 10    
+name_cldh         =  cldh
+# Total cloudiness
+flag_cldt         =  1, 1, 2, 10, 10    
+name_cldt         =  cldt
+# Cloud liquid water path
+flag_cldq         =  1, 1, 10, 10, 10    
+name_cldq         =  cldq
+# Cloud water path
+flag_lwp          =  1, 5, 10, 10, 10    
+name_lwp          =  lwp
+# Cloud ice water path
+flag_iwp          =  1, 5, 10, 10, 10    
+name_iwp          =  iwp
+# Zonal energy transport
+flag_ue           =  1, 10, 10, 10, 10    
+name_ue           =  ue
+# Merid energy transport
+flag_ve           =  1, 10, 10, 10, 10    
+name_ve           =  ve
+# Zonal humidity transport
+flag_uq           =  1, 10, 10, 10, 10    
+name_uq           =  uq
+# Merid humidity transport
+flag_vq           =  1, 10, 10, 10, 10    
+name_vq           =  vq
+# Conv avlbl pot ener
+flag_cape         =  1, 10, 10, 10, 10    
+name_cape         =  cape
+# Cld base pressure
+flag_pbase        =  1, 10, 10, 10, 10    
+name_pbase        =  pbase
+# Cld top pressure
+flag_ptop         =  1, 4, 10, 10, 10    
+name_ptop         =  ptop
+# Cld base mass flux
+flag_fbase        =  1, 10, 10, 10, 10    
+name_fbase        =  fbase
+# Precipitable water
+flag_prw          =  1, 1, 10, 10, 10    
+name_prw          =  prw
+# Boundary Layer Height
+flag_s_pblh       =  1, 10, 10, 1, 1    
+name_s_pblh       =  pblh
+# t at Boundary Layer Height
+flag_s_pblt       =  1, 10, 10, 1, 1    
+name_s_pblt       =  pblt
+# Condensation level
+flag_s_lcl        =  1, 10, 10, 1, 10    
+name_s_lcl        =  lcl
+# Conv avlbl pot enerfor ABL
+flag_s_capCL      =  1, 10, 10, 1, 10    
+name_s_capCL      =  capCL
+# Liq Water in BL
+flag_s_oliqCL     =  1, 10, 10, 1, 10    
+name_s_oliqCL     =  oliqCL
+# Instability criteria(ABL)
+flag_s_cteiCL     =  1, 10, 10, 1, 1    
+name_s_cteiCL     =  cteiCL
+# Exces du thermique
+flag_s_therm      =  1, 10, 10, 1, 1    
+name_s_therm      =  therm
+# deep_cape(HBTM2)
+flag_s_trmb1      =  1, 10, 10, 1, 10    
+name_s_trmb1      =  trmb1
+# inhibition (HBTM2)
+flag_s_trmb2      =  1, 10, 10, 1, 10    
+name_s_trmb2      =  trmb2
+# Point Omega (HBTM2)
+flag_s_trmb3      =  1, 10, 10, 1, 10    
+name_s_trmb3      =  trmb3
+# Bilan au sol sur ocean slab
+flag_slab_bils    =  1, 1, 10, 10, 10    
+name_slab_bils    =  slab_bils 
+# ALE BL
+flag_ale_bl       =  1, 1, 1, 1, 10    
+name_ale_bl       =  ale_bl 
+# alp_bl
+flag_alp_bl       =  1, 1, 1, 1, 10    
+name_alp_bl       =  alp_bl
+# ale_wk
+flag_ale_wk       =  1, 1, 1, 1, 10    
+name_ale_wk       =  ale_wk
+# alp_wk
+flag_alp_wk       =  1, 1, 1, 1, 10    
+name_alp_wk       =  alp_wk
+# ale
+flag_ale          =  1, 1, 1, 1, 10    
+name_ale          =  ale
+# alp
+flag_alp          =  1, 1, 1, 1, 10    
+name_alp          =  alp
+# Convective INhibition
+flag_cin          =  1, 1, 1, 1, 10    
+name_cin          =  cin
+# WAPE
+flag_wape         =  1, 1, 1, 1, 10    
+name_wape         =  wape
+# u, v w t q et phi aux niveaux 200, 500, 700 et 850 hPa
+flag_u850         =  1, 1, 3, 10, 10    
+name_u850         =  u850 
+flag_u700         =  1, 1, 3, 10, 10    
+name_u700         =  u700
+flag_u500         =  1, 1, 3, 10, 10    
+name_u500         =  u500
+flag_u200         =  1, 1, 3, 10, 10    
+name_u200         =  u200
+flag_v850         =  1, 1, 3, 10, 10    
+name_v850         =  v850 
+flag_v700         =  1, 1, 3, 10, 10    
+name_v700         =  v700
+flag_v500         =  1, 1, 3, 10, 10    
+name_v500         =  v500
+flag_v200         =  1, 1, 3, 10, 10    
+name_v200         =  v200
+flag_w850         =  1, 1, 3, 10, 10    
+name_w850         =  w850
+flag_w700         =  1, 1, 3, 10, 10    
+name_w700         =  w700
+flag_w500         =  1, 1, 3, 10, 10    
+name_w500         =  w500
+flag_w200         =  1, 1, 3, 10, 10    
+name_w200         =  w200
+flag_t850         =  1, 1, 3, 10, 10    
+name_t850         =  t850
+flag_t700         =  1, 1, 3, 10, 10    
+name_t700         =  t700
+flag_t500         =  1, 1, 3, 10, 10    
+name_t500         =  t500
+flag_t200         =  1, 1, 3, 10, 10    
+name_t200         =  t200
+flag_q850         =  1, 1, 3, 10, 10    
+name_q850         =  q850
+flag_q700         =  1, 1, 3, 10, 10    
+name_q700         =  q700
+flag_q500         =  1, 1, 3, 10, 10    
+name_q500         =  q500
+flag_q200         =  1, 1, 3, 10, 10    
+name_q200         =  q200
+flag_phi850       =  1, 1, 3, 10, 10    
+name_phi850       =  phi850 
+flag_phi700       =  1, 1, 3, 10, 10    
+name_phi700       =  phi700
+flag_phi500       =  1, 1, 3, 10, 10    
+name_phi500       =  phi500
+flag_phi200       =  1, 1, 3, 10, 10    
+name_phi200       =  phi200
+# Temp mixte oce-sic
+flag_t_oce_sic    =  1, 10, 10, 10, 10    
+name_t_oce_sic    =  t_oce_sic
+# Weak inversion
+flag_weakinv      =  10, 1, 10, 10, 10    
+name_weakinv      =  weakinv
+# dTheta mini
+flag_dthmin       =  10, 1, 10, 10, 10    
+name_dthmin       =  dthmin
+# 10m zonal and meriden wind (ter sic lic oce)
+flag_u10_ter      =  10, 4, 10, 10, 10    
+name_u10_ter      =  u10_ter 
+flag_u10_lic      =  10, 4, 10, 10, 10    
+name_u10_lic      =  u10_lic
+flag_u10_oce      =  10, 4, 10, 10, 10    
+name_u10_oce      =  u10_oce
+flag_u10_sic      =  10, 4, 10, 10, 10    
+name_u10_sic      =  u10_sic 
+flag_v10_ter      =  10, 4, 10, 10, 10    
+name_v10_ter      =  v10_ter
+flag_v10_lic      =  10, 4, 10, 10, 10    
+name_v10_lic      =  v10_lic
+flag_v10_oce      =  10, 4, 10, 10, 10    
+name_v10_oce      =  v10_oce
+flag_v10_sic      =  10, 4, 10, 10, 10    
+name_v10_sic      =  v10_sic
+# Cloud optical thickness
+flag_cldtau       =  10, 5, 10, 10, 10    
+name_cldtau       =  cldtau
+# Cloud optical emissivity
+flag_cldemi       =  10, 5, 10, 10, 10    
+name_cldemi       =  cldemi
+# Relative humidity at 2m
+flag_rh2m         =  10, 5, 10, 10, 10    
+name_rh2m         =  rh2m
+# Saturant humidity at 2m
+flag_qsat2m       =  10, 5, 10, 10, 10    
+name_qsat2m       =  qsat2m
+# Surface air potential temperature
+flag_tpot         =  10, 5, 10, 10, 10    
+name_tpot         =  tpot
+# Surface air equivalent potential temperature
+flag_tpote        =  10, 5, 10, 10, 10    
+name_tpote        =  tpote
+# TKE, tke max and tke (ter sic lic oce)
+flag_tke          =  4, 10, 10, 10, 10    
+name_tke          =  tke
+flag_tke_max      =  4, 10, 10, 10, 10    
+name_tke_max      =  tke_max
+flag_tke_ter      =  10, 4, 10, 10, 10    
+name_tke_ter      =  tke_ter 
+flag_tke_lic      =  10, 4, 10, 10, 10    
+name_tke_lic      =  tke_lic
+flag_tke_oce      =  10, 4, 10, 10, 10    
+name_tke_oce      =  tke_oce
+flag_tke_sic      =  10, 4, 10, 10, 10    
+name_tke_sic      =  tke_sic
+flag_tke_max_ter  =  10, 4, 10, 10, 10    
+name_tke_max_ter  =  tke_max_ter
+flag_tke_max_lic  =  10, 4, 10, 10, 10    
+name_tke_max_lic  =  tke_max_lic
+flag_tke_max_oce  =  10, 4, 10, 10, 10    
+name_tke_max_oce  =  tke_max_oce
+flag_tke_max_sic  =  10, 4, 10, 10, 10    
+name_tke_max_sic  =  tke_max_sic
+# Kz melange
+flag_kz           =  4, 10, 10, 10, 10    
+name_kz           =  kz
+# Kz max melange
+flag_kz_max       =  4, 10, 10, 10, 10    
+name_kz_max       =  kz_max
+# Sfce net SW radiation OR
+flag_SWnetOR      =  10, 10, 2, 10, 10    
+name_SWnetOR      =  SWnetOR
+# Sfce incident SW radiation OR
+flag_SWdownOR     =  10, 10, 2, 10, 10    
+name_SWdownOR     =  SWdownOR
+# Sfce incident LW radiation OR
+flag_LWdownOR     =  10, 10, 2, 10, 10    
+name_LWdownOR     =  LWdownOR
+# Solid Large-scale Precip
+flag_snowl        =  10, 1, 10, 10, 10    
+name_snowl        =  snowl
+# cape max
+flag_cape_max     =  10, 1, 10, 10, 10    
+name_cape_max     =  cape_max
+# Down. IR rad. at surface
+flag_solldown     =  10, 1, 10, 1, 10    
+name_solldown     =  solldown
+# Boundary-layer dTs(o)
+flag_dtsvdfo      =  10, 10, 10, 1, 10    
+name_dtsvdfo      =  dtsvdfo
+# Boundary-layer dTs(t)
+flag_dtsvdft      =  10, 10, 10, 1, 10    
+name_dtsvdft      =  dtsvdft
+# Boundary-layer dTs(g)
+flag_dtsvdfg      =  10, 10, 10, 1, 10    
+name_dtsvdfg      =  dtsvdfg
+# Boundary-layer dTs(g)
+flag_dtsvdfi      =  10, 10, 10, 1, 10    
+name_dtsvdfi      =  dtsvdfi
+# rugosity
+flag_rugs         =  10, 10, 10, 1, 1    
+name_rugs         =  rugs
+# Cloud liquid water content
+flag_lwcon        =  2, 5, 10, 10, 1    
+name_lwcon        =  lwcon
+# Cloud ice water content
+flag_iwcon        =  2, 5, 10, 10, 10    
+name_iwcon        =  iwcon
+# Air temperature
+flag_temp         =  2, 3, 4, 1, 1    
+name_temp         =  temp
+# Potential air temperature
+flag_theta        =  2, 3, 4, 1, 1    
+name_theta        =  theta
+# Specific humidity
+flag_ovap         =  2, 3, 4, 1, 1    
+name_ovap         =  ovap
+# ?
+flag_ovapinit     =  2, 3, 4, 1, 1
+name_ovapinit     =  ovapinit
+# ?
+flag_wvapp        =  2, 10, 10, 10, 10    
+name_wvapp        =  wvapp
+# Geopotential height
+flag_geop         =  2, 3, 10, 1, 1    
+name_geop         =  geop
+# Zonal wind
+flag_vitu         =  2, 3, 4, 1, 1    
+name_vitu         =  vitu
+# Meridional wind
+flag_vitv         =  2, 3, 4, 1, 1    
+name_vitv         =  vitv
+# Vertical wind
+flag_vitw         =  2, 3, 10, 10, 1    
+name_vitw         =  vitw
+# Air pressure
+flag_pres         =  2, 3, 10, 1, 1    
+name_pres         =  pres
+# Cloud Fraction
+flag_rneb         =  2, 5, 10, 10, 1    
+name_rneb         =  rneb
+# Convective Cloud Fraction
+flag_rnebcon      =  2, 5, 10, 10, 1    
+name_rnebcon      =  rnebcon
+# Relative humidity
+flag_rhum         =  2, 10, 10, 10, 10    
+name_rhum         =  rhum
+# Ozone concentration
+flag_ozone        =  2, 10, 10, 10, 10    
+name_ozone        =  ozone
+# saturated updraft
+flag_upwd         =  2, 10, 10, 10, 10    
+name_upwd         =  upwd
+# Physics dT
+flag_dtphy        =  2, 10, 10, 10, 1    
+name_dtphy        =  dtphy
+# Physics dq
+flag_dqphy        =  2, 10, 10, 10, 1    
+name_dqphy        =  dqphy
+# Convective precipitation lic and ice
+flag_pr_con_l     =  2, 10, 10, 10, 10    
+name_pr_con_l     =  pr_con_l
+flag_pr_con_i     =  2, 10, 10, 10, 10    
+name_pr_con_i     =  pr_con_i
+# Large scale precipitation lic and ice
+flag_pr_lsc_l     =  2, 10, 10, 10, 10    
+name_pr_lsc_l     =  pr_lsc_l
+flag_pr_lsc_i     =  2, 10, 10, 10, 10    
+name_pr_lsc_i     =  pr_lsc_i
+# Albedo surf, Snow age and rugosity (ter sic lic oce)
+flag_albe_ter     =  3, 4, 10, 1, 10    
+name_albe_ter     =  albe_ter 
+flag_albe_lic     =  3, 4, 10, 1, 10    
+name_albe_lic     =  albe_lic
+flag_albe_oce     =  3, 4, 10, 1, 10    
+name_albe_oce     =  albe_oce
+flag_albe_sic     =  3, 4, 10, 1, 10    
+name_albe_sic     =  albe_sic 
+flag_ages_ter     =  3, 10, 10, 10, 10    
+name_ages_ter     =  ages_ter
+flag_ages_lic     =  3, 10, 10, 10, 10    
+name_ages_lic     =  ages_lic
+flag_ages_oce     =  3, 10, 10, 10, 10    
+name_ages_oce     =  ages_oce
+flag_ages_sic     =  3, 10, 10, 10, 10    
+name_ages_sic     =  ages_sic
+flag_rugs_ter     =  3, 4, 10, 1, 10    
+name_rugs_ter     =  rugs_ter 
+flag_rugs_lic     =  3, 4, 10, 1, 10    
+name_rugs_lic     =  rugs_lic
+flag_rugs_oce     =  3, 4, 10, 1, 10    
+name_rugs_oce     =  rugs_oce
+flag_rugs_sic     =  3, 4, 10, 1, 10    
+name_rugs_sic     =  rugs_sic
+# Surface albedo
+flag_albs         =  3, 10, 10, 1, 10    
+name_albs         =  albs
+# Surface albedo LW
+flag_albslw       =  3, 10, 10, 1, 10    
+name_albslw       =  albslw
+# Convective Cloud Liquid water content
+flag_clwcon       =  4, 10, 10, 10, 10    
+name_clwcon       =  clwcon
+# undilute adiab updraft
+flag_Ma           =  4, 10, 10, 10, 10    
+name_Ma           =  Ma
+# saturated downdraft
+flag_dnwd         =  4, 10, 10, 10, 10    
+name_dnwd         =  dnwd
+# unsat. downdraft
+flag_dnwd0        =  4, 10, 10, 10, 10    
+name_dnwd0        =  dnwd0
+# Dynamics dT dQ dU dV, .....
+flag_dtdyn        =  4, 10, 10, 10, 1
+name_dtdyn        =  dtdyn
+flag_dqdyn        =  4, 10, 10, 10, 1    
+name_dqdyn        =  dqdyn
+flag_dudyn        =  4, 10, 10, 10, 1    
+name_dudyn        =  dudyn
+flag_dvdyn        =  4, 10, 10, 10, 1    
+name_dvdyn        =  dvdyn 
+flag_dtcon        =  4, 5, 10, 10, 10    
+name_dtcon        =  dtcon
+flag_ducon        =  4, 10, 10, 10, 10    
+name_ducon        =  ducon
+flag_dqcon        =  4, 5, 10, 10, 10    
+name_dqcon        =  dqcon
+flag_dtwak        =  4, 5, 10, 10, 10    
+name_dtwak        =  dtwak
+flag_dqwak        =  4, 5, 10, 10, 10    
+name_dqwak        =  dqwak
+flag_wake_h       =  4, 5, 10, 10, 10    
+name_wake_h       =  wake_h
+flag_wake_s       =  4, 5, 10, 10, 10    
+name_wake_s       =  wake_s
+flag_wake_deltat  =  4, 5, 10, 10, 10    
+name_wake_deltat  =  wake_deltat
+flag_wake_deltaq  =  4, 5, 10, 10, 10    
+name_wake_deltaq  =  wake_deltaq
+flag_wake_omg     =  4, 5, 10, 10, 10    
+name_wake_omg     =  wake_omg 
+flag_Vprecip      =  10, 10, 10, 10, 10    
+name_Vprecip      =  Vprecip
+flag_ftd          =  4, 5, 10, 10, 10    
+name_ftd          =  ftd
+flag_fqd          =  4, 5, 10, 10, 10    
+name_fqd          =  fqd
+flag_dtlsc        =  4, 10, 10, 10, 10    
+name_dtlsc        =  dtlsc
+flag_dtlschr      =  4, 10, 10, 10, 10    
+name_dtlschr      =  dtlschr
+flag_dqlsc        =  4, 10, 10, 10, 10    
+name_dqlsc        =  dqlsc
+flag_dtvdf        =  4, 10, 10, 1, 10    
+name_dtvdf        =  dtvdf
+flag_dqvdf        =  4, 10, 10, 1, 10    
+name_dqvdf        =  dqvdf
+flag_dteva        =  4, 10, 10, 10, 10    
+name_dteva        =  dteva
+flag_dqeva        =  4, 10, 10, 10, 10    
+name_dqeva        =  dqeva
+flag_ptconv       =  4, 10, 10, 10, 10    
+name_ptconv       =  ptconv
+flag_ratqs        =  4, 10, 10, 10, 10    
+name_ratqs        =  ratqs
+flag_dtthe        =  4, 10, 10, 10, 10    
+name_dtthe        =  dtthe
+flag_f_th         =  4, 10, 10, 10, 10    
+name_f_th         =  f_th
+flag_e_th         =  4, 10, 10, 10, 10    
+name_e_th         =  e_th
+flag_w_th         =  4, 10, 10, 10, 10    
+name_w_th         =  w_th
+flag_lambda_th    =  4, 10, 10, 10, 10    
+name_lambda_th    =  lambda_th
+flag_q_th         =  4, 10, 10, 10, 10    
+name_q_th         =  q_th
+flag_a_th         =  4, 10, 10, 10, 10    
+name_a_th         =  a_th
+flag_d_th         =  4, 10, 10, 10, 10    
+name_d_th         =  d_th
+flag_f0_th        =  4, 10, 10, 10, 10    
+name_f0_th        =  f0_th
+flag_zmax_th      =  4, 10, 10, 10, 10    
+name_zmax_th      =  zmax_th
+flag_dqthe        =  4, 10, 10, 10, 1    
+name_dqthe        =  dqthe
+flag_dtajs        =  4, 10, 10, 10, 10    
+name_dtajs        =  dtajs
+flag_dqajs        =  4, 10, 10, 10, 10    
+name_dqajs        =  dqajs
+flag_dtswr        =  4, 10, 10, 10, 1    
+name_dtswr        =  dtswr
+flag_dtsw0        =  4, 10, 10, 10, 10    
+name_dtsw0        =  dtsw0 
+flag_dtlwr        =  4, 10, 10, 10, 1    
+name_dtlwr        =  dtlwr
+flag_dtlw0        =  4, 10, 10, 10, 10    
+name_dtlw0        =  dtlw0
+flag_dtec         =  4, 10, 10, 10, 10    
+name_dtec         =  dtec
+flag_duvdf        =  4, 10, 10, 10, 10    
+name_duvdf        =  duvdf
+flag_dvvdf        =  4, 10, 10, 10, 10    
+name_dvvdf        =  dvvdf
+flag_duoro        =  4, 10, 10, 10, 10    
+name_duoro        =  duoro
+flag_dvoro        =  4, 10, 10, 10, 10    
+name_dvoro        =  dvoro
+flag_dulif        =  4, 10, 10, 10, 10    
+name_dulif        =  dulif
+flag_dvlif        =  4, 10, 10, 10, 10    
+name_dvlif        =  dvlif
+###! Attention a refaire correctement
+flag_trac01       =  4, 10, 10, 10, 10    
+name_trac01       =  trac01 
+flag_trac02       =  4, 10, 10, 10, 10    
+name_trac02       =  trac02
+
Index: trunk/deftanks/terre/physiq.def
===================================================================
--- trunk/deftanks/terre/physiq.def	(revision 2)
+++ trunk/deftanks/terre/physiq.def	(revision 2)
@@ -0,0 +1,219 @@
+## $Id: physiq.def 1403 2010-07-01 09:02:53Z fairhead $
+#
+# PARAMETRES ANCIENNEMENT DANS gcm.def
+##  Cycle diurne  ou non                 
+cycle_diurne=y
+##  Soil Model  ou non               
+soil_model=y
+##  Choix ou non  de  New oliq               
+new_oliq=y
+##  Activation ou non de la parametrisation de Hines pour la strato
+ok_hines=n
+##  Orodr  ou  non   pour l orographie              
+ok_orodr=y
+##  Orolf  ou  non   pour l orographie              
+ok_orolf=y
+##   Si = .T. ,  lecture du fichier limit avec la bonne annee             
+ok_limitvrai=n
+## Nombre  d'appels des routines de rayonnements ( par jour)                 
+nbapp_rad=24
+##  Flag  pour la convection : 1 pour LMD, 2 pour Tiedtke, 3 KE(nvlle version JYG), 30 KE(version IPCC AR4), 4 KE vect
+iflag_con=30
+## Facteur multiplication des precip convectives dans KE
+cvl_corr=1.0
+##  Facteur additif pour l'albedo
+pmagic=0.008
+#
+#
+#
+# Parametres fichiers de sortie
+#
+### type_run = type run par rapport aux fichiers et variables de sortie
+# - type_run = CLIM/ENSP (=1)
+# - type_run = AMIP/CFMI (=2)
+type_run=AMIP
+### OK_journe= y sortir fichier journalier histday.nc, =n pas de fichier histday.nc
+OK_journe=n
+### OK_mensuel= y sortir fichier mensuel histmth.nc, =n pas de fichier histmth.nc
+OK_mensuel=y
+### OK_instan=y, ecrire sorties "instantannees" (chaque pas de temps de la  physique)
+OK_instan=n
+### OK_hf=y, ecrire sorties hautes frequence histhf.nc, =n pas de fichier histhf.nc
+ok_hf=n
+#
+# Parametres niveau de sorties differents fichiers 
+#
+### lev_histhf=0-4, niveau de sortie fichier "histhf.nc" 
+# - lev_histhf=0 => pas de sorties histhf.nc
+# - lev_histhf=2 => defaut
+# - lev_histhf=3 => variables sur niveaux standards
+# - lev_histhf=4 => histhf3d.nc champs 3d niveaux modele => fichier. histhf3d.nc
+lev_histhf=2
+### lev_histday=0-5, niveau de sortie fichier "histday.nc"
+# - lev_histday=0 => pas de sorties lev_histday.nc
+# - lev_histday=2 => defaut
+# - lev_histday=3 => + champs 3D => F. Lott
+# - lev_histday=4 => + champs sous-surfaces
+# - lev_histday=5 => + champs F. Aires
+lev_histday=2
+### lev_histmth=0-4, niveau de sortie fichier "histmth.nc"
+# - lev_histmth=0 => pas de sorties lev_histmth.nc
+# - lev_histmth=2 => defaut
+# - lev_histmth=3 => albedo, rugosite sous-surfaces
+# - lev_histmth=4 => champs tendances 3d
+lev_histmth=2
+### ecrit_hf = frequence ecriture fichier histhf.nc en jours
+ecrit_hf=0.250
+### ecrit_day = frequence ecriture fichier histday.nc en jours
+ecrit_day=1.
+### ecrit_mth = frequence ecriture fichier histmth.nc en jours
+ecrit_mth=30
+### freqin_isccp = frequence input en secondes du simulateur ISCCP
+freq_ISCCP=10800.
+### freqout_isccp = frequence output en jours du simulateur ISCCP
+ecrit_ISCCP=30
+### niveau du diagnostique de conservation d energie
+if_ebil=0
+#
+# parametres KE
+#
+### epmax = Efficacite precipitation maximale
+epmax = .999
+### ok_adj_ema = ?? pas utilise
+ok_adj_ema = n
+### iflag_clw Flag calcul eau liquide
+# - iflag_clw=0 : qcond_incld(i,l) = em_qcondc(l)
+# - iflag_clw=1 : qcond_incld(i,l) = em_qcond(l)
+# - iflag_clw=2 : eau liquide diagnostique en fonction de la Precip
+iflag_clw = 1
+# 
+# parametres nuages
+#
+### cld_lc_lsc  contenu en eau liquide des nuages large-scale (fisrtilp) 
+cld_lc_lsc = 4.16e-4
+### cld_lc_con  contenu en eau liquide des nuages convectifs (fisrtilp) 
+cld_lc_con = 4.16e-4
+### cld_tau_lsc cte de temps utilisee pour eliminer l eau large-scale (fisrtilp) 
+cld_tau_lsc = 1800.
+### cld_tau_con cte de temps utilisee pour eliminer l eau convective (fisrtilp) 
+cld_tau_con = 1800.
+### ffallv_lsc  cte utilisee dans calcul vitesse de chute cristaux de glace large-scale (fisrtilp) 
+ffallv_lsc = 0.5
+### ffallv_lsc  cte utilisee dans calcul vitesse de chute cristaux de glace convectifs (fisrtilp) 
+ffallv_con = 0.5
+### coef_eva coef evaporation precips eau/glace (fisrtilp/fisrtilp_tr?/conlmd?)
+coef_eva = 2.e-5
+### reevap_ice  reevaporation de toute la precip dans la couche du dessous pour la glace (fisrtilp) 
+reevap_ice = y
+### iflag_cldcon  flag pour calculer ratqsc=F(ratqsbas,fact_cldcon,q_seri) (physiq) 
+# - iflag_cldcon<=-1 diag. rain_Tiedtke 
+# - iflag_cldcon=1, ratqsc=ratqsbas+fact_cldcon*(q_seri(1)-q_seri(k))/q_seri(k)
+# - iflag_cldcon=1/2, ratqs=max(ratqs,ratqsc)
+# - iflag_cldcon=3,   ratqs=ratqss
+iflag_cldcon = 3
+### iflag_pdf :  flag calcul distribution sous-maille de l eau et des nuages 
+# - iflag_pdf=0, version ratqs, 
+# - iflag_pdf=1, calcul eau condensee, fraction nuageuse, eau nuageuse a partir
+# -              des PDFS de Sandrine Bony 
+iflag_pdf = 1
+### fact_cldcon  constante calcul ratqsc (voir iflag_cldcon) et proprietes nuages convectifs, clwcon0 (physiq.F) 
+fact_cldcon = 1.
+### facttemps=   facteur de relaxation de ratqs (iflag_cldcon=1/2) et rnebcon (iflag_cldcon=3)
+facttemps = 0.
+## ok_newmicro   =y appel newmicro , =n appel nuage (calcul epaisseur optique et emmissivite des nuages) 
+ok_newmicro = y
+### iflag_ratqs=0 correspond a la version IPCC AR4 
+iflag_ratqs=0
+### ratqsbas     ratqs en bas si iflag_cldcon=1 
+ratqsbas = 0.005
+### ratqshaut    ratqs en haut pour ratqss "stables"  
+ratqshaut = 0.33
+### rad_froid    rayon cristaux des nuages de glace "froids" 
+rad_froid = 35
+### rad_chau1    rayon goutelettes d eau chauds", en haut: k=4-klev 
+rad_chau1=12
+### rad_chau2    rayon goutelettes d eau chauds", en bas: k=1-3  
+rad_chau2=11
+# 
+# Coefficient et parametres sur les drags
+#
+f_cdrag_ter=1.
+f_cdrag_stable=1.
+f_cdrag_oce=0.8
+f_rugoro=0.
+### ksta_ter      coef.diffusion minimale sur terre/sic/lic 
+ksta_ter=1.e-7
+### cdmmax =     cdrag maximum pour le moment
+cdmmax = 2.5E-3
+### cdhmax =     cdrag maximum pour l energie
+cdhmax = 2.0E-3
+#
+# Parametres "orbitaux/ ere geologique"
+#
+### R_ecc =      Excentricite
+R_ecc = 0.016715
+### R_peri =     Equinoxe
+R_peri = 102.7
+### R_incl =     Inclinaison
+R_incl = 23.441
+### solaire =    Constante solaire
+solaire = 1361.
+#
+# Taux gaz a effet de serre
+#
+### co2_ppm =    taux CO2 en ppm
+co2_ppm = 367.
+### CH4_ppb =    taux CH4 en ppb
+CH4_ppb = 1760.
+### N2O_ppb =    taux N2O en ppb
+N2O_ppb = 316.
+### CFC11_ppt =  taux CFC11 en ppt
+CFC11_ppt = 741.2
+### CFC12_ppt =  taux CFC12 en ppt
+CFC12_ppt = 535.
+#
+# Parametres effets directs/indirects des "aerosols"
+#
+### ok_ade=y/n   flag Aerosol direct effect
+ok_ade=n
+### ok_aie=y/n   flag Aerosol indirect effect
+ok_aie=n
+### aer_type =   Aerosol variation type : actuel / preind / scenario / annuel
+aer_type=actuel
+###  type of coupled aerosol =1 (default) =2 => bc  only =3 => pom only =4 => seasalt only =5 => dust only =6 => all aerosol
+flag_aerosol=6 
+### bl95_b0 =    Parameter in CDNC-maer link (Boucher&Lohmann 1995)
+bl95_b0=1.7
+### bl95_b1 =    Parameter in CDNC-maer link (Boucher&Lohmann 1995)
+bl95_b1=0.2
+#
+# Parametre de lecture de l'ozone
+#
+# Allowed values are 0, 1 and 2
+# 0: do not read an ozone climatology
+# 1: read a single ozone climatology that will be used day and night
+# 2: read two ozone climatologies, the average day and night climatology and the daylight climatology
+read_climoz=0
+#
+# Parametres simulateur COSP (CFMIP Observational Simulator Package)
+#
+### ok_cosp=y/n flag simulateur COSP
+ok_cosp=n
+## freq_COSP = frequence d'appel de COSP en secondes
+freq_COSP=10800.
+#
+# Parametres simulateur ISCCP
+#
+### ok_isccp=y/n flag simulateur ISCCP
+ok_isccp=n
+### top_height = flag choix calcul nuages par le simulateur en utilisant 
+# -              les donnees IR et/ou VIS et l algorithme ISCCP-D1
+# - top_height = 1 -> algo IR-VIS
+# - top_height = 2 -> identique a 1, mais "ptop(ibox)=pfull(ilev)"
+# - top_height = 3 -> algo IR
+top_height = 1
+### overlap =    Hypothese de Recouvrement (HR) utilisee pour le simulateur ISCCP
+# - overlap=1    Max overlap
+# - overlap=2    Random overlap
+# - overlap=3    Max/Random overlap
+overlap = 3
Index: trunk/deftanks/terre/run.def
===================================================================
--- trunk/deftanks/terre/run.def	(revision 2)
+++ trunk/deftanks/terre/run.def	(revision 2)
@@ -0,0 +1,47 @@
+# $Id: run.def 1403 2010-07-01 09:02:53Z fairhead $
+#
+## Fichier de configuration general
+## 
+INCLUDEDEF=physiq.def
+INCLUDEDEF=gcm.def
+INCLUDEDEF=orchidee.def
+INCLUDEDEF=output.def
+## Type de calendrier utilise
+## valeur possible: earth_360d (defaut), earth_365d, earth_366d
+calend=earth_360d
+## Jour de l'etat initial ( = 350  si 20 Decembre ,par expl. ,comme ici )
+dayref=1
+##  Annee de l'etat  initial (   avec  4  chiffres   )
+anneeref=1980
+## Nombre de jours d'integration
+nday=5
+## Remise a zero de la date initiale
+raz_date=0
+## periode de sortie des variables de controle (en pas)
+iconser=240
+## sorties instantanees dans la dynamique (fichiers dyn_hist.nc and co.)
+ok_dyn_ins=n
+## periode d'ecriture des sorties instantanees dans la dynamique
+## (en pas dynamiques)
+iecri=960
+## sorties de valeurs moyennes dans la dynamique (fichiers dyn_hist_ave.nc and co.)
+ok_dyn_ave=n
+## periode de stockage des moyennes dans la dynamique et dans dynzon
+periodav=30
+## flag de sortie dynzon
+ok_dynzon=n
+## activation du calcul d equilibrage de charge
+adjust=n
+## activation du filtre fft
+use_filtre_fft=n
+## niveau d'impression de controle
+prt_level=1
+##
+## Informations sur la configuration utilisee
+## 
+### type_ocean = force / slab  /couple
+type_ocean=force
+### version_ocean = nemo / opa8 
+version_ocean=nemo
+### VEGET= y si ORCHIDEE, =n si bucket
+VEGET=n
Index: trunk/deftanks/terre/traceur.def
===================================================================
--- trunk/deftanks/terre/traceur.def	(revision 2)
+++ trunk/deftanks/terre/traceur.def	(revision 2)
@@ -0,0 +1,5 @@
+4
+14 14 H2Ov
+10 10 H2Ol
+10 10 RN
+10 10 PB
Index: trunk/gcm.def
===================================================================
--- trunk/gcm.def	(revision 1)
+++ 	(revision )
@@ -1,62 +1,0 @@
-## $Id: gcm.def 1403 2010-07-01 09:02:53Z fairhead $
-## nombre de pas par jour (multiple de iperiod) ( ici pour  dt = 1 min )      
-day_step=480
-## periode pour le pas Matsuno (en pas)
-iperiod=5
-## periode de la dissipation (en pas)
-idissip=5
-## choix de l'operateur de dissipation (star ou  non star )
-lstardis=y
-## nombre d'iterations de l'operateur de dissipation   gradiv
-nitergdiv=1
-## nombre d'iterations de l'operateur de dissipation  nxgradrot
-nitergrot=2
-## nombre d'iterations de l'operateur de dissipation  divgrad            
-niterh=2
-## temps de dissipation des plus petites long.d ondes pour u,v (gradiv)  
-tetagdiv=5400.
-## temps de dissipation des plus petites long.d ondes pour u,v(nxgradrot)
-tetagrot=5400.
-## temps de dissipation des plus petites long.d ondes pour  h ( divgrad) 
-tetatemp=5400.
-## coefficient pour gamdissip                                            
-coefdis=0.
-## choix du shema d'integration temporelle (Matsuno:y ou Matsuno-leapfrog:n) 
-purmats=n
-## avec ou sans physique
-## 0: pas de physique (e.g. en mode Shallow Water)
-## 1: avec physique (e.g. physique phylmd)
-## 2: avec rappel newtonien dans la dynamique                                         
-iflag_phys=1
-## avec ou sans fichiers de demarrage (start.nc, startphy.nc) ?
-## (sans fichiers de demarrage, initialisation des champs par iniacademic
-##  dans la dynamique)
-read_start=y
-## periode de la physique (en pas dynamiques, n'a de sens que si iflag_phys=1)                                       
-iphysiq=10
-##  Avec ou sans strato
-ok_strato=n 
-#  Couche eponge dans les couches de pression plus faible que 100 fois la pression de la derniere couche
-iflag_top_bound=2
-#  Coefficient pour la couche eponge (valeur derniere couche)
-tau_top_bound=5.e-5
-## longitude en degres du centre du zoom                                 
-clon=0.
-## latitude en degres du centre du zoom                                  
-clat=0.
-## facteur de grossissement du zoom,selon longitude                      
-grossismx=1.0
-## facteur de grossissement du zoom ,selon latitude                      
-grossismy=1.0
-##  Fonction  f(y)  hyperbolique  si = .true.  , sinon  sinusoidale         
-fxyhypb=y
-## extension en longitude  de la zone du zoom  ( fraction de la zone totale)
-dzoomx=0.0
-## extension en latitude de la zone  du zoom  ( fraction de la zone totale)
-dzoomy=0.0
-##raideur du zoom en  X
-taux=3.
-##raideur du zoom en  Y
-tauy=3.
-##  Fonction  f(y) avec y = Sin(latit.) si = .true. , sinon y = latit.         
-ysinus=y
Index: trunk/guide.def
===================================================================
--- trunk/guide.def	(revision 1)
+++ 	(revision )
@@ -1,37 +1,0 @@
-ok_guide=y
-# guidage sur niveaux modèle (y) ou standard
-guide_modele=y
-# inversion de l'ordre des niveaux verticaux
-ok_invertp=y
-ncep=y
- ######################################
- #### guidage de u #####
- guide_u=y
- ######################################
- #### guidage de v #####
- guide_v=y
- ######################################
- #### guidage de T #####
- guide_T=y
- ######################################
- #### guidage de P #####
- guide_P=n
- ######################################
- #### guidage de Q (hr=y:hum.rel,n:hum.spec) #####
- guide_Q=n
- guide_hr=n
- ######################################
- ## guidage dans la couche limite
- guide_BL=n
- ######################################
-ini_anal=n
-tau_min_u=0.04166667
-tau_max_u=0.125
-tau_min_v=0.04166667
-tau_max_v=0.125
-tau_min_T=0.04166667
-tau_max_T=10.
-tau_min_Q=0.2
-tau_max_Q=10.
-# gamma limité
-gamma4=n
Index: trunk/offline.def
===================================================================
--- trunk/offline.def	(revision 1)
+++ 	(revision )
@@ -1,12 +1,0 @@
-#
-# $Header$
-#
-T
-4
-T
--2.
-48.1
-1
-T
-6
-2
Index: trunk/orchidee.def
===================================================================
--- trunk/orchidee.def	(revision 1)
+++ 	(revision )
@@ -1,63 +1,0 @@
-#
-#
-# Parameter file for LMDZ4OR_v2 configuration
-# See comments : http://forge.ipsl.jussieu.fr/orchidee/
-#
-STOMATE_OK_CO2=TRUE
-# STOMATE_OK_STOMATE is not set
-# STOMATE_OK_DGVM is not set
-# STOMATE_WATCHOUT is not set
-SECHIBA_restart_in=default
-SECHIBA_rest_out=sechiba_rest.nc
-SECHIBA_reset_time=y
-#
-OUTPUT_FILE=sechiba_out.nc
-WRITE_STEP=2592000
-SECHIBA_HISTLEVEL=5
-#
-SECHIBA_HISTFILE2 = FALSE
-SECHIBA_OUTPUT_FILE2 = sechiba_out_2.nc
-WRITE_STEP2 = 86400.0
-SECHIBA_HISTLEVEL2 = 1
-#
-STOMATE_OUTPUT_FILE=stomate_history.nc
-STOMATE_HIST_DT=10.
-STOMATE_HISTLEVEL=0
-SECHIBA_DAY=0.0
-SECHIBA_ZCANOP=0.5
-DT_SLOW=86400.
-# IMPOSE_VEG is not set
-VEGETATION_FILE=carteveg5km.nc
-# VEGETATION_FILE=pft_new.nc
-DIFFUCO_LEAFCI=233.
-CONDVEG_SNOWA=default
-# IMPOSE_AZE is not set
-SOILALB_FILE=soils_param.nc
-SOILTYPE_FILE=soils_param.nc 
-ENERBIL_TSURF=280.
-HYDROL_SNOW=0.0
-HYDROL_SNOWAGE=0.0
-HYDROL_SNOWICE=0.0
-HYDROL_SNOWICEAGE=0.0
-HYDROL_HDRY=1.0
-HYDROL_HUMR=1.0
-HYDROL_BQSB=default
-HYDROL_GQSB=0.0
-HYDROL_DSG=0.0
-HYDROL_DSP=default
-HYDROL_QSV=0.0
-HYDROL_OK_HDIFF=n
-HYDROL_TAU_HDIFF=1800.
-THERMOSOIL_TPRO=280.
-RIVER_ROUTING=y
-ROUTING_FILE=routing.nc
-LAI_MAP=y
-LAI_FILE=lai2D.nc
-SECHIBA_QSINT=0.02
-ALB_BARE_MODEL = FALSE
-PERCENT_THROUGHFALL_PFT = 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.
-RVEG_PFT = .5, .5, .5, .5, .5, .5, .5, .5, .5, .5, .5, .5, .5
-CDRAG_FROM_GCM = .TRUE.
-#LAND_USE=y
-#VEGET_YEAR=0
-#VEGET_UPDATE=1Y
Index: trunk/output.def
===================================================================
--- trunk/output.def	(revision 1)
+++ 	(revision )
@@ -1,794 +1,0 @@
-######## Abderrahmane le 20 11 08 ########################
-# Niveaux de sorties et nom pour chaque variable dans les#
-# fichiers histmth histday histhf histins histLES        #
-##########################################################
-# Surface geop.height
-flag_phis         =  1, 1, 10, 1, 1    
-name_phis         =  phis
-# Grid area
-flag_aire         =  1, 1, 10,  1, 1    
-name_aire         =  aire
-# Surfac ter+lic
-flag_contfracATM  =  10, 1,  1, 10, 10    
-name_contfracATM  =  contfracATM
-# Surface terre OR  
-flag_contfracOR   =  10, 1,  1, 10, 10    
-name_contfracOR   =  contfracOR
-# Grid area CONT
-flag_aireTER      =  10, 10, 1, 10, 10    
-name_aireTER      =  aireTER
-# Latent heat flux
-flag_flat         =  10, 1, 10, 10, 1    
-name_flat         =  flat
-# Sea Level Pressure
-flag_slp          =  1, 1, 1, 10, 1    
-name_slp          =  slp
-# Surface Temperature
-flag_tsol         =  1, 1, 1, 1, 1    
-name_tsol         =  tsol
-# Temperature 2m
-flag_t2m          =  1, 1, 1, 1, 1    
-name_t2m          =  t2m
-# Temperature min 2m
-flag_t2m_min      =  1, 1, 10, 10, 10    
-name_t2m_min      =  t2m_min
-# Temperature max 2m
-flag_t2m_max      =  1, 1, 10, 10, 10    
-name_t2m_max      =  t2m_max
-# Temperature ter lic oce sic at 2m
-flag_t2m_ter      =  10, 4, 10, 10, 10    
-name_t2m_ter      =  t2m_ter 
-flag_t2m_lic      =  10, 4, 10, 10, 10    
-name_t2m_lic      =  t2m_lic
-flag_t2m_oce      =  10, 4, 10, 10, 10    
-name_t2m_oce      =  t2m_oce
-flag_t2m_sic      =  10, 4, 10, 10, 10    
-name_t2m_sic      =  t2m_sic 
-# 10-m wind speed
-flag_wind10m      =  1, 1, 1, 10, 10    
-name_wind10m      =  wind10m
-# 10-m wind speed max
-flag_wind10max    =  10, 1, 10, 10, 10    
-name_wind10max    =  wind10max
-# Sea-ice fraction
-flag_sicf         =  1, 1, 10, 10, 10    
-name_sicf         =  sicf
-# Specific humidity 2m
-flag_q2m          =  1, 1, 1, 1, 1    
-name_q2m          =  q2m
-# 10m zonal wind
-flag_u10m         =  1, 1, 1, 1, 1    
-name_u10m         =  u10m
-# 10m meridional wind
-flag_v10m         =  1, 1, 1, 1, 1    
-name_v10m         =  v10m
-# Surface Pressure
-flag_psol         =  1, 1, 1, 1, 1    
-name_psol         =  psol
-# Surface Air humidity
-flag_qsurf        =  1, 10, 10, 10, 10    
-name_qsurf        =  qsurf
-# 10m zonal wind (ter lic oce sic)
-flag_u10m_ter     =  10, 4, 10, 10, 10    
-name_u10m_ter     =  u10m_ter
-flag_u10m_lic     =  10, 4, 10, 10, 10    
-name_u10m_lic     =  u10m_lic
-flag_u10m_oce     =  10, 4, 10, 10, 10    
-name_u10m_oce     =  u10m_oce
-flag_u10m_sic     =  10, 4, 10, 10, 10    
-name_u10m_sic     =  u10m_sic
-# 10m meridien  wind (ter oce ice lic)
-flag_v10m_ter     =  10, 4, 10, 10, 10    
-name_v10m_ter     =  v10m_ter
-flag_v10m_lic     =  10, 4, 10, 10, 10    
-name_v10m_lic     =  v10m_lic
-flag_v10m_oce     =  10, 4, 10, 10, 10    
-name_v10m_oce     =  v10m_oce
-flag_v10m_sic     =  10, 4, 10, 10, 10    
-name_v10m_sic     =  v10m_sic
-# Soil watter content
-flag_qsol         =  1, 10, 10, 1, 1    
-name_qsol         =  qsol
-# Number of dayrain(liq+sol)
-flag_ndayrain     =  1, 10, 10, 10, 10    
-name_ndayrain     =  ndayrain
-# Precip Totale liq+sol
-flag_precip       =  1, 1, 1, 1, 1    
-name_precip       =  precip
-# Large-scale Precip
-flag_plul         =  1, 1, 1, 1, 10    
-name_plul         =  plul 
-# Convective Precip
-flag_pluc         =  1, 1, 1, 1, 10    
-name_pluc         =  pluc
-# Snow fall
-flag_snow         =  1, 1, 10, 1, 10    
-name_snow         =  snow
-# Evaporation
-flag_evap         =  1, 1, 10, 1, 10    
-name_evap         =  evap
-# Solar rad. at TOA
-flag_tops         =  1, 1, 10, 10, 10    
-name_tops         =  tops
-# CS Solar rad. at TOA
-flag_tops0        =  1, 5, 10, 10, 10    
-name_tops0        =  tops0
-# IR rad. at TOA
-flag_topl         =  1, 1, 10, 1, 10    
-name_topl         =  topl
-# CR IR rad. at TOA
-flag_topl0        =  1, 5, 10, 10, 10    
-name_topl0        =  topl0
-# SWup at TOA
-flag_SWupTOA      =  1, 4, 10, 10, 10    
-name_SWupTOA      =  SWupTOA
-# CR SWup at TOA
-flag_SWupTOAclr   =  1, 4, 10, 10, 10    
-name_SWupTOAclr   =  SWupTOAclr
-# SWdn at TOA
-flag_SWdnTOA      =  1, 4, 10, 10, 10    
-name_SWdnTOA      =  SWdnTOA
-# CR SWdn at TOA
-flag_SWdnTOAclr   =  1, 4, 10, 10, 10    
-name_SWdnTOAclr   =  SWdnTOAclr
-# SWup at 200hPa
-flag_SWup200      =  1, 10, 10, 10, 10    
-name_SWup200      =  SWup200
-# CR SWup at 200hPa
-flag_SWup200clr   =  10, 1, 10, 10, 10    
-name_SWup200clr   =  SWup200clr
-# SWdn at 200hPa
-flag_SWdn200      =  1, 10, 10, 10, 10    
-name_SWdn200      =  SWdn200
-# CR SWdn at 200hPa
-flag_SWdn200clr   =  10, 1, 10, 10, 10    
-name_SWdn200clr   =  SWdn200clr
-# LWup at 200mb
-flag_LWup200      =  1, 10, 10, 10, 10    
-name_LWup200      =  LWup200
-# CR LWup at 200mb
-flag_LWup200clr   =  1, 10, 10, 10, 10    
-name_LWup200clr   =  LWup200clr
-# LWdn at 200mb
-flag_LWdn200      =  1, 10, 10, 10, 10    
-name_LWdn200      =  LWdn200
-# CR LWdn at 200mb
-flag_LWdn200clr   =  1, 10, 10, 10, 10    
-name_LWdn200clr   =  LWdn200clr
-# Solar rad. at surf
-flag_sols         =  1, 1, 10, 1, 10    
-name_sols         =  sols
-# CR Solar rad. at surf
-flag_sols0        =  1, 5, 10, 10, 10    
-name_sols0        =  sols0
-# IR rad. at surface
-flag_soll         =  1, 1, 10, 1, 10    
-name_soll         =  soll
-# CR IR rad. at surface
-flag_soll0        =  1, 5, 10, 10, 10    
-name_soll0        =  soll0
-# Rayonnement au sol
-flag_radsol       =  1, 1, 10, 10, 10    
-name_radsol       =  radsol
-# SWup at surface
-flag_SWupSFC      =  1, 4, 10, 10, 10    
-name_SWupSFC      =  SWupSFC
-# CR SWup at surface
-flag_SWupSFCclr   =  1, 4, 10, 10, 10    
-name_SWupSFCclr   =  SWupSFCclr
-# SWdn at surface
-flag_SWdnSFC      =  1, 1, 10, 10, 10    
-name_SWdnSFC      =  SWdnSFC
-# CR at surface
-flag_SWdnSFCclr   =  1, 4, 10, 10, 10    
-name_SWdnSFCclr   =  SWdnSFCclr
-# LWup at surface
-flag_LWupSFC      =  1, 4, 10, 10, 10    
-name_LWupSFC      =  LWupSFC
-# CR LWup at surface
-flag_LWupSFCclr   =  1, 4, 10, 10, 10    
-name_LWupSFCclr   =  LWupSFCclr
-# LWdn  at surface
-flag_LWdnSFC      =  1, 4, 10, 10, 10    
-name_LWdnSFC      =  LWdnSFC
-# CR LWdn  at surface
-flag_LWdnSFCclr   =  1, 4, 10, 10, 10    
-name_LWdnSFCclr   =  LWdnSFCclr
-# Surf. total heat flux
-flag_bils         =  1, 2, 10, 1, 10    
-name_bils         =  bils
-# Sensible heat flux
-flag_sens         =  1, 1, 10, 1, 1    
-name_sens         =  sens
-# Heat flux derivation
-flag_fder         =  1, 2, 10, 1, 10    
-name_fder         =  fder
-# Thermal flux for snow melting
-flag_ffonte       =  1, 10, 10, 10, 10    
-name_ffonte       =  ffonte
-# Ice Calving
-flag_fqcalving    =  1, 10, 10, 10, 10    
-name_fqcalving    =  fqcalving
-# Land ice melt
-flag_fqfonte      =  1, 10, 10, 10, 10    
-name_fqfonte      =  fqfonte
-# Zonal wind stress (ter ice liq oce)
-flag_taux_ter     =  1, 4, 10, 1, 10    
-name_taux_ter     =  taux_ter
-flag_taux_lic     =  1, 4, 10, 1, 10    
-name_taux_lic     =  taux_lic                                          
-flag_taux_oce     =  1, 4, 10, 1, 10    
-name_taux_oce     =  taux_oce
-flag_taux_sic     =  1, 4, 10, 1, 10    
-name_taux_sic     =  taux_sic
-# Meridien wind stress (ter ice liq oce)
-flag_tauy_ter     =  1, 4, 10, 1, 10    
-name_tauy_ter     =  tauy_ter
-flag_tauy_lic     =  1, 4, 10, 1, 10    
-name_tauy_lic     =  tauy_lic
-flag_tauy_oce     =  1, 4, 10, 1, 10    
-name_tauy_oce     =  tauy_oce
-flag_tauy_sic     =  1, 4, 10, 1, 10    
-name_tauy_sic     =  tauy_sic
-# % surface (ter ice liq oce)
-flag_pourc_ter    =  1, 4, 10, 1, 10    
-name_pourc_ter    =  pourc_ter  
-flag_pourc_lic    =  1, 4, 10, 1, 10    
-name_pourc_lic    =  pourc_lic
-flag_pourc_oce    =  1, 4, 10, 1, 10    
-name_pourc_oce    =  pourc_oce
-flag_pourc_sic    =  1, 4, 10, 1, 10    
-name_pourc_sic    =  pourc_sic
-# Fraction (ter ice liq oce)
-flag_fract_ter    =  1, 4, 10, 1, 10    
-name_fract_ter    =  fract_ter
-flag_fract_lic    =  1, 4, 10, 1, 10    
-name_fract_lic    =  fract_lic
-flag_fract_oce     =  1, 4, 10, 1, 10    
-name_fract_oce    =  fract_oce
-flag_fract_sic    =  1, 4, 10, 1, 10    
-name_fract_sic    =  fract_sic
-# Surface temperature (ter ice liq oce)
-flag_tsol_ter     =  1, 4, 10, 1, 10    
-name_tsol_ter     =  tsol_ter
-flag_tsol_lic     =  1, 4, 10, 1, 10    
-name_tsol_lic     =  tsol_lic
-flag_tsol_oce     =  1, 4, 10, 1, 10    
-name_tsol_oce     =  tsol_oce
-flag_tsol_sic     =  1, 4, 10, 1, 10    
-name_tsol_sic     =  tsol_sic
-# Sensible heat flux (ter ice liq oce)
-flag_sens_ter     =  1, 4, 10, 1, 10    
-name_sens_ter     =  sens_ter
-flag_sens_lic     =  1, 4, 10, 1, 10    
-name_sens_lic     =  sens_lic
-flag_sens_oce     =  1, 4, 10, 1, 10    
-name_sens_oce     =  sens_oce
-flag_sens_sic     =  1, 4, 10, 1, 10    
-name_sens_sic     =  sens_sic
-# Latent heat flux (ter ice liq oce)
-flag_lat_ter      =  1, 4, 10, 1, 10    
-name_lat_ter      =  lat_ter 
-flag_lat_lic      =  1, 4, 10, 1, 10    
-name_lat_lic      =  lat_lic
-flag_lat_oce      =  1, 4, 10, 1, 10    
-name_lat_oce      =  lat_oce
-flag_lat_sic      =  1, 4, 10, 1, 10    
-name_lat_sic      =  lat_sic 
-# LW (ter ice liq oce)
-flag_flw_ter      =  1, 10, 10, 10, 10    
-name_flw_ter      =  flw_ter
-flag_flw_lic      =  1, 10, 10, 10, 10    
-name_flw_lic      =  flw_lic
-flag_flw_oce      =  1, 10, 10, 10, 10    
-name_flw_oce      =  flw_oce
-flag_flw_sic      =  1, 10, 10, 10, 10    
-name_flw_sic      =  flw_sic
-# SW (ter ice liq oce)
-flag_fsw_ter      =  1, 10, 10, 10, 10    
-name_fsw_ter      =  fsw_ter
-flag_fsw_lic      =  1, 10, 10, 10, 10    
-name_fsw_lic      =  fsw_lic
-flag_fsw_oce      =  1, 10, 10, 10, 10    
-name_fsw_oce      =  fsw_oce
-flag_fsw_sic      =  1, 10, 10, 10, 10    
-name_fsw_sic      =  fsw_sic
-# Bilan sol (ter ice liq oce)
-flag_wbils_ter    =  1, 10, 10, 10, 10    
-name_wbils_ter    =  wbils_ter
-flag_wbils_lic    =  1, 10, 10, 10, 10    
-name_wbils_lic    =  wbils_lic
-flag_wbils_oce    =  1, 10, 10, 10, 10    
-name_wbils_oce    =  wbils_oce
-flag_wbils_sic   =  1, 10, 10, 10, 10    
-name_wbils_sic    =  wbils_sic 
-# Bilan eau (ter ice liq oce)
-flag_wbilo_ter    =  1, 10, 10, 10, 10    
-name_wbilo_ter    =  wbilo_ter
-flag_wbilo_lic    =  1, 10, 10, 10, 10    
-name_wbilo_lic    =  wbilo_lic
-flag_wbilo_oce    =  1, 10, 10, 10, 10    
-name_wbilo_oce    =  wbilo_oce
-flag_wbilo_sic    =  1, 10, 10, 10, 10    
-name_wbilo_sic    =  wbilo_sic
-# Momentum drag coef
-flag_cdrm         =  1, 10, 10, 1, 10    
-name_cdrm         =  cdrm
-# Heat drag coef
-flag_cdrh         =  1, 10, 10, 1, 10    
-name_cdrh         =  cdrh 
-# Low-level cloudiness
-flag_cldl         =  1, 1, 10, 10, 10    
-name_cldl         =  cldl
-# Mid-level cloudiness
-flag_cldm         =  1, 1, 10, 10, 10    
-name_cldm         =  cldm
-# High-level cloudiness
-flag_cldh         =  1, 1, 10, 10, 10    
-name_cldh         =  cldh
-# Total cloudiness
-flag_cldt         =  1, 1, 2, 10, 10    
-name_cldt         =  cldt
-# Cloud liquid water path
-flag_cldq         =  1, 1, 10, 10, 10    
-name_cldq         =  cldq
-# Cloud water path
-flag_lwp          =  1, 5, 10, 10, 10    
-name_lwp          =  lwp
-# Cloud ice water path
-flag_iwp          =  1, 5, 10, 10, 10    
-name_iwp          =  iwp
-# Zonal energy transport
-flag_ue           =  1, 10, 10, 10, 10    
-name_ue           =  ue
-# Merid energy transport
-flag_ve           =  1, 10, 10, 10, 10    
-name_ve           =  ve
-# Zonal humidity transport
-flag_uq           =  1, 10, 10, 10, 10    
-name_uq           =  uq
-# Merid humidity transport
-flag_vq           =  1, 10, 10, 10, 10    
-name_vq           =  vq
-# Conv avlbl pot ener
-flag_cape         =  1, 10, 10, 10, 10    
-name_cape         =  cape
-# Cld base pressure
-flag_pbase        =  1, 10, 10, 10, 10    
-name_pbase        =  pbase
-# Cld top pressure
-flag_ptop         =  1, 4, 10, 10, 10    
-name_ptop         =  ptop
-# Cld base mass flux
-flag_fbase        =  1, 10, 10, 10, 10    
-name_fbase        =  fbase
-# Precipitable water
-flag_prw          =  1, 1, 10, 10, 10    
-name_prw          =  prw
-# Boundary Layer Height
-flag_s_pblh       =  1, 10, 10, 1, 1    
-name_s_pblh       =  pblh
-# t at Boundary Layer Height
-flag_s_pblt       =  1, 10, 10, 1, 1    
-name_s_pblt       =  pblt
-# Condensation level
-flag_s_lcl        =  1, 10, 10, 1, 10    
-name_s_lcl        =  lcl
-# Conv avlbl pot enerfor ABL
-flag_s_capCL      =  1, 10, 10, 1, 10    
-name_s_capCL      =  capCL
-# Liq Water in BL
-flag_s_oliqCL     =  1, 10, 10, 1, 10    
-name_s_oliqCL     =  oliqCL
-# Instability criteria(ABL)
-flag_s_cteiCL     =  1, 10, 10, 1, 1    
-name_s_cteiCL     =  cteiCL
-# Exces du thermique
-flag_s_therm      =  1, 10, 10, 1, 1    
-name_s_therm      =  therm
-# deep_cape(HBTM2)
-flag_s_trmb1      =  1, 10, 10, 1, 10    
-name_s_trmb1      =  trmb1
-# inhibition (HBTM2)
-flag_s_trmb2      =  1, 10, 10, 1, 10    
-name_s_trmb2      =  trmb2
-# Point Omega (HBTM2)
-flag_s_trmb3      =  1, 10, 10, 1, 10    
-name_s_trmb3      =  trmb3
-# Bilan au sol sur ocean slab
-flag_slab_bils    =  1, 1, 10, 10, 10    
-name_slab_bils    =  slab_bils 
-# ALE BL
-flag_ale_bl       =  1, 1, 1, 1, 10    
-name_ale_bl       =  ale_bl 
-# alp_bl
-flag_alp_bl       =  1, 1, 1, 1, 10    
-name_alp_bl       =  alp_bl
-# ale_wk
-flag_ale_wk       =  1, 1, 1, 1, 10    
-name_ale_wk       =  ale_wk
-# alp_wk
-flag_alp_wk       =  1, 1, 1, 1, 10    
-name_alp_wk       =  alp_wk
-# ale
-flag_ale          =  1, 1, 1, 1, 10    
-name_ale          =  ale
-# alp
-flag_alp          =  1, 1, 1, 1, 10    
-name_alp          =  alp
-# Convective INhibition
-flag_cin          =  1, 1, 1, 1, 10    
-name_cin          =  cin
-# WAPE
-flag_wape         =  1, 1, 1, 1, 10    
-name_wape         =  wape
-# u, v w t q et phi aux niveaux 200, 500, 700 et 850 hPa
-flag_u850         =  1, 1, 3, 10, 10    
-name_u850         =  u850 
-flag_u700         =  1, 1, 3, 10, 10    
-name_u700         =  u700
-flag_u500         =  1, 1, 3, 10, 10    
-name_u500         =  u500
-flag_u200         =  1, 1, 3, 10, 10    
-name_u200         =  u200
-flag_v850         =  1, 1, 3, 10, 10    
-name_v850         =  v850 
-flag_v700         =  1, 1, 3, 10, 10    
-name_v700         =  v700
-flag_v500         =  1, 1, 3, 10, 10    
-name_v500         =  v500
-flag_v200         =  1, 1, 3, 10, 10    
-name_v200         =  v200
-flag_w850         =  1, 1, 3, 10, 10    
-name_w850         =  w850
-flag_w700         =  1, 1, 3, 10, 10    
-name_w700         =  w700
-flag_w500         =  1, 1, 3, 10, 10    
-name_w500         =  w500
-flag_w200         =  1, 1, 3, 10, 10    
-name_w200         =  w200
-flag_t850         =  1, 1, 3, 10, 10    
-name_t850         =  t850
-flag_t700         =  1, 1, 3, 10, 10    
-name_t700         =  t700
-flag_t500         =  1, 1, 3, 10, 10    
-name_t500         =  t500
-flag_t200         =  1, 1, 3, 10, 10    
-name_t200         =  t200
-flag_q850         =  1, 1, 3, 10, 10    
-name_q850         =  q850
-flag_q700         =  1, 1, 3, 10, 10    
-name_q700         =  q700
-flag_q500         =  1, 1, 3, 10, 10    
-name_q500         =  q500
-flag_q200         =  1, 1, 3, 10, 10    
-name_q200         =  q200
-flag_phi850       =  1, 1, 3, 10, 10    
-name_phi850       =  phi850 
-flag_phi700       =  1, 1, 3, 10, 10    
-name_phi700       =  phi700
-flag_phi500       =  1, 1, 3, 10, 10    
-name_phi500       =  phi500
-flag_phi200       =  1, 1, 3, 10, 10    
-name_phi200       =  phi200
-# Temp mixte oce-sic
-flag_t_oce_sic    =  1, 10, 10, 10, 10    
-name_t_oce_sic    =  t_oce_sic
-# Weak inversion
-flag_weakinv      =  10, 1, 10, 10, 10    
-name_weakinv      =  weakinv
-# dTheta mini
-flag_dthmin       =  10, 1, 10, 10, 10    
-name_dthmin       =  dthmin
-# 10m zonal and meriden wind (ter sic lic oce)
-flag_u10_ter      =  10, 4, 10, 10, 10    
-name_u10_ter      =  u10_ter 
-flag_u10_lic      =  10, 4, 10, 10, 10    
-name_u10_lic      =  u10_lic
-flag_u10_oce      =  10, 4, 10, 10, 10    
-name_u10_oce      =  u10_oce
-flag_u10_sic      =  10, 4, 10, 10, 10    
-name_u10_sic      =  u10_sic 
-flag_v10_ter      =  10, 4, 10, 10, 10    
-name_v10_ter      =  v10_ter
-flag_v10_lic      =  10, 4, 10, 10, 10    
-name_v10_lic      =  v10_lic
-flag_v10_oce      =  10, 4, 10, 10, 10    
-name_v10_oce      =  v10_oce
-flag_v10_sic      =  10, 4, 10, 10, 10    
-name_v10_sic      =  v10_sic
-# Cloud optical thickness
-flag_cldtau       =  10, 5, 10, 10, 10    
-name_cldtau       =  cldtau
-# Cloud optical emissivity
-flag_cldemi       =  10, 5, 10, 10, 10    
-name_cldemi       =  cldemi
-# Relative humidity at 2m
-flag_rh2m         =  10, 5, 10, 10, 10    
-name_rh2m         =  rh2m
-# Saturant humidity at 2m
-flag_qsat2m       =  10, 5, 10, 10, 10    
-name_qsat2m       =  qsat2m
-# Surface air potential temperature
-flag_tpot         =  10, 5, 10, 10, 10    
-name_tpot         =  tpot
-# Surface air equivalent potential temperature
-flag_tpote        =  10, 5, 10, 10, 10    
-name_tpote        =  tpote
-# TKE, tke max and tke (ter sic lic oce)
-flag_tke          =  4, 10, 10, 10, 10    
-name_tke          =  tke
-flag_tke_max      =  4, 10, 10, 10, 10    
-name_tke_max      =  tke_max
-flag_tke_ter      =  10, 4, 10, 10, 10    
-name_tke_ter      =  tke_ter 
-flag_tke_lic      =  10, 4, 10, 10, 10    
-name_tke_lic      =  tke_lic
-flag_tke_oce      =  10, 4, 10, 10, 10    
-name_tke_oce      =  tke_oce
-flag_tke_sic      =  10, 4, 10, 10, 10    
-name_tke_sic      =  tke_sic
-flag_tke_max_ter  =  10, 4, 10, 10, 10    
-name_tke_max_ter  =  tke_max_ter
-flag_tke_max_lic  =  10, 4, 10, 10, 10    
-name_tke_max_lic  =  tke_max_lic
-flag_tke_max_oce  =  10, 4, 10, 10, 10    
-name_tke_max_oce  =  tke_max_oce
-flag_tke_max_sic  =  10, 4, 10, 10, 10    
-name_tke_max_sic  =  tke_max_sic
-# Kz melange
-flag_kz           =  4, 10, 10, 10, 10    
-name_kz           =  kz
-# Kz max melange
-flag_kz_max       =  4, 10, 10, 10, 10    
-name_kz_max       =  kz_max
-# Sfce net SW radiation OR
-flag_SWnetOR      =  10, 10, 2, 10, 10    
-name_SWnetOR      =  SWnetOR
-# Sfce incident SW radiation OR
-flag_SWdownOR     =  10, 10, 2, 10, 10    
-name_SWdownOR     =  SWdownOR
-# Sfce incident LW radiation OR
-flag_LWdownOR     =  10, 10, 2, 10, 10    
-name_LWdownOR     =  LWdownOR
-# Solid Large-scale Precip
-flag_snowl        =  10, 1, 10, 10, 10    
-name_snowl        =  snowl
-# cape max
-flag_cape_max     =  10, 1, 10, 10, 10    
-name_cape_max     =  cape_max
-# Down. IR rad. at surface
-flag_solldown     =  10, 1, 10, 1, 10    
-name_solldown     =  solldown
-# Boundary-layer dTs(o)
-flag_dtsvdfo      =  10, 10, 10, 1, 10    
-name_dtsvdfo      =  dtsvdfo
-# Boundary-layer dTs(t)
-flag_dtsvdft      =  10, 10, 10, 1, 10    
-name_dtsvdft      =  dtsvdft
-# Boundary-layer dTs(g)
-flag_dtsvdfg      =  10, 10, 10, 1, 10    
-name_dtsvdfg      =  dtsvdfg
-# Boundary-layer dTs(g)
-flag_dtsvdfi      =  10, 10, 10, 1, 10    
-name_dtsvdfi      =  dtsvdfi
-# rugosity
-flag_rugs         =  10, 10, 10, 1, 1    
-name_rugs         =  rugs
-# Cloud liquid water content
-flag_lwcon        =  2, 5, 10, 10, 1    
-name_lwcon        =  lwcon
-# Cloud ice water content
-flag_iwcon        =  2, 5, 10, 10, 10    
-name_iwcon        =  iwcon
-# Air temperature
-flag_temp         =  2, 3, 4, 1, 1    
-name_temp         =  temp
-# Potential air temperature
-flag_theta        =  2, 3, 4, 1, 1    
-name_theta        =  theta
-# Specific humidity
-flag_ovap         =  2, 3, 4, 1, 1    
-name_ovap         =  ovap
-# ?
-flag_ovapinit     =  2, 3, 4, 1, 1
-name_ovapinit     =  ovapinit
-# ?
-flag_wvapp        =  2, 10, 10, 10, 10    
-name_wvapp        =  wvapp
-# Geopotential height
-flag_geop         =  2, 3, 10, 1, 1    
-name_geop         =  geop
-# Zonal wind
-flag_vitu         =  2, 3, 4, 1, 1    
-name_vitu         =  vitu
-# Meridional wind
-flag_vitv         =  2, 3, 4, 1, 1    
-name_vitv         =  vitv
-# Vertical wind
-flag_vitw         =  2, 3, 10, 10, 1    
-name_vitw         =  vitw
-# Air pressure
-flag_pres         =  2, 3, 10, 1, 1    
-name_pres         =  pres
-# Cloud Fraction
-flag_rneb         =  2, 5, 10, 10, 1    
-name_rneb         =  rneb
-# Convective Cloud Fraction
-flag_rnebcon      =  2, 5, 10, 10, 1    
-name_rnebcon      =  rnebcon
-# Relative humidity
-flag_rhum         =  2, 10, 10, 10, 10    
-name_rhum         =  rhum
-# Ozone concentration
-flag_ozone        =  2, 10, 10, 10, 10    
-name_ozone        =  ozone
-# saturated updraft
-flag_upwd         =  2, 10, 10, 10, 10    
-name_upwd         =  upwd
-# Physics dT
-flag_dtphy        =  2, 10, 10, 10, 1    
-name_dtphy        =  dtphy
-# Physics dq
-flag_dqphy        =  2, 10, 10, 10, 1    
-name_dqphy        =  dqphy
-# Convective precipitation lic and ice
-flag_pr_con_l     =  2, 10, 10, 10, 10    
-name_pr_con_l     =  pr_con_l
-flag_pr_con_i     =  2, 10, 10, 10, 10    
-name_pr_con_i     =  pr_con_i
-# Large scale precipitation lic and ice
-flag_pr_lsc_l     =  2, 10, 10, 10, 10    
-name_pr_lsc_l     =  pr_lsc_l
-flag_pr_lsc_i     =  2, 10, 10, 10, 10    
-name_pr_lsc_i     =  pr_lsc_i
-# Albedo surf, Snow age and rugosity (ter sic lic oce)
-flag_albe_ter     =  3, 4, 10, 1, 10    
-name_albe_ter     =  albe_ter 
-flag_albe_lic     =  3, 4, 10, 1, 10    
-name_albe_lic     =  albe_lic
-flag_albe_oce     =  3, 4, 10, 1, 10    
-name_albe_oce     =  albe_oce
-flag_albe_sic     =  3, 4, 10, 1, 10    
-name_albe_sic     =  albe_sic 
-flag_ages_ter     =  3, 10, 10, 10, 10    
-name_ages_ter     =  ages_ter
-flag_ages_lic     =  3, 10, 10, 10, 10    
-name_ages_lic     =  ages_lic
-flag_ages_oce     =  3, 10, 10, 10, 10    
-name_ages_oce     =  ages_oce
-flag_ages_sic     =  3, 10, 10, 10, 10    
-name_ages_sic     =  ages_sic
-flag_rugs_ter     =  3, 4, 10, 1, 10    
-name_rugs_ter     =  rugs_ter 
-flag_rugs_lic     =  3, 4, 10, 1, 10    
-name_rugs_lic     =  rugs_lic
-flag_rugs_oce     =  3, 4, 10, 1, 10    
-name_rugs_oce     =  rugs_oce
-flag_rugs_sic     =  3, 4, 10, 1, 10    
-name_rugs_sic     =  rugs_sic
-# Surface albedo
-flag_albs         =  3, 10, 10, 1, 10    
-name_albs         =  albs
-# Surface albedo LW
-flag_albslw       =  3, 10, 10, 1, 10    
-name_albslw       =  albslw
-# Convective Cloud Liquid water content
-flag_clwcon       =  4, 10, 10, 10, 10    
-name_clwcon       =  clwcon
-# undilute adiab updraft
-flag_Ma           =  4, 10, 10, 10, 10    
-name_Ma           =  Ma
-# saturated downdraft
-flag_dnwd         =  4, 10, 10, 10, 10    
-name_dnwd         =  dnwd
-# unsat. downdraft
-flag_dnwd0        =  4, 10, 10, 10, 10    
-name_dnwd0        =  dnwd0
-# Dynamics dT dQ dU dV, .....
-flag_dtdyn        =  4, 10, 10, 10, 1
-name_dtdyn        =  dtdyn
-flag_dqdyn        =  4, 10, 10, 10, 1    
-name_dqdyn        =  dqdyn
-flag_dudyn        =  4, 10, 10, 10, 1    
-name_dudyn        =  dudyn
-flag_dvdyn        =  4, 10, 10, 10, 1    
-name_dvdyn        =  dvdyn 
-flag_dtcon        =  4, 5, 10, 10, 10    
-name_dtcon        =  dtcon
-flag_ducon        =  4, 10, 10, 10, 10    
-name_ducon        =  ducon
-flag_dqcon        =  4, 5, 10, 10, 10    
-name_dqcon        =  dqcon
-flag_dtwak        =  4, 5, 10, 10, 10    
-name_dtwak        =  dtwak
-flag_dqwak        =  4, 5, 10, 10, 10    
-name_dqwak        =  dqwak
-flag_wake_h       =  4, 5, 10, 10, 10    
-name_wake_h       =  wake_h
-flag_wake_s       =  4, 5, 10, 10, 10    
-name_wake_s       =  wake_s
-flag_wake_deltat  =  4, 5, 10, 10, 10    
-name_wake_deltat  =  wake_deltat
-flag_wake_deltaq  =  4, 5, 10, 10, 10    
-name_wake_deltaq  =  wake_deltaq
-flag_wake_omg     =  4, 5, 10, 10, 10    
-name_wake_omg     =  wake_omg 
-flag_Vprecip      =  10, 10, 10, 10, 10    
-name_Vprecip      =  Vprecip
-flag_ftd          =  4, 5, 10, 10, 10    
-name_ftd          =  ftd
-flag_fqd          =  4, 5, 10, 10, 10    
-name_fqd          =  fqd
-flag_dtlsc        =  4, 10, 10, 10, 10    
-name_dtlsc        =  dtlsc
-flag_dtlschr      =  4, 10, 10, 10, 10    
-name_dtlschr      =  dtlschr
-flag_dqlsc        =  4, 10, 10, 10, 10    
-name_dqlsc        =  dqlsc
-flag_dtvdf        =  4, 10, 10, 1, 10    
-name_dtvdf        =  dtvdf
-flag_dqvdf        =  4, 10, 10, 1, 10    
-name_dqvdf        =  dqvdf
-flag_dteva        =  4, 10, 10, 10, 10    
-name_dteva        =  dteva
-flag_dqeva        =  4, 10, 10, 10, 10    
-name_dqeva        =  dqeva
-flag_ptconv       =  4, 10, 10, 10, 10    
-name_ptconv       =  ptconv
-flag_ratqs        =  4, 10, 10, 10, 10    
-name_ratqs        =  ratqs
-flag_dtthe        =  4, 10, 10, 10, 10    
-name_dtthe        =  dtthe
-flag_f_th         =  4, 10, 10, 10, 10    
-name_f_th         =  f_th
-flag_e_th         =  4, 10, 10, 10, 10    
-name_e_th         =  e_th
-flag_w_th         =  4, 10, 10, 10, 10    
-name_w_th         =  w_th
-flag_lambda_th    =  4, 10, 10, 10, 10    
-name_lambda_th    =  lambda_th
-flag_q_th         =  4, 10, 10, 10, 10    
-name_q_th         =  q_th
-flag_a_th         =  4, 10, 10, 10, 10    
-name_a_th         =  a_th
-flag_d_th         =  4, 10, 10, 10, 10    
-name_d_th         =  d_th
-flag_f0_th        =  4, 10, 10, 10, 10    
-name_f0_th        =  f0_th
-flag_zmax_th      =  4, 10, 10, 10, 10    
-name_zmax_th      =  zmax_th
-flag_dqthe        =  4, 10, 10, 10, 1    
-name_dqthe        =  dqthe
-flag_dtajs        =  4, 10, 10, 10, 10    
-name_dtajs        =  dtajs
-flag_dqajs        =  4, 10, 10, 10, 10    
-name_dqajs        =  dqajs
-flag_dtswr        =  4, 10, 10, 10, 1    
-name_dtswr        =  dtswr
-flag_dtsw0        =  4, 10, 10, 10, 10    
-name_dtsw0        =  dtsw0 
-flag_dtlwr        =  4, 10, 10, 10, 1    
-name_dtlwr        =  dtlwr
-flag_dtlw0        =  4, 10, 10, 10, 10    
-name_dtlw0        =  dtlw0
-flag_dtec         =  4, 10, 10, 10, 10    
-name_dtec         =  dtec
-flag_duvdf        =  4, 10, 10, 10, 10    
-name_duvdf        =  duvdf
-flag_dvvdf        =  4, 10, 10, 10, 10    
-name_dvvdf        =  dvvdf
-flag_duoro        =  4, 10, 10, 10, 10    
-name_duoro        =  duoro
-flag_dvoro        =  4, 10, 10, 10, 10    
-name_dvoro        =  dvoro
-flag_dulif        =  4, 10, 10, 10, 10    
-name_dulif        =  dulif
-flag_dvlif        =  4, 10, 10, 10, 10    
-name_dvlif        =  dvlif
-###! Attention a refaire correctement
-flag_trac01       =  4, 10, 10, 10, 10    
-name_trac01       =  trac01 
-flag_trac02       =  4, 10, 10, 10, 10    
-name_trac02       =  trac02
-
Index: trunk/physiq.def
===================================================================
--- trunk/physiq.def	(revision 1)
+++ 	(revision )
@@ -1,219 +1,0 @@
-## $Id: physiq.def 1403 2010-07-01 09:02:53Z fairhead $
-#
-# PARAMETRES ANCIENNEMENT DANS gcm.def
-##  Cycle diurne  ou non                 
-cycle_diurne=y
-##  Soil Model  ou non               
-soil_model=y
-##  Choix ou non  de  New oliq               
-new_oliq=y
-##  Activation ou non de la parametrisation de Hines pour la strato
-ok_hines=n
-##  Orodr  ou  non   pour l orographie              
-ok_orodr=y
-##  Orolf  ou  non   pour l orographie              
-ok_orolf=y
-##   Si = .T. ,  lecture du fichier limit avec la bonne annee             
-ok_limitvrai=n
-## Nombre  d'appels des routines de rayonnements ( par jour)                 
-nbapp_rad=24
-##  Flag  pour la convection : 1 pour LMD, 2 pour Tiedtke, 3 KE(nvlle version JYG), 30 KE(version IPCC AR4), 4 KE vect
-iflag_con=30
-## Facteur multiplication des precip convectives dans KE
-cvl_corr=1.0
-##  Facteur additif pour l'albedo
-pmagic=0.008
-#
-#
-#
-# Parametres fichiers de sortie
-#
-### type_run = type run par rapport aux fichiers et variables de sortie
-# - type_run = CLIM/ENSP (=1)
-# - type_run = AMIP/CFMI (=2)
-type_run=AMIP
-### OK_journe= y sortir fichier journalier histday.nc, =n pas de fichier histday.nc
-OK_journe=n
-### OK_mensuel= y sortir fichier mensuel histmth.nc, =n pas de fichier histmth.nc
-OK_mensuel=y
-### OK_instan=y, ecrire sorties "instantannees" (chaque pas de temps de la  physique)
-OK_instan=n
-### OK_hf=y, ecrire sorties hautes frequence histhf.nc, =n pas de fichier histhf.nc
-ok_hf=n
-#
-# Parametres niveau de sorties differents fichiers 
-#
-### lev_histhf=0-4, niveau de sortie fichier "histhf.nc" 
-# - lev_histhf=0 => pas de sorties histhf.nc
-# - lev_histhf=2 => defaut
-# - lev_histhf=3 => variables sur niveaux standards
-# - lev_histhf=4 => histhf3d.nc champs 3d niveaux modele => fichier. histhf3d.nc
-lev_histhf=2
-### lev_histday=0-5, niveau de sortie fichier "histday.nc"
-# - lev_histday=0 => pas de sorties lev_histday.nc
-# - lev_histday=2 => defaut
-# - lev_histday=3 => + champs 3D => F. Lott
-# - lev_histday=4 => + champs sous-surfaces
-# - lev_histday=5 => + champs F. Aires
-lev_histday=2
-### lev_histmth=0-4, niveau de sortie fichier "histmth.nc"
-# - lev_histmth=0 => pas de sorties lev_histmth.nc
-# - lev_histmth=2 => defaut
-# - lev_histmth=3 => albedo, rugosite sous-surfaces
-# - lev_histmth=4 => champs tendances 3d
-lev_histmth=2
-### ecrit_hf = frequence ecriture fichier histhf.nc en jours
-ecrit_hf=0.250
-### ecrit_day = frequence ecriture fichier histday.nc en jours
-ecrit_day=1.
-### ecrit_mth = frequence ecriture fichier histmth.nc en jours
-ecrit_mth=30
-### freqin_isccp = frequence input en secondes du simulateur ISCCP
-freq_ISCCP=10800.
-### freqout_isccp = frequence output en jours du simulateur ISCCP
-ecrit_ISCCP=30
-### niveau du diagnostique de conservation d energie
-if_ebil=0
-#
-# parametres KE
-#
-### epmax = Efficacite precipitation maximale
-epmax = .999
-### ok_adj_ema = ?? pas utilise
-ok_adj_ema = n
-### iflag_clw Flag calcul eau liquide
-# - iflag_clw=0 : qcond_incld(i,l) = em_qcondc(l)
-# - iflag_clw=1 : qcond_incld(i,l) = em_qcond(l)
-# - iflag_clw=2 : eau liquide diagnostique en fonction de la Precip
-iflag_clw = 1
-# 
-# parametres nuages
-#
-### cld_lc_lsc  contenu en eau liquide des nuages large-scale (fisrtilp) 
-cld_lc_lsc = 4.16e-4
-### cld_lc_con  contenu en eau liquide des nuages convectifs (fisrtilp) 
-cld_lc_con = 4.16e-4
-### cld_tau_lsc cte de temps utilisee pour eliminer l eau large-scale (fisrtilp) 
-cld_tau_lsc = 1800.
-### cld_tau_con cte de temps utilisee pour eliminer l eau convective (fisrtilp) 
-cld_tau_con = 1800.
-### ffallv_lsc  cte utilisee dans calcul vitesse de chute cristaux de glace large-scale (fisrtilp) 
-ffallv_lsc = 0.5
-### ffallv_lsc  cte utilisee dans calcul vitesse de chute cristaux de glace convectifs (fisrtilp) 
-ffallv_con = 0.5
-### coef_eva coef evaporation precips eau/glace (fisrtilp/fisrtilp_tr?/conlmd?)
-coef_eva = 2.e-5
-### reevap_ice  reevaporation de toute la precip dans la couche du dessous pour la glace (fisrtilp) 
-reevap_ice = y
-### iflag_cldcon  flag pour calculer ratqsc=F(ratqsbas,fact_cldcon,q_seri) (physiq) 
-# - iflag_cldcon<=-1 diag. rain_Tiedtke 
-# - iflag_cldcon=1, ratqsc=ratqsbas+fact_cldcon*(q_seri(1)-q_seri(k))/q_seri(k)
-# - iflag_cldcon=1/2, ratqs=max(ratqs,ratqsc)
-# - iflag_cldcon=3,   ratqs=ratqss
-iflag_cldcon = 3
-### iflag_pdf :  flag calcul distribution sous-maille de l eau et des nuages 
-# - iflag_pdf=0, version ratqs, 
-# - iflag_pdf=1, calcul eau condensee, fraction nuageuse, eau nuageuse a partir
-# -              des PDFS de Sandrine Bony 
-iflag_pdf = 1
-### fact_cldcon  constante calcul ratqsc (voir iflag_cldcon) et proprietes nuages convectifs, clwcon0 (physiq.F) 
-fact_cldcon = 1.
-### facttemps=   facteur de relaxation de ratqs (iflag_cldcon=1/2) et rnebcon (iflag_cldcon=3)
-facttemps = 0.
-## ok_newmicro   =y appel newmicro , =n appel nuage (calcul epaisseur optique et emmissivite des nuages) 
-ok_newmicro = y
-### iflag_ratqs=0 correspond a la version IPCC AR4 
-iflag_ratqs=0
-### ratqsbas     ratqs en bas si iflag_cldcon=1 
-ratqsbas = 0.005
-### ratqshaut    ratqs en haut pour ratqss "stables"  
-ratqshaut = 0.33
-### rad_froid    rayon cristaux des nuages de glace "froids" 
-rad_froid = 35
-### rad_chau1    rayon goutelettes d eau chauds", en haut: k=4-klev 
-rad_chau1=12
-### rad_chau2    rayon goutelettes d eau chauds", en bas: k=1-3  
-rad_chau2=11
-# 
-# Coefficient et parametres sur les drags
-#
-f_cdrag_ter=1.
-f_cdrag_stable=1.
-f_cdrag_oce=0.8
-f_rugoro=0.
-### ksta_ter      coef.diffusion minimale sur terre/sic/lic 
-ksta_ter=1.e-7
-### cdmmax =     cdrag maximum pour le moment
-cdmmax = 2.5E-3
-### cdhmax =     cdrag maximum pour l energie
-cdhmax = 2.0E-3
-#
-# Parametres "orbitaux/ ere geologique"
-#
-### R_ecc =      Excentricite
-R_ecc = 0.016715
-### R_peri =     Equinoxe
-R_peri = 102.7
-### R_incl =     Inclinaison
-R_incl = 23.441
-### solaire =    Constante solaire
-solaire = 1361.
-#
-# Taux gaz a effet de serre
-#
-### co2_ppm =    taux CO2 en ppm
-co2_ppm = 367.
-### CH4_ppb =    taux CH4 en ppb
-CH4_ppb = 1760.
-### N2O_ppb =    taux N2O en ppb
-N2O_ppb = 316.
-### CFC11_ppt =  taux CFC11 en ppt
-CFC11_ppt = 741.2
-### CFC12_ppt =  taux CFC12 en ppt
-CFC12_ppt = 535.
-#
-# Parametres effets directs/indirects des "aerosols"
-#
-### ok_ade=y/n   flag Aerosol direct effect
-ok_ade=n
-### ok_aie=y/n   flag Aerosol indirect effect
-ok_aie=n
-### aer_type =   Aerosol variation type : actuel / preind / scenario / annuel
-aer_type=actuel
-###  type of coupled aerosol =1 (default) =2 => bc  only =3 => pom only =4 => seasalt only =5 => dust only =6 => all aerosol
-flag_aerosol=6 
-### bl95_b0 =    Parameter in CDNC-maer link (Boucher&Lohmann 1995)
-bl95_b0=1.7
-### bl95_b1 =    Parameter in CDNC-maer link (Boucher&Lohmann 1995)
-bl95_b1=0.2
-#
-# Parametre de lecture de l'ozone
-#
-# Allowed values are 0, 1 and 2
-# 0: do not read an ozone climatology
-# 1: read a single ozone climatology that will be used day and night
-# 2: read two ozone climatologies, the average day and night climatology and the daylight climatology
-read_climoz=0
-#
-# Parametres simulateur COSP (CFMIP Observational Simulator Package)
-#
-### ok_cosp=y/n flag simulateur COSP
-ok_cosp=n
-## freq_COSP = frequence d'appel de COSP en secondes
-freq_COSP=10800.
-#
-# Parametres simulateur ISCCP
-#
-### ok_isccp=y/n flag simulateur ISCCP
-ok_isccp=n
-### top_height = flag choix calcul nuages par le simulateur en utilisant 
-# -              les donnees IR et/ou VIS et l algorithme ISCCP-D1
-# - top_height = 1 -> algo IR-VIS
-# - top_height = 2 -> identique a 1, mais "ptop(ibox)=pfull(ilev)"
-# - top_height = 3 -> algo IR
-top_height = 1
-### overlap =    Hypothese de Recouvrement (HR) utilisee pour le simulateur ISCCP
-# - overlap=1    Max overlap
-# - overlap=2    Random overlap
-# - overlap=3    Max/Random overlap
-overlap = 3
Index: trunk/run.def
===================================================================
--- trunk/run.def	(revision 1)
+++ 	(revision )
@@ -1,47 +1,0 @@
-# $Id: run.def 1403 2010-07-01 09:02:53Z fairhead $
-#
-## Fichier de configuration general
-## 
-INCLUDEDEF=physiq.def
-INCLUDEDEF=gcm.def
-INCLUDEDEF=orchidee.def
-INCLUDEDEF=output.def
-## Type de calendrier utilise
-## valeur possible: earth_360d (defaut), earth_365d, earth_366d
-calend=earth_360d
-## Jour de l'etat initial ( = 350  si 20 Decembre ,par expl. ,comme ici )
-dayref=1
-##  Annee de l'etat  initial (   avec  4  chiffres   )
-anneeref=1980
-## Nombre de jours d'integration
-nday=5
-## Remise a zero de la date initiale
-raz_date=0
-## periode de sortie des variables de controle (en pas)
-iconser=240
-## sorties instantanees dans la dynamique (fichiers dyn_hist.nc and co.)
-ok_dyn_ins=n
-## periode d'ecriture des sorties instantanees dans la dynamique
-## (en pas dynamiques)
-iecri=960
-## sorties de valeurs moyennes dans la dynamique (fichiers dyn_hist_ave.nc and co.)
-ok_dyn_ave=n
-## periode de stockage des moyennes dans la dynamique et dans dynzon
-periodav=30
-## flag de sortie dynzon
-ok_dynzon=n
-## activation du calcul d equilibrage de charge
-adjust=n
-## activation du filtre fft
-use_filtre_fft=n
-## niveau d'impression de controle
-prt_level=1
-##
-## Informations sur la configuration utilisee
-## 
-### type_ocean = force / slab  /couple
-type_ocean=force
-### version_ocean = nemo / opa8 
-version_ocean=nemo
-### VEGET= y si ORCHIDEE, =n si bucket
-VEGET=n
Index: trunk/traceur.def
===================================================================
--- trunk/traceur.def	(revision 1)
+++ 	(revision )
@@ -1,5 +1,0 @@
-4
-14 14 H2Ov
-10 10 H2Ol
-10 10 RN
-10 10 PB
