Index: branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER
===================================================================
--- branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER	(revision 3649)
+++ branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER	(revision 3651)
@@ -4,8 +4,8 @@
 #PBS -e sette.$PBS_JOBID.err
 #PBS -o sette.$PBS_JOBID.out
-#PBS -l nodes=2:ppn=8
-#PBS -q multi
+#PBS -l nodes=NODES:ppn=NPROCSNODE
+#PBS -q QUEUE
 #PBS -l walltime=03:00:00
-#PBS -l mem=24gb
+#PBS -l mem=MEMgb
 
 #
@@ -22,5 +22,6 @@
 # Local settings for machine IBM Power6 (VARGAS at IDRIS France)
 #
-export MPIRUN="mpiexec -n $OCEANCORES"
+#cbr export MPIRUN="mpiexec -n $OCEANCORES"
+export MPIRUN="mpirun -np $OCEANCORES"
 
 #
@@ -50,5 +51,4 @@
 #
 cd ${EXE_DIR}
-
   echo Running on host `hostname`
   echo Time is `date`
@@ -57,9 +57,11 @@
 #  Run the parallel MPI executable 
 #
+  echo "Running time ${MPIRUN} ./opa"
+#
   if [ MPI_FLAG == "yes" ]; then
-  echo "Running time ${MPIRUN} ./opa"
-     time ${MPIRUN} ./opa
+#cbr     time ${MPIRUN} ./opa
+     mpirun -np $OCEANCORES ./opa
+#cbr     mpirun -np $OCEANCORES ./opa
   else
-  echo "Running time ./opa"
      time ./opa
   fi
Index: branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/iodef_sette.xml
===================================================================
--- branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/iodef_sette.xml	(revision 3649)
+++ branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/iodef_sette.xml	(revision 3651)
@@ -140,5 +140,5 @@
 	<field id="utau"         description="Wind Stress along i-axis"                    unit="N/m2" axis_ref="none" />
 	<field id="uoce"         description="ocean current along i-axis"                  unit="m/s"                  />
-	<field id="uocetr_eff"   description="Effective ocean transport along i-axis"      unit="m3/s"                  />
+	<field id="uocetr_eff"     description="Effective ocean transport along i-axis"    unit="m3/s"                 />
 	<!-- uoce_eiv: available with key_traldf_eiv and key_diaeiv -->
 	<field id="uoce_eiv"     description="EIV ocean current along i-axis"              unit="m/s"                  />
@@ -158,5 +158,5 @@
 	<field id="vtau"         description="Wind Stress along j-axis"                    unit="N/m2" axis_ref="none" />
 	<field id="voce"         description="ocean current along j-axis"                  unit="m/s"                  />
-	<field id="vocetr_eff"   description="Effective ocean transport along j-axis"      unit="m3/s"                  />
+	<field id="vocetr_eff"     description="Effective ocean tra,sport along j-axis"    unit="m3/s"                 />
 	<!-- voce_eiv: available with key_traldf_eiv and key_diaeiv -->
 	<field id="voce_eiv"     description="EIV ocean current along j-axis"              unit="m/s"                  />
@@ -175,5 +175,5 @@
       <group id="grid_W"  axis_ref="depthw" grid_ref="grid_W">
 	<field id="woce"         description="ocean vertical velocity"                     unit="m/s"                  />
-	<field id="wocetr_eff"   description="effective ocean vertical transport"          unit="m3/s"                 />
+	<field id="wocetr_eff"     description="effective ocean vertical transport"          unit="m3/s"                 />
 	<!-- woce_eiv: available with key_traldf_eiv and key_diaeiv -->
 	<field id="woce_eiv"     description="EIV ocean vertical velocity"                 unit="m/s"                  />
@@ -209,8 +209,19 @@
 	<field id="fram_trans" description="Sea Ice Mass Transport Through Fram Strait" unit="kg/s" />
       </group>
-         
+
+      <!-- variables available with key_float -->
+      <group id="floatvar" axis_ref="nfloat" grid_ref="scalarpoint" zoom_ref="1point">
+        <field id="traj_lon"   description="floats longitude"   unit="deg"  operation="inst(X)" />
+        <field id="traj_lat"   description="floats latitude"    unit="deg"   />
+        <field id="traj_dep"   description="floats depth"       unit="m"     />
+        <field id="traj_temp"  description="floats temperature" unit="degC"  />
+        <field id="traj_salt"  description="floats salinity"    unit="psu"   />
+        <field id="traj_dens"  description="floats density"     unit="kg/m3" />
+        <field id="traj_group" description="floats group"       unit="none"  />
+      </group>
+     
       <!-- ptrc on T grid -->
 
-     <group id="ptrc_T" axis_ref="deptht" grid_ref="grid_T">  
+     <group id="ptrc_T" axis_ref="deptht" grid_ref="grid_T">
        <field id="DIC"      description="Dissolved inorganic Concentration"        unit="mmol/m3" />
        <field id="Alkalini" description="Total Alkalinity Concentration"           unit="mmol/m3"    />
@@ -237,4 +248,10 @@
        <field id="NO3"      description="Nitrates Concentration"                   unit="mmol/m3" />
        <field id="NH4"      description="Ammonium Concentration"                   unit="mmol/m3" />
+       <field id="DET"      description="Detritus"                                      unit="mmole-N/m3" />
+       <field id="ZOO"      description="Zooplankton Concentration"                     unit="mmole-N/m3" />
+       <field id="PHY"      description="Phytoplankton Concentration"                   unit="mmole-N/m3" />
+       <field id="NO3"      description="Nitrate Concentration"                         unit="mmole-N/m3" />
+       <field id="NH4"      description="Ammonium Concentration"                        unit="mmole-N/m3" />
+       <field id="DOM"      description="Dissolved Organic Matter"                      unit="mmole-N/m3" />
      </group>
 
@@ -246,22 +263,19 @@
        <field id="CO3sat"      description="CO3 saturation"                           unit="mol/m3"     axis_ref="deptht" />
        <field id="PAR"         description="Photosynthetically Available Radiation"   unit="W/m2"       axis_ref="deptht" />
-       <field id="PPPHY"       description="Primary production of nanophyto"          unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="PPPHY2"      description="Primary production of diatoms"            unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="PPNEWN"      description="New Primary production of nanophyto"      unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="PPNEWD"      description="New Primary production of diatoms"        unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="PBSi"        description="Primary production of Si diatoms"         unit="molSi/m3/s"   axis_ref="deptht" />
-       <field id="PFeN"        description="Primary production of nano iron"          unit="molFe/m3/s"   axis_ref="deptht" />
-       <field id="PFeD"        description="Primary production of diatoms iron"       unit="molFe/m3/s"   axis_ref="deptht" />
-       <field id="xfracal"     description="Calcifying fraction"                      unit="-"          axis_ref="deptht" />
-       <field id="PCAL"        description="Calcite production"                       unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="DCAL"        description="Calcite dissolution"                      unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="GRAZ1"       description="Grazing by microzooplankton"              unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="GRAZ2"       description="Grazing by mesozooplankton"              unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="REMIN"       description="Oxic remineralization of OM"             unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="DENIT"       description="Anoxic remineralization of OM"           unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="Nfix"        description="Nitrogen fixation"                         unit="molN/m3/s"   axis_ref="deptht" />
+       <field id="PPPHY"       description="Primary production of nanophyto"          unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PPPHY2"      description="Primary production of diatoms"            unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PPNEWN"      description="New Primary production of nanophyto"      unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PPNEWD"      description="New Primary production of diatoms"        unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PBSi"        description="Primary production of Si diatoms"         unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PFeN"        description="Primary production of nano iron"          unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PFeD"        description="Primary production of diatoms iron"       unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PCAL"        description="Calcite production"                       unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="DCAL"        description="Calcite dissolution"                      unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="GRAZ"        description="Grazing by zooplankton"                   unit="mol/m3/s"   axis_ref="deptht" />
        <field id="Mumax"       description="Maximum growth rate"                      unit="s-1"        axis_ref="deptht" />
        <field id="MuN"         description="Realized growth rate for nanophyto"       unit="s-1"        axis_ref="deptht" />
        <field id="MuD"         description="Realized growth rate for diatomes"        unit="s-1"        axis_ref="deptht" />
+       <field id="MuNlight"    description="Light limited growth rate for nanophyto"  unit="s-1"        axis_ref="deptht" />
+       <field id="MuDlight"    description="Light limited growth rate for diatomes"   unit="s-1"        axis_ref="deptht" />
        <field id="LNnut"       description="Nutrient limitation term in Nanophyto"    unit="-"          axis_ref="deptht" />
        <field id="LDnut"       description="Nutrient limitation term in Diatoms"      unit="-"          axis_ref="deptht" />
@@ -270,17 +284,5 @@
        <field id="LNlight"     description="Light limitation term in Nanophyto"       unit="-"          axis_ref="deptht" />
        <field id="LDlight"     description="Light limitation term in Diatoms"         unit="-"          axis_ref="deptht" />
-       <field id="Fe2"        description="Iron II concentration"                      unit="nmol/L"   axis_ref="deptht" />
-       <field id="Fe3"        description="Iron III concentration"                      unit="nmol/L"   axis_ref="deptht" />
-       <field id="FeL1"        description="Complexed Iron concentration with L1"       unit="nmol/L"   axis_ref="deptht" />
-       <field id="FeL2"        description="Complexed Iron concentration with L2"       unit="nmol/L"   axis_ref="deptht" />
-       <field id="FeP"        description="Precipitated Iron III"                      unit="nmol/L"   axis_ref="deptht" />
-       <field id="TL1"        description="Total L1 concentration"                      unit="nmol/L"   axis_ref="deptht" />
-       <field id="TL2"        description="Total L2 concentration"                      unit="nmol/L"   axis_ref="deptht" />
-       <field id="pdust"        description="dust concentration"                      unit="g/L"    />
-       <field id="Totlig"        description="Total ligand concentation"                unit="nmol/L"   axis_ref="deptht" />
-       <field id="Biron"        description="Bioavailable iron"                       unit="nmol/L"   axis_ref="deptht" />
-       <field id="Sdenit"        description="Nitrate reduction in the sediments"     unit="molN/m2/s"      />
-       <field id="Ironice"     description="Iron input/uptake due to sea ice"             unit="molFe/m2/s"      />
-       <field id="HYDR"       description="Iron input from hydrothemal vents"          unit="molFe/m2/s"      />
+       <field id="Nfix"        description="Nitrogen fixation at surface"             unit="mol/m2/s"                     />
        <field id="EPC100"      description="Export of carbon particles at 100 m"      unit="mol/m2/s"                     />
        <field id="EPFE100"     description="Export of biogenic iron at 100 m"         unit="mol/m2/s"                     />
@@ -293,6 +295,27 @@
        <field id="Dpo2"        description="Delta O2"                                 unit="uatm"                         />
        <field id="Heup"        description="Euphotic layer depth"                     unit="m"                            />
-       <field id="Irondep"     description="Iron deposition from dust"                 unit="mol/m2/s"                     />
-       <field id="Ironsed"     description="Iron deposition from sediment"             unit="mol/m2/s"  axis_ref="deptht"  />
+       <field id="Irondep"     description="Iron deposition"                          unit="mol/m2/s"                     />
+       <field id="FNO3PHY"     description="FNO3PHY"                                  unit="-"          axis_ref="deptht" />
+       <field id="FNH4PHY"     description="FNH4PHY"                                  unit="-"          axis_ref="deptht" />
+       <field id="FNH4NO3"     description="FNH4NO3"                                  unit="-"          axis_ref="deptht" />
+       <field id="TNO3PHY"     description="TNO3PHY"                                  unit="-"  />
+       <field id="TNH4PHY"     description="TNH4PHY"                                  unit="-"  />
+       <field id="TPHYDOM"     description="TPHYDOM"                                  unit="-"  />
+       <field id="TPHYNH4"     description="TPHYNH4"                                  unit="-"  />
+       <field id="TPHYZOO"     description="TPHYZOO"                                  unit="-"  />
+       <field id="TPHYDET"     description="TPHYDET"                                  unit="-"  />
+       <field id="TDETZOO"     description="TDETZOO"                                  unit="-"  />
+       <field id="TDETSED"     description="TDETSED"                                  unit="-"  />
+       <field id="TZOODET"     description="TZOODET"                                  unit="-"  />
+       <field id="TZOOBOD"     description="TZOOBOD"                                  unit="-"  />
+       <field id="TZOONH4"     description="TZOONH4"                                  unit="-"  />
+       <field id="TZOODOM"     description="TZOODOM"                                  unit="-"  />
+       <field id="TNH4NO3"     description="TNH4NO3"                                  unit="-"  />
+       <field id="TDOMNH4"     description="TDOMNH4"                                  unit="-"  />
+       <field id="TDETNH4"     description="TDETNH4"                                  unit="-"  />
+       <field id="TPHYTOT"     description="TPHYTOT"                                  unit="-"  />
+       <field id="TZOOTOT"     description="TZOOTOT"                                  unit="-"  />
+       <field id="TDETDOM"     description="TDETDOM"                                  unit="-"  />
+       <field id="SEDPOC"      description="SEDPOC"                                   unit="-"  />
      </group>
        
@@ -374,4 +397,5 @@
       <axis id="depthv" description="Vertical V levels" unit="m" positive=".false." />
       <axis id="depthw" description="Vertical W levels" unit="m" positive=".false." />
+      <axis id="nfloat" description="Number of float"   unit="no unit" positive=".false." />
       <axis id="none" description="axe non defini" unit="none" size="1" />
     </axis_definition> 
@@ -551,5 +575,4 @@
   </context>
   
-
   <context id="1_nemo">
     
@@ -690,5 +713,5 @@
 	<field id="utau"         description="Wind Stress along i-axis"                    unit="N/m2" axis_ref="none" />
 	<field id="uoce"         description="ocean current along i-axis"                  unit="m/s"                  />
-	<field id="uocetr_eff"   description="Effective ocean transport along i-axis"      unit="m3/s"                  />
+	<field id="uocetr_eff"     description="Effective ocean transport along i-axis"    unit="m3/s"                 />
 	<!-- uoce_eiv: available with key_traldf_eiv and key_diaeiv -->
 	<field id="uoce_eiv"     description="EIV ocean current along i-axis"              unit="m/s"                  />
@@ -708,5 +731,5 @@
 	<field id="vtau"         description="Wind Stress along j-axis"                    unit="N/m2" axis_ref="none" />
 	<field id="voce"         description="ocean current along j-axis"                  unit="m/s"                  />
-	<field id="vocetr_eff"   description="Effective ocean transport along j-axis"      unit="m3/s"                  />
+	<field id="vocetr_eff"     description="Effective ocean tra,sport along j-axis"    unit="m3/s"                 />
 	<!-- voce_eiv: available with key_traldf_eiv and key_diaeiv -->
 	<field id="voce_eiv"     description="EIV ocean current along j-axis"              unit="m/s"                  />
@@ -725,5 +748,5 @@
       <group id="grid_W"  axis_ref="depthw" grid_ref="grid_W">
 	<field id="woce"         description="ocean vertical velocity"                     unit="m/s"                  />
-	<field id="wocetr_eff"   description="effective ocean vertical transport"          unit="m3/s"                 />
+	<field id="wocetr_eff"     description="effective ocean vertical transport"          unit="m3/s"                 />
 	<!-- woce_eiv: available with key_traldf_eiv and key_diaeiv -->
 	<field id="woce_eiv"     description="EIV ocean vertical velocity"                 unit="m/s"                  />
@@ -759,8 +782,19 @@
 	<field id="fram_trans" description="Sea Ice Mass Transport Through Fram Strait" unit="kg/s" />
       </group>
-         
+
+      <!-- variables available with key_float -->
+      <group id="floatvar" axis_ref="nfloat" grid_ref="scalarpoint" zoom_ref="1point">
+        <field id="traj_lon"   description="floats longitude"   unit="deg"  operation="inst(X)" />
+        <field id="traj_lat"   description="floats latitude"    unit="deg"   />
+        <field id="traj_dep"   description="floats depth"       unit="m"     />
+        <field id="traj_temp"  description="floats temperature" unit="degC"  />
+        <field id="traj_salt"  description="floats salinity"    unit="psu"   />
+        <field id="traj_dens"  description="floats density"     unit="kg/m3" />
+        <field id="traj_group" description="floats group"       unit="none"  />
+      </group>
+     
       <!-- ptrc on T grid -->
 
-     <group id="ptrc_T" axis_ref="deptht" grid_ref="grid_T">  
+     <group id="ptrc_T" axis_ref="deptht" grid_ref="grid_T">
        <field id="DIC"      description="Dissolved inorganic Concentration"        unit="mmol/m3" />
        <field id="Alkalini" description="Total Alkalinity Concentration"           unit="mmol/m3"    />
@@ -787,4 +821,10 @@
        <field id="NO3"      description="Nitrates Concentration"                   unit="mmol/m3" />
        <field id="NH4"      description="Ammonium Concentration"                   unit="mmol/m3" />
+       <field id="DET"      description="Detritus"                                      unit="mmole-N/m3" />
+       <field id="ZOO"      description="Zooplankton Concentration"                     unit="mmole-N/m3" />
+       <field id="PHY"      description="Phytoplankton Concentration"                   unit="mmole-N/m3" />
+       <field id="NO3"      description="Nitrate Concentration"                         unit="mmole-N/m3" />
+       <field id="NH4"      description="Ammonium Concentration"                        unit="mmole-N/m3" />
+       <field id="DOM"      description="Dissolved Organic Matter"                      unit="mmole-N/m3" />
      </group>
 
@@ -796,22 +836,19 @@
        <field id="CO3sat"      description="CO3 saturation"                           unit="mol/m3"     axis_ref="deptht" />
        <field id="PAR"         description="Photosynthetically Available Radiation"   unit="W/m2"       axis_ref="deptht" />
-       <field id="PPPHY"       description="Primary production of nanophyto"          unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="PPPHY2"      description="Primary production of diatoms"            unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="PPNEWN"      description="New Primary production of nanophyto"      unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="PPNEWD"      description="New Primary production of diatoms"        unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="PBSi"        description="Primary production of Si diatoms"         unit="molSi/m3/s"   axis_ref="deptht" />
-       <field id="PFeN"        description="Primary production of nano iron"          unit="molFe/m3/s"   axis_ref="deptht" />
-       <field id="PFeD"        description="Primary production of diatoms iron"       unit="molFe/m3/s"   axis_ref="deptht" />
-       <field id="xfracal"     description="Calcifying fraction"                      unit="-"          axis_ref="deptht" />
-       <field id="PCAL"        description="Calcite production"                       unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="DCAL"        description="Calcite dissolution"                      unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="GRAZ1"       description="Grazing by microzooplankton"              unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="GRAZ2"       description="Grazing by mesozooplankton"              unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="REMIN"       description="Oxic remineralization of OM"             unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="DENIT"       description="Anoxic remineralization of OM"           unit="molC/m3/s"   axis_ref="deptht" />
-       <field id="Nfix"        description="Nitrogen fixation"                         unit="molN/m3/s"   axis_ref="deptht" />
+       <field id="PPPHY"       description="Primary production of nanophyto"          unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PPPHY2"      description="Primary production of diatoms"            unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PPNEWN"      description="New Primary production of nanophyto"      unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PPNEWD"      description="New Primary production of diatoms"        unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PBSi"        description="Primary production of Si diatoms"         unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PFeN"        description="Primary production of nano iron"          unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PFeD"        description="Primary production of diatoms iron"       unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="PCAL"        description="Calcite production"                       unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="DCAL"        description="Calcite dissolution"                      unit="mol/m3/s"   axis_ref="deptht" />
+       <field id="GRAZ"        description="Grazing by zooplankton"                   unit="mol/m3/s"   axis_ref="deptht" />
        <field id="Mumax"       description="Maximum growth rate"                      unit="s-1"        axis_ref="deptht" />
        <field id="MuN"         description="Realized growth rate for nanophyto"       unit="s-1"        axis_ref="deptht" />
        <field id="MuD"         description="Realized growth rate for diatomes"        unit="s-1"        axis_ref="deptht" />
+       <field id="MuNlight"    description="Light limited growth rate for nanophyto"  unit="s-1"        axis_ref="deptht" />
+       <field id="MuDlight"    description="Light limited growth rate for diatomes"   unit="s-1"        axis_ref="deptht" />
        <field id="LNnut"       description="Nutrient limitation term in Nanophyto"    unit="-"          axis_ref="deptht" />
        <field id="LDnut"       description="Nutrient limitation term in Diatoms"      unit="-"          axis_ref="deptht" />
@@ -820,17 +857,5 @@
        <field id="LNlight"     description="Light limitation term in Nanophyto"       unit="-"          axis_ref="deptht" />
        <field id="LDlight"     description="Light limitation term in Diatoms"         unit="-"          axis_ref="deptht" />
-       <field id="Fe2"        description="Iron II concentration"                      unit="nmol/L"   axis_ref="deptht" />
-       <field id="Fe3"        description="Iron III concentration"                      unit="nmol/L"   axis_ref="deptht" />
-       <field id="FeL1"        description="Complexed Iron concentration with L1"       unit="nmol/L"   axis_ref="deptht" />
-       <field id="FeL2"        description="Complexed Iron concentration with L2"       unit="nmol/L"   axis_ref="deptht" />
-       <field id="FeP"        description="Precipitated Iron III"                      unit="nmol/L"   axis_ref="deptht" />
-       <field id="TL1"        description="Total L1 concentration"                      unit="nmol/L"   axis_ref="deptht" />
-       <field id="TL2"        description="Total L2 concentration"                      unit="nmol/L"   axis_ref="deptht" />
-       <field id="pdust"        description="dust concentration"                      unit="g/L"    />
-       <field id="Totlig"        description="Total ligand concentation"                unit="nmol/L"   axis_ref="deptht" />
-       <field id="Biron"        description="Bioavailable iron"                       unit="nmol/L"   axis_ref="deptht" />
-       <field id="Sdenit"        description="Nitrate reduction in the sediments"     unit="molN/m2/s"      />
-       <field id="Ironice"     description="Iron input/uptake due to sea ice"             unit="molFe/m2/s"      />
-       <field id="HYDR"       description="Iron input from hydrothemal vents"          unit="molFe/m2/s"      />
+       <field id="Nfix"        description="Nitrogen fixation at surface"             unit="mol/m2/s"                     />
        <field id="EPC100"      description="Export of carbon particles at 100 m"      unit="mol/m2/s"                     />
        <field id="EPFE100"     description="Export of biogenic iron at 100 m"         unit="mol/m2/s"                     />
@@ -843,6 +868,27 @@
        <field id="Dpo2"        description="Delta O2"                                 unit="uatm"                         />
        <field id="Heup"        description="Euphotic layer depth"                     unit="m"                            />
-       <field id="Irondep"     description="Iron deposition from dust"                 unit="mol/m2/s"                     />
-       <field id="Ironsed"     description="Iron deposition from sediment"             unit="mol/m2/s"  axis_ref="deptht"  />
+       <field id="Irondep"     description="Iron deposition"                          unit="mol/m2/s"                     />
+       <field id="FNO3PHY"     description="FNO3PHY"                                  unit="-"          axis_ref="deptht" />
+       <field id="FNH4PHY"     description="FNH4PHY"                                  unit="-"          axis_ref="deptht" />
+       <field id="FNH4NO3"     description="FNH4NO3"                                  unit="-"          axis_ref="deptht" />
+       <field id="TNO3PHY"     description="TNO3PHY"                                  unit="-"  />
+       <field id="TNH4PHY"     description="TNH4PHY"                                  unit="-"  />
+       <field id="TPHYDOM"     description="TPHYDOM"                                  unit="-"  />
+       <field id="TPHYNH4"     description="TPHYNH4"                                  unit="-"  />
+       <field id="TPHYZOO"     description="TPHYZOO"                                  unit="-"  />
+       <field id="TPHYDET"     description="TPHYDET"                                  unit="-"  />
+       <field id="TDETZOO"     description="TDETZOO"                                  unit="-"  />
+       <field id="TDETSED"     description="TDETSED"                                  unit="-"  />
+       <field id="TZOODET"     description="TZOODET"                                  unit="-"  />
+       <field id="TZOOBOD"     description="TZOOBOD"                                  unit="-"  />
+       <field id="TZOONH4"     description="TZOONH4"                                  unit="-"  />
+       <field id="TZOODOM"     description="TZOODOM"                                  unit="-"  />
+       <field id="TNH4NO3"     description="TNH4NO3"                                  unit="-"  />
+       <field id="TDOMNH4"     description="TDOMNH4"                                  unit="-"  />
+       <field id="TDETNH4"     description="TDETNH4"                                  unit="-"  />
+       <field id="TPHYTOT"     description="TPHYTOT"                                  unit="-"  />
+       <field id="TZOOTOT"     description="TZOOTOT"                                  unit="-"  />
+       <field id="TDETDOM"     description="TDETDOM"                                  unit="-"  />
+       <field id="SEDPOC"      description="SEDPOC"                                   unit="-"  />
      </group>
        
@@ -924,4 +970,5 @@
       <axis id="depthv" description="Vertical V levels" unit="m" positive=".false." />
       <axis id="depthw" description="Vertical W levels" unit="m" positive=".false." />
+      <axis id="nfloat" description="Number of float"   unit="no unit" positive=".false." />
       <axis id="none" description="axe non defini" unit="none" size="1" />
     </axis_definition> 
@@ -1098,6 +1145,5 @@
 
     </grid_definition>    
-    
-</context>
-
+  </context>
+    
 </simulation>
Index: branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/param.cfg
===================================================================
--- branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/param.cfg	(revision 3649)
+++ branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/param.cfg	(revision 3651)
@@ -1,4 +1,4 @@
 #- forcing files storing 
-FORCING_DIR=~/FORCING
+FORCING_DIR=/data/rd_exchange/cbricaud/NEMO_3.4_dev2012/FORCING
 #- input files storing 
 INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
Index: branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/prepare_job.sh
===================================================================
--- branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/prepare_job.sh	(revision 3649)
+++ branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/prepare_job.sh	(revision 3651)
@@ -11,9 +11,9 @@
 # prepare_job.sh   : creates the job script for running job 
 ######################################################
-#set -vx
+#set -x
 set -o posix
 #set -u
 #set -e
-#+
+#
 #
 # ================
@@ -30,5 +30,5 @@
 # ::
 #
-#  $ ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE
+#  $ ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_INTERACT MPI_FLAG
 #
 #
@@ -36,7 +36,14 @@
 # ===========
 #
-# Part of the SETTE package to run tests for NEMO
+# Simple job for SET TESTS for NEMO (SETTE)
 # 
-# prepare the script $JOB_FILE to run the tests 
+#   get input files (if needed) : tar file  
+#  (note this job needs to have an input_CONFIG.cfg in which can be found input tar file name)
+#
+#   runs job in interactive or batch mode : all jobs using 1 process are run interactive, and all MPP jobs are
+#
+#   run in batch (MPI_INTERACT="no") or interactive (MPI_INTERACT="yes") see sette.sh and BATCH_TEMPLATE directory
+#
+#   and call post_test_tidyup function (that moves in NEMO_VALIDATION_DIR solver.stat, tracer.stat (for LOBSTER & PISCES) & ocean.output)
 #
 # EXAMPLES
@@ -45,7 +52,11 @@
 # ::
 #
-#  $ ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG $JOB_FILE
-#
-# prepare the $JOB_FILE for execution 
+#  $ ./fcm_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_INTERACT MPI_FLAG
+#
+#  run a job of config GYRE with 1 processor SHORT test ( 5 days ) using an interactive run without mpirun
+#  $ ./fcm_job.sh input_GYRE.cfg 1 SHORT yes no
+#
+#  run a job of config ORCA2_LIM_PISCES	with 8 processors test RESTARTABILITY submitting the job to the batch queue system and using mpirun
+#  $ ./fcm_job.sh input_ORCA2_LIM_PISCES.cfg 8 LONG no yes
 #
 #
@@ -59,5 +70,5 @@
 # ==========
 #
-# $Id: prepare_job.sh 3050 2011-11-07 14:11:34Z acc $
+# $Id: fcm_job.sh 3050 2011-11-07 14:11:34Z acc $
 #
 #
@@ -68,6 +79,6 @@
 #
 
-usage=" Usage : ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE"
-usage=" example : ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes $JOB_FILE"
+usage=" Usage : ./fcm_job.sh input_CONFIG_NAME.cfg  NUMBER_OF_PROCS TEST_NAME INTERACT MPI_FLAG"
+usage=" example : ./fcm_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes no/yes"
 
 
@@ -75,6 +86,6 @@
         if [ ${#} -lt ${minargcount} ]
         then
-                echo "not enough arguments for prepare_job.sh script"
-                echo "control number of argument of prepare_job.sh in sette.sh"
+                echo "not enought arguments for fcm_job.sh script"
+                echo "control number of argument of fcm_job.sh in sette.sh"
                 echo "${usage}"
         exit 1
@@ -159,8 +170,31 @@
     exit 1
 fi
-
+#if [ ${NB_PROC} == 1 ] ; then
+#    echo "running opa" >> ${SETTE_DIR}/output.sette
+#    echo "            " >> ${SETTE_DIR}/output.sette
+#    ./opa
+#
+# Tidy out output from this test and populate the NEMO_VALIDATION_DIR tree
+#
+#    post_test_tidyup
+#else
+#    echo "running opa in MPI" >> ${SETTE_DIR}/output.sette
+#    echo "            " >> ${SETTE_DIR}/output.sette
+
+#    if [ ${MPI_INTERACT} == "yes" ] ; then
+#	#
+#	# example for brodie (NEC SX8) machine
+#	#	mpirun -np ${NB_PROC} opa
+#	# example for dedale machine
+#	#	mpirun --mca btl self,tcp -np ${NB_PROC} opa
+#	# example for vargas (IBM Power6) machine
+#	mpiexec -n ${NB_PROC} opa
+#	#
+#	post_test_tidyup
+#    fi
+#
 # example for NOCS Altix system using PBS batch submission (requires ${SETTE_DIR}/sette_batch_template file)
 #
-  #  if [ ${MPI_FLAG} == "no" ] ; then
+  #  if [ ${MPI_INTERACT} == "no" ] ; then
 		case ${COMPILER} in 
 			ALTIX_NAUTILUS_MPT)
@@ -169,5 +203,5 @@
 					# number of processes required is an integer multiple of 4
 					#
-					NB_NODES=$( echo $NB_PROC | awk '{print $1 / 4}')
+					NB_NODES=$( echo $NB_PROC | awk '{print $1  $1 / 4}')
 				else
 					#
@@ -178,4 +212,27 @@
 	       			fi
 				;;
+                        ifort_MERCATOR_CLUSTER)
+                                echo NB_PROCS ${NB_PROC}
+                                echo NB_NODES ${NB_NODES}
+                                echo  NB_PROC ${NB_PROC} 
+                                if [ ${NB_PROC} -eq 1 ] ; then
+                                   NB_NODES=1
+                                   QUEUE=monoproc
+                                   NB_PROC_NODE=${NB_PROC} 
+                                else
+                                   if [ ${NB_PROC} -le 8 ] ; then 
+                                      NB_NODES=1
+                                      QUEUE=mono
+                                      NB_PROC_NODE=${NB_PROC} 
+                                   else
+                                      NB_NODES=$( echo $NB_PROC | awk '{print $1 - $1 % 8}'  | awk '{print $1 / 8 }')
+                                      QUEUE=multi
+                                      NB_PROC_NODE=8
+                                  fi    
+                                fi    
+                                echo NB_PROCS     ${NB_PROC}
+                                echo NB_NODES     ${NB_NODES}
+                                echo NB_PROC_NODE ${NB_PROC_NODE} 
+				;;
 			*)
 				NB_NODES=${NB_PROC}
@@ -186,5 +243,10 @@
 # Pass settings into job file by using sed to edit predefined strings
 #
-        cat ${SETTE_DIR}/job_batch_template | sed -e"s/NODES/${NB_NODES}/" -e"s/NPROCS/${NB_PROC}/" \
+         ((mem=5*NB_PROC))
+         echo NB_NODES NB_PROC QUEUE ${NB_NODES} ${NB_PROC} ${QUEUE}
+        cat ${SETTE_DIR}/job_batch_template | sed -e"s/NODES/${NB_NODES}/" -e"s/NPROCSNODE/${NB_PROC_NODE}/" \
+             -e"s/NPROCS/${NB_PROC}/" \
+             -e"s/QUEUE/${QUEUE}/" -e"s/MEM/${mem}/" \
+             -e"s/QUEUE/${QUEUE}/" -e"s/MEM/${mem}/" \
              -e"s:DEF_SETTE_DIR:${SETTE_DIR}:" -e"s:DEF_INPUT_DIR:${INPUT_DIR}:" \
              -e"s:DEF_EXE_DIR:${EXE_DIR}:" \
@@ -210,5 +272,5 @@
 	fi
 	
-	chmod a+x $JOB_FILE ; echo "$JOB_FILE is ready"
+	chmod a+x $JOB_FILE
 
 #fi
Index: branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/sette.sh
===================================================================
--- branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/sette.sh	(revision 3649)
+++ branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/SETTE/sette.sh	(revision 3651)
@@ -129,6 +129,6 @@
 #-
 # Compiler among those in NEMOGCM/ARCH
-COMPILER=PW6_VARGAS
-export BATCH_COMMAND_PAR="llsubmit"
+COMPILER=ifort_MERCATOR_CLUSTER 
+export BATCH_COMMAND_PAR="qsub"
 export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR
 export INTERACT_FLAG="no"
@@ -147,5 +147,5 @@
 cp BATCH_TEMPLATE/batch-${COMPILER} job_batch_template || exit
 
-for config in 1 2 3 4 5 6 7 8 9
+for config in 1 2 3 4 5 6 7 8
 do
 
@@ -539,5 +539,5 @@
     export TEST_NAME="LONG"
     cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -m ${CMP_NAM} -n AMM12_LONG -r AMM12 
+    . ../CONFIG/makenemo -m ${CMP_NAM} -n AMM12_LONG -r AMM12  add_key "key_tide"
     cd ${SETTE_DIR}
     . param.cfg
@@ -594,5 +594,5 @@
     export TEST_NAME="REPO_8_4"
     cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -m ${CMP_NAM} -n AMM12_32 -r AMM12 add_key "key_mpp_rep"
+    . ../CONFIG/makenemo -m ${CMP_NAM} -n AMM12_32 -r AMM12 add_key "key_mpp_rep key_tide"
     cd ${SETTE_DIR}
     . param.cfg
