Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/lmdz.driver
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/lmdz.driver	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/lmdz.driver	(revision 3969)
@@ -159,4 +159,42 @@
     IGCM_comp_modifyDefFile nonblocker config.def solaire $value
 
+    # Read value for eccentricity from file Eccentricity.txt. If file not existing, take DEFAULT value from file.
+    if [ -f Eccentricity.txt ] ; then
+	value=`grep Annee_${year} Eccentricity.txt | awk -F= '{print $2}'`
+	if [ X"${value}" = X ] ; then
+	    # The grep returned empty variable, stop execution
+	    IGCM_debug_Exit "The file Eccentricity.txt do not contain the current year."
+	    IGCM_debug_Verif_Exit
+	fi
+    else
+	value=DEFAULT
+    fi
+    IGCM_comp_modifyDefFile nonblocker config.def R_ecc $value
+
+    # Read value for obliquity from file Obliquity.txt. If file not existing, take DEFAULT value from file.
+    if [ -f Obliquity.txt ] ; then
+	value=`grep Annee_${year} Obliquity.txt | awk -F= '{print $2}'`
+	if [ X"${value}" = X ] ; then
+	    # The grep returned empty variable, stop execution
+	    IGCM_debug_Exit "The file Obliquity.txt do not contain the current year."
+	    IGCM_debug_Verif_Exit
+	fi
+    else
+	value=DEFAULT
+    fi
+    IGCM_comp_modifyDefFile nonblocker config.def R_incl $value
+
+    # Read value for perihelie from file Perihelie.txt. If file not existing, take DEFAULT value from file.
+    if [ -f Perihelie.txt ] ; then
+	value=`grep Annee_${year} Perihelie.txt | awk -F= '{print $2}'`
+	if [ X"${value}" = X ] ; then
+	    # The grep returned empty variable, stop execution
+	    IGCM_debug_Exit "The file Perihelie.txt do not contain the current year."
+	    IGCM_debug_Verif_Exit
+	fi
+    else
+	value=DEFAULT
+    fi
+    IGCM_comp_modifyDefFile nonblocker config.def R_peri $value
 
     # Read value for co2_ppm from file CO2.txt. If file not existing, take DEFAULT value from file. 
@@ -349,5 +387,5 @@
     else
 	echo "LMDZ is running in forced mode without ocean model, set type_ocean=force in run.def"
-	IGCM_comp_modifyDefFile blocker run.def type_ocean force
+	IGCM_comp_modifyDefFile nonblocker run.def type_ocean force
     fi
 
@@ -401,4 +439,11 @@
     fi 
 
+    # config.def : Activate online Ozone chemistry coupled model if chemistry_couple=y
+    if [ ! X${lmdz_UserChoices_chemistry_couple} = X ]; then 
+	IGCM_comp_modifyDefFile nonblocker config.def chemistry_couple ${lmdz_UserChoices_chemistry_couple}
+    else
+	IGCM_comp_modifyDefFile nonblocker config.def chemistry_couple n
+    fi 
+
     # config.def : Activate reading of ozone in climatology if read_climoz=2
     if [ ! X${lmdz_UserChoices_read_climoz} = X ]; then 
@@ -439,4 +484,13 @@
     fi 
 
+    # physiq.def : Modify parameter tau_gl if it is set in lmdz.card
+    if [ ! X${lmdz_UserChoices_tau_gl} = X ]; then 
+	IGCM_comp_modifyDefFile nonblocker physiq.def tau_gl ${lmdz_UserChoices_tau_gl}
+    else
+	# Take default value set in physiq.def
+	IGCM_comp_modifyDefFile nonblocker config.def tau_gl DEFAULT
+    fi
+   
+
     # guide.def : Activate nudging if ok_guide=y set in lmdz.card
     if [ ! X${lmdz_UserChoices_ok_guide} = X ] ; then
@@ -445,4 +499,5 @@
 	IGCM_comp_modifyDefFile nonblocker guide.def ok_guide n
     fi
+
 
     ## Read ByPass_hgardfou_teta option in lmdz.card --> divide teta* by 2 if [ $ByPass_hgardfou_teta = 1 ]
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/oasis.driver
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/oasis.driver	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/oasis.driver	(revision 3969)
@@ -25,4 +25,7 @@
 	esac
     done
+
+    # Initialisation required for AddNoise done during one Period
+    Test_AddNoise_First_Only=y
 
     IGCM_debug_PopStack "CPL_Initialize"
@@ -99,4 +102,39 @@
     IGCM_comp_modifyXmlFile force iodef.xml using_oasis NONE true
 
+    if [ X"${Test_AddNoise_First_Only}" = X"y" ]; then
+
+    Test_AddNoise_First_Only=n
+
+    # AddNoise if required but only for one Period
+
+    # Read ByPass_addnoise_sst option in oasis.card --> apply addnoise for sst in CPL restart file if [ $ByPass_addnoise_sst = y ]
+    ByPass_addnoise_sst=${oasis_UserChoices_ByPass_addnoise_sst}
+    if [ X"${ByPass_addnoise_sst}" = X"y" ] ; then
+      
+      ByPass_PerturbExe=${oasis_UserChoices_ByPass_PerturbExe}
+      ByPass_FileOut=${oasis_UserChoices_ByPass_FileOut}
+      ByPass_PerturbVar=${oasis_UserChoices_ByPass_PerturbVar}
+      ByPass_PerturbAmp=${oasis_UserChoices_ByPass_PerturbAmp}
+
+      IGCM_sys_Chmod 644 ${RUN_DIR}/${ByPass_FileOut}.nc
+      IGCM_debug_Print 1 "${ByPass_PerturbExe} ${RUN_DIR}/${ByPass_FileOut}.nc ${ByPass_PerturbVar} ${ByPass_PerturbAmp}"
+
+      ${ByPass_PerturbExe} ${RUN_DIR}/${ByPass_FileOut}.nc ${ByPass_PerturbVar} ${ByPass_PerturbAmp} 
+      if [ $? -ne 0 ] ; then
+        IGCM_debug_Exit "Error with $( basename ${ByPass_PerturbExe} )"
+        IGCM_debug_Verif_Exit
+      fi
+
+      echo
+      IGCM_debug_Print 1 "ByPass_addnoise_sst : applied addnoise for sst in CPL restart file"
+      echo
+      ByPass_addnoise_sst=n
+      # necessary to reset ByPass in next Period during the same Job (PeriodNb<>1)
+      export oasis_UserChoicesByPass_addnoise_sst=n
+      IGCM_card_WriteOption ${SUBMIT_DIR}/COMP/oasis.card UserChoices ByPass_addnoise_sst "${ByPass_addnoise_sst}"
+    fi
+
+    fi
+
     IGCM_debug_PopStack "CPL_Update"
 }
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/opa9.driver
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/opa9.driver	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/opa9.driver	(revision 3969)
@@ -69,12 +69,4 @@
     fi
 
-    if [[ ${opa9_UserChoices_TimeOrigin} -gt ${InitYear} ]] ; then
-        echo
-        echo
-        IGCM_debug_Exit "TimeOrigin=${opa9_UserChoices_TimeOrigin} is greater than initial year=${InitYear}. IT MUST BE LOWER ! Change this value in opa9.card"
-        IGCM_debug_Verif_Exit
-    fi
-
-    
     IGCM_debug_PopStack "OCE_Initialize"
    
@@ -126,6 +118,7 @@
       OPA_NRSTDT=2
       #echo "OPA RESTART"
-      IGCM_debug_Print 1 'WARNING : dangerous option'
+      IGCM_debug_Print 1 'WARNING : dangerous option for NEMO opa9 pisces lim3'
       IGCM_debug_Print 1 'Reproducibility_after_Restart forced ie kt forced to kt red in restart file : ' ${opa9_UserChoices_Reproducibility_after_restart}
+
     elif ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_OCE_Restart}" = "n" ] ) ; then
       OPA_LRSTAR=.FALSE.
@@ -166,5 +159,32 @@
 
     if ( [ "${opa9_UserChoices_Reproducibility_after_restart}" = "y" ] ) ; then
-      NEMO_KT_FROM_RESTART=$(ncdump -v kt restartopa_0000.nc|grep 'kt ='|awk '{print $3}' )
+      ##-- choose the right restart file
+      NEMO_RESTART_FILE=restartopa.nc
+      [ -f restartopa_0000.nc ] && NEMO_RESTART_FILE=restartopa_0000.nc
+      ##-- Getting from restart file the last time step of the run at which we want to re-start
+      NEMO_KT_FROM_RESTART=$(ncdump -v kt ${NEMO_RESTART_FILE}|grep 'kt ='|awk '{print $3}' )
+
+      if ( [ "${CumulPeriod}" -eq 1 ] ) ; then
+        ## Force the date in the restart file to be the last day before the begining of the new run
+        dateendprevious=$( IGCM_date_AddDaysToGregorianDate ${DateBegin} -1 )
+        IGCM_debug_Print 1 "Previous Date  ${dateendprevious}"
+        IGCM_debug_Print 1 "cmd done to modify NEMO restartfile:   ncap2 -s ndastp=${dateendprevious} ${NEMO_RESTART_FILE}  tmp.nc"
+	if [ -f restartopa_0000.nc ] ; then
+           typeset -Z4 ncpu=0
+           while [ $ncpu -lt ${OCE_PROC_MPI} ] ; do
+              ncap2 -s "ndastp=${dateendprevious}" restartopa_${ncpu}.nc  tmp.nc
+              mv tmp.nc restartopa_${ncpu}.nc
+              (( ncpu = ncpu + 1 ))
+           done
+        else
+           ncap2 -s "ndastp=${dateendprevious}" ${NEMO_RESTART_FILE}  tmp.nc
+           mv tmp.nc ${NEMO_RESTART_FILE}
+        fi
+        ##-- Getting from restart file the "new" restart date of run at which we want to re-start
+        NEMO_NDASTP_FROM_RESTART=$(ncdump -v ndastp ${NEMO_RESTART_FILE}|grep 'ndastp ='|awk '{print $3}' )
+        IGCM_debug_Print 1 "NEMO_NDASTP (from Restart) for 1st Period       : ${NEMO_NDASTP_FROM_RESTART}"
+
+      fi
+
       (( NEMO_NIT000 = NEMO_KT_FROM_RESTART + 1 ))
       (( NEMO_NITEND = NEMO_KT_FROM_RESTART + OPA_NITEND - OPA_NIT000 + 1 ))
@@ -208,8 +228,8 @@
 
 
-    IGCM_comp_modifyXmlFile force context_nemo.xml ref_year NONE ${opa9_UserChoices_TimeOrigin}
+    IGCM_comp_modifyXmlFile force context_nemo.xml ref_year NONE ${InitYear} 
 	
  
-    # vargas/titane/MPP and switch from 1 proc to 5 procs. We need to suppres restartopa the second month, if restartopa_0000 exist
+    # for MPP and switch to different number of procs for NEMO.  We need to suppres restartopa the second period, if restartopa_0000 exist
     # same thing for restart_trc and restart_ice_in
 
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/orchidee.driver
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/orchidee.driver	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/orchidee.driver	(revision 3969)
@@ -59,4 +59,21 @@
     else
         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y
+    fi
+
+    # Set LAI_MAP in orchidee.def acording to value set in orchidee.card section UserChoices
+    # If LAI_MAP is not definded in orchidee.card, set default value n
+    # Note: this option is only read by ORCHIDEE if starting without restart files
+    if [ ! X${orchidee_UserChoices_LAI_MAP} = X ] ; then
+        IGCM_comp_modifyDefFile nonblocker orchidee.def LAI_MAP   ${orchidee_UserChoices_LAI_MAP}
+    else
+        IGCM_comp_modifyDefFile nonblocker orchidee.def LAI_MAP   DEFAULT
+    fi
+
+    # Set DO_WOOD_HARVEST in orchidee.def acording to value set in orchidee.card section UserChoices
+    # If DO_WOOD_HARVEST is not definded in orchidee.card, set default value y
+    if [ ! X${orchidee_UserChoices_DO_WOOD_HARVEST} = X ] ; then
+        IGCM_comp_modifyDefFile nonblocker orchidee.def DO_WOOD_HARVEST   ${orchidee_UserChoices_DO_WOOD_HARVEST}
+    else
+        IGCM_comp_modifyDefFile nonblocker orchidee.def DO_WOOD_HARVEST   DEFAULT
     fi
 
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/pisces.driver
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/pisces.driver	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/pisces.driver	(revision 3969)
@@ -43,5 +43,12 @@
 
     ##-- Restart configuration
-    if ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_MBG_Restart}" = "n" ] ) ; then
+    ##-- Restart configuration
+    if ( [ "${opa9_UserChoices_Reproducibility_after_restart}" = "y" ] ) ; then
+        TOP_LN_RSTR=.TRUE.
+        TOP_NN_RSTR=2
+        IGCM_debug_Print 1 'WARNING : dangerous option for NEMO pisces too'
+        IGCM_debug_Print 1 'Reproducibility_after_Restart forced : ' ${opa9_UserChoices_Reproducibility_after_restart}
+
+    elif ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_MBG_Restart}" = "n" ] ) ; then
 
         #echo "NO RESTART FOR TOP"
@@ -56,7 +63,8 @@
 
         # If we start from IPSLCM5* restart files.
-	for file in restart_trc*.nc ; do
+	    for file in restart_trc*.nc ; do
+            IGCM_debug_Print 1 "cmd done to modify IPSLCM5* NEMO pisces restartfile: " ncrename -v TRBDSi,TRBGSi -v TRNDSi,TRNGSi -v TRNBSi,TRNDSi -v TRBBSi,TRBDSi ${file} > /dev/null 2>&1
             ncrename -v TRBDSi,TRBGSi -v TRNDSi,TRNGSi -v TRNBSi,TRNDSi -v TRBBSi,TRBDSi ${file} > /dev/null 2>&1
-	done
+	    done
 
     else
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/xios.driver
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/xios.driver	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/DRIVER/xios.driver	(revision 3969)
@@ -19,4 +19,9 @@
     IGCM_comp_modifyXmlFile force iodef.xml using_server NONE true
 
+# Activate 2nd server level for CMIP6 type experiments (CMIP6 workflow)
+    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
+    IGCM_comp_modifyXmlFile force iodef.xml using_server2 NONE true
+    fi
+
     if [ -f namcouple ] ; then
 	sed -e "s/2  LMDZ oceanx/3 LMDZ oceanx ${config_Executable_IOS[1]}/" namcouple > namcouple.tmp 
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/config.def_actuel
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/config.def_actuel	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/config.def_actuel	(revision 3969)
@@ -1,4 +1,4 @@
 ##  Cycle diurne  ou non                 
-cycle_diurne=y
+iflag_cycle_diurne=1
 ##  Soil Model  ou non               
 soil_model=y
@@ -15,13 +15,14 @@
 # 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
+### R_ecc =      Excentricite (lue dans Eccentricity.txt)
+R_ecc = _AUTO_: DEFAULT = 0.016715
+### R_peri =     Equinoxe (lue dans Perihelie.txt)
+R_peri = _AUTO_: DEFAULT = 102.7
+### R_incl =     Inclinaison (lue dans Obliquity.txt)
+R_incl = _AUTO_: DEFAULT = 23.441
 ### solaire =    Constante solaire
 #solaire = _AUTO_ : DEFAULT = 1366.0896
 solaire = _AUTO_ : DEFAULT = 1361.20 
+# solaire est modifie avec les valeurs du fichier SOLARANDVOLCANOES.txt
 ### constante solaire lue dans un fichier par defaut
 ok_suntime_rrtm=y
@@ -52,4 +53,6 @@
 ### aerosol coupling = online (y) or offline (n)
 aerosol_couple=_AUTO_
+### Ozone chemistry coupling = online (y) or offline (n)
+chemistry_couple=_AUTO_
 ###  flag_aerosol = type of coupled aerosol, if aerosol offline 
 ###  0 => no aerosol, 1 => sulfate only, 2 => bc only, 3 => pom only, 4 => seasalt only, 5 => dust only, 6 => all aerosol
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/config.def_annuel
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/config.def_annuel	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/config.def_annuel	(revision 3969)
@@ -1,4 +1,4 @@
 ##  Cycle diurne  ou non                 
-cycle_diurne=y
+iflag_cycle_diurne=1
 ##  Soil Model  ou non               
 soil_model=y
@@ -15,10 +15,10 @@
 # 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
+### R_ecc =      Excentricite (lue dans Eccentricity.txt)
+R_ecc = _AUTO_: DEFAULT = 0.016715
+### R_peri =     Equinoxe (lue dans Perihelie.txt)
+R_peri = _AUTO_: DEFAULT = 102.7
+### R_incl =     Inclinaison (lue dans Obliquity.txt)
+R_incl = _AUTO_: DEFAULT = 23.441
 ### solaire =    Constante solaire
 # solaire est modifie avec les valeurs du fichier SOLARANDVOLCANOES.txt
@@ -53,4 +53,6 @@
 ### aerosol coupling = online (y) or offline (n)
 aerosol_couple=_AUTO_
+### Ozone chemistry coupling = online (y) or offline (n)
+chemistry_couple=_AUTO_
 ###  flag_aerosol = type of coupled aerosol, if aerosol offline 
 ###  0 => no aerosol, 1 => sulfate only, 2 => bc only, 3 => pom only, 4 => seasalt only, 5 => dust only, 6 => all aerosol
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/config.def_preind
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/config.def_preind	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/config.def_preind	(revision 3969)
@@ -1,4 +1,4 @@
 ##  Cycle diurne  ou non                 
-cycle_diurne=y
+iflag_cycle_diurne=1
 
 ## Pas de temps de couplage (s). 
@@ -17,11 +17,11 @@
 # 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
+### R_ecc =      Excentricite (lue dans Eccentricity.txt)
+R_ecc = _AUTO_: DEFAULT = 0.016715
+### R_peri =     Equinoxe (lue dans Perihelie.txt)
+R_peri = _AUTO_: DEFAULT = 102.7
+### R_incl =     Inclinaison (lue dans Obliquity.txt)
+R_incl = _AUTO_: DEFAULT = 23.441
+### solaire =    Constante solaire (lue dans SOLARANDVOLCANOES.txt)
 solaire = _AUTO_: DEFAULT = 1361.20
 ### constante solaire lue dans un fichier par defaut
@@ -53,4 +53,6 @@
 ### aerosol coupling = online (y) or offline (n)
 aerosol_couple=_AUTO_
+### Ozone chemistry coupling = online (y) or offline (n)
+chemistry_couple=_AUTO_
 ###  flag_aerosol = type of coupled aerosol, if aerosol offline 
 ###  0 => no aerosol, 1 => sulfate only, 2 => bc only, 3 => pom only, 4 => seasalt only, 5 => dust only, 6 => all aerosol
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-lim2.xml
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-lim2.xml	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-lim2.xml	(revision 3969)
@@ -10,5 +10,5 @@
   -->
     
-    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="0" >
+    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
     
       <file_group id="1ts_lim" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-lim3.xml
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-lim3.xml	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-lim3.xml	(revision 3969)
@@ -10,5 +10,5 @@
   -->
     
-    <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1d" min_digits="4" compression_level="0" >
+    <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1d" min_digits="4" compression_level="4" >
     
       <file_group id="1ts_lim" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-opa.xml
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-opa.xml	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-opa.xml	(revision 3969)
@@ -9,5 +9,5 @@
     -->
    
-    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="0" >
+    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
     
       <file_group id="1ts_opa" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
@@ -396,10 +396,5 @@
         </file>
 
-	<file id="file9" name_suffix="_diaptr" description="diaptr variables"  >
-	  <field field_ref="zomsfglo"          name="zomsfglo"  grid_ref="grid_ptr_W_3D" level="1" />
-          <field field_ref="zomsfatl"          name="zomsfatl"  grid_ref="grid_ptr_W_3D" level="1" />
-          <field field_ref="zomsfpac"          name="zomsfpac"  grid_ref="grid_ptr_W_3D" level="1" />
-          <field field_ref="zomsfind"          name="zomsfind"  grid_ref="grid_ptr_W_3D" level="1" />
-          <field field_ref="zomsfipc"          name="zomsfipc"  grid_ref="grid_ptr_W_3D" level="1" />
+	<file id="file9" name_suffix="_diaptr_T" description="diaptr variables"  >
           <field field_ref="zotemglo"          name="zotemglo"  grid_ref="grid_ptr_T_3D" level="2" />
           <field field_ref="zotematl"          name="zotematl"  grid_ref="grid_ptr_T_3D" level="2" />
@@ -422,4 +417,13 @@
           <field field_ref="sopstldf"          name="sopstldf"  grid_ref="grid_ptr_T_2D" level="2" />
         </file>
+
+	<file id="file33" name_suffix="_diaptr_W" description="diaptr variables"  >
+	  <field field_ref="zomsfglo"          name="zomsfglo"  grid_ref="grid_ptr_W_3D" level="1" />
+          <field field_ref="zomsfatl"          name="zomsfatl"  grid_ref="grid_ptr_W_3D" level="1" />
+          <field field_ref="zomsfpac"          name="zomsfpac"  grid_ref="grid_ptr_W_3D" level="1" />
+          <field field_ref="zomsfind"          name="zomsfind"  grid_ref="grid_ptr_W_3D" level="1" />
+          <field field_ref="zomsfipc"          name="zomsfipc"  grid_ref="grid_ptr_W_3D" level="1" />
+        </file>
+
 
 
@@ -537,18 +541,21 @@
 	</file>
 	
-	<file id="file14" name_suffix="_diaptr" description="diaptr variables" >
+	<file id="file14" name_suffix="_diaptr_T" description="diaptr variables" >
 	  <field field_ref="zotemglo" grid_ref="grid_ptr_T_3D" level="2"   />
 	  <field field_ref="zosalglo" grid_ref="grid_ptr_T_3D" level="2"   />
 	  <field field_ref="zosrfglo" grid_ref="grid_ptr_T_3D" level="2"   />
-	  <field field_ref="zomsfglo" grid_ref="grid_ptr_W_3D" level="2"   />
 	  <field field_ref="zotematl" grid_ref="grid_ptr_T_3D" level="2"   />
 	  <field field_ref="zosalatl" grid_ref="grid_ptr_T_3D" level="2"   />
 	  <field field_ref="zosrfatl" grid_ref="grid_ptr_T_3D" level="2"   />
-	  <field field_ref="zomsfatl" grid_ref="grid_ptr_W_3D" level="2"   />
 	  <field field_ref="zotempac" grid_ref="grid_ptr_T_3D" level="2"    />
 	  <field field_ref="zosalpac" grid_ref="grid_ptr_T_3D" level="2"   />
 	  <field field_ref="zosrfpac" grid_ref="grid_ptr_T_3D" level="2"   />
-	  
 	</file>   
+
+	<file id="file34" name_suffix="_diaptr_W" description="diaptr variables" >
+	  <field field_ref="zomsfglo" grid_ref="grid_ptr_W_3D" level="2"   />
+	  <field field_ref="zomsfatl" grid_ref="grid_ptr_W_3D" level="2"   />
+	</file>   
+
 
         <file id="file32" name_suffix="_trdtra" description="ocean trends variables" >
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-pisces.xml
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-pisces.xml	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/file_def_nemo-pisces.xml	(revision 3969)
@@ -10,5 +10,5 @@
     -->
     
-    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="0" >
+    <file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4" compression_level="4" >
     
       <file_group id="1ts_pis" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
@@ -211,7 +211,17 @@
         </file>
 
-       <file id="file23" name_suffix="_age" description="Age inert tracer" >
-          <field field_ref="Age"       name="Age"      operation="average" freq_op="1y"  level="1"  > @Age_E3T / @e3t </field>
-       </file>
+       <file id="file23" name_suffix="_inerttrc" description="Inert tracer" >
+          <field field_ref="Age"         name="Age"      operation="average" freq_op="1y" level="1"  > @Age_E3T / @e3t </field>
+          <field field_ref="CFC11"       name="CFC11"    operation="average" freq_op="1y" level="2"  > @CFC11_E3T / @e3t </field>
+          <field field_ref="CFC12"       name="CFC12"    operation="average" freq_op="1y" level="1"  > @CFC12_E3T / @e3t </field>
+          <field field_ref="SF6"         name="SF6"      operation="average" freq_op="1y" level="2"  > @SF6_E3T / @e3t </field>
+          <field field_ref="qtr_CFC11"   name="qtrCFC11"  level="2"   />
+          <field field_ref="qint_CFC11"  name="qintCFC11" level="2"   />
+          <field field_ref="qtr_CFC12"   name="qtrCFC12"  level="1"   />
+          <field field_ref="qint_CFC12"  name="qintCFC12" level="1"   />
+          <field field_ref="qtr_SF6"     name="qtrSF6"    level="2"   />
+          <field field_ref="qint_SF6"    name="qintSF6"   level="2"   />
+      </file>
+
 
       </file_group>
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/iodef.xml
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/iodef.xml	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/iodef.xml	(revision 3969)
@@ -15,5 +15,5 @@
     <variable_definition>
          <variable_group id="server">
-            <variable id="using_server2" type="bool">true</variable>
+            <variable id="using_server2" type="bool">false</variable>
             <variable id="ratio_server2" type="int">50</variable>
          </variable_group>
@@ -26,5 +26,5 @@
 
         <variable_group id="parameters" >
-          <variable id="using_server" type="bool">true</variable>
+          <variable id="using_server" type="bool">false</variable>
           <variable id="info_level" type="int">1</variable>
           <variable id="print_file" type="bool">false</variable>
@@ -33,4 +33,5 @@
         </variable_group>
       <variable id="activate_non_distributed_transformation" type="bool">true</variable>
+      <variable id="recv_field_timeout" type="double">3000.0</variable>
     </variable_definition>
 
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/namelist_ORCA1_cfg
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/namelist_ORCA1_cfg	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/namelist_ORCA1_cfg	(revision 3969)
@@ -290,8 +290,4 @@
 !-----------------------------------------------------------------------
 /
-!-----------------------------------------------------------------------
-&namtra_adv_mle !  mixed layer eddy parametrisation (Fox-Kemper param)
-!-----------------------------------------------------------------------
-/
 !----------------------------------------------------------------------------------
 &namtra_ldf    !   lateral diffusion scheme for tracers
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/namelist_cfc_cfg
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/namelist_cfc_cfg	(revision 3969)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/namelist_cfc_cfg	(revision 3969)
@@ -0,0 +1,11 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! CFC  : ORCA2_LIM_CFC_C14b configuration namelsit used to overwrite SHARED/namelist_cfc_ref
+!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&namcfcdate     !   dates
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&namcfcdia     !   additional 2D/3D tracers diagnostics 
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/orchidee.def_CWRR
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/orchidee.def_CWRR	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/orchidee.def_CWRR	(revision 3969)
@@ -80,7 +80,7 @@
 NVM=15
 PFT_TO_MTC=1,2,3,4,5,6,7,8,9,10,11,12,13,10,10
-NAME__10='temperate C3           grass      '
-NAME__14='tropical  C3           grass      '
-NAME__15='boreal    C3           grass      '
+PFT_NAME__10='temperate C3           grass      '
+PFT_NAME__14='tropical  C3           grass      '
+PFT_NAME__15='boreal    C3           grass      '
 
 # STRESS_GS, STRESS_GM, STRESS_VCMAX : Stress on GS, GM and VCMAX
@@ -137,5 +137,5 @@
 
 # Activate harvest of wood
-DO_WOOD_HARVEST=y
+DO_WOOD_HARVEST=_AUTO_ : DEFAULT=y
 
 # Growth respiration (default values except for PFT=14 and PFT=15)
@@ -190,4 +190,6 @@
 VEGET_UPDATE = _AUTO_
 
+# Read lai map (default n)
+LAI_MAP = _AUTO_ : DEFAULT = n
 
 # Parameters related to surface and thermal physical properties
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/orchidee.def_Choi
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/orchidee.def_Choi	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/orchidee.def_Choi	(revision 3969)
@@ -64,4 +64,7 @@
 NVM=15
 PFT_TO_MTC=1,2,3,4,5,6,7,8,9,10,11,12,13,10,10
+PFT_NAME__10='temperate C3           grass      '
+PFT_NAME__14='tropical  C3           grass      '
+PFT_NAME__15='boreal    C3           grass      '
 
 # Set NVM and PFT_TO_MTC as follow to run with PFTmap files containing 13 pfts
@@ -80,4 +83,6 @@
 VEGET_UPDATE = _AUTO_
 
+# Read lai map (default n)
+LAI_MAP = _AUTO_ : DEFAULT = n
 
 # Create river description file
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/physiq.def_NPv6.1
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/physiq.def_NPv6.1	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/physiq.def_NPv6.1	(revision 3969)
@@ -1,4 +1,4 @@
 #
-# $Id: physiq.def_NPv6.1 3668 2018-03-20 14:55:33Z lfairhead $
+# $Id: physiq.def_NPv6.1 3964 2018-07-06 11:44:14Z acosce $
 #
 
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/ping_LMDZ.xml
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/ping_LMDZ.xml	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/ping_LMDZ.xml	(revision 3969)
@@ -1,3 +1,3 @@
-<!-- $Id: CMIP6_ping_atmos.xml 3285 2018-03-19 10:16:35Z fairhead $ -->
+<!-- $Id: CMIP6_ping_atmos.xml 3353 2018-06-28 09:52:05Z fairhead $ -->
 <!-- Ping files generated by dr2xml 0.27 using Data Request 01.00.21 -->
 <!-- lrealms= ['atmos'] -->
@@ -57,5 +57,5 @@
    <field id="CMIP6_clcalipso2"    field_ref="clcalipso2"                   /> <!-- P1 (%) cloud_area_fraction_in_atmosphere_layer : CALIPSO Cloud Fraction Undetected by CloudSat --> 
    <field id="CMIP6_clcalipsoice"  field_ref="clcalipsoice"                 /> <!-- P1 (%) ice_cloud_area_fraction_in_atmosphere_layer : CALIPSO Ice Cloud Fraction -->
-   <field id="CMIP6_clcalipsoliq"  field_ref="clcalipsoice"                 /> <!-- P1 (%) liquid_cloud_area_fraction_in_atmosphere_layer : CALIPSO Liquid Cloud Fraction -->
+   <field id="CMIP6_clcalipsoliq"  field_ref="clcalipsoliq"                 /> <!-- P1 (%) liquid_cloud_area_fraction_in_atmosphere_layer : CALIPSO Liquid Cloud Fraction -->
    <field id="CMIP6_cldicemxrat"   field_ref="cldicemxrat"                  /> <!-- P2 (1) cloud_ice_mixing_ratio : Cloud Ice Mixing Ratio -->
    <field id="CMIP6_cldnci"        field_ref="dummy_XY"                     /> <!-- P1 (m-3) number_concentration_of_ice_crystals_in_air_at_ice_cloud_top : Ice Crystal Number Concentration of Cloud Tops -->
@@ -215,5 +215,5 @@
    <field id="CMIP6_reffsnowc"     field_ref="dummy_XYA"        /> <!-- P2 (m) effective_radius_of_convective_cloud_snow_particle : This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). -->
    <field id="CMIP6_reffsnows"     field_ref="dummy_XYA"        /> <!-- P2 (m) effective_radius_of_stratiform_cloud_snow_particle : This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). -->
-   <field id="CMIP6_rld"           field_ref="rld"              /> <!-- P1 (W m-2) downwelling_longwave_flux_in_air : Downwelling Longwave Radiation -->
+   <field id="CMIP6_rld"           field_ref="rld"> rld*(-1.)   </field> <!-- P1 (W m-2) downwelling_longwave_flux_in_air : Downwelling Longwave Radiation --> 
    <field id="CMIP6_rld4co2"       field_ref="rld4co2"          /> <!-- P1 (W m-2) downwelling_longwave_flux_in_air : Downwelling Longwave Radiation 4XCO2 Atmosphere --> 
    <field id="CMIP6_rldcs"         field_ref="rldcs"            /> <!-- P1 (W m-2) downwelling_longwave_flux_in_air_assuming_clear_sky : Downwelling Clear-Sky Longwave Radiation -->
@@ -360,5 +360,5 @@
    <field id="CMIP6_ygwdparam"     field_ref="west_gwstress"    /> <!-- P2 (Pa) atmosphere_northward_stress_due_to_gravity_wave_drag : y_gravity_wave_drag_param -->
    <field id="CMIP6_zfull"         field_ref="zfull"            /> <!-- P2 (m) height_above_reference_ellipsoid : This is actual height above mean sea level, not geopotential height -->
-   <field id="CMIP6_zg"            field_ref="geop"             /> <!-- P1 (m) geopotential_height : Geopotential height on the 1000 hPa surface -->
+   <field id="CMIP6_zg"            field_ref="geoph"            /> <!-- P1 (m) geopotential_height : Geopotential height on the 1000 hPa surface -->
    <field id="CMIP6_zhalf"         field_ref="zhalf"            /> <!-- P2 (m) height_above_reference_ellipsoid : This is actual height above mean sea level, not geopotential height.  This is actual height above mean sea level, not geopotential height.  Includes both the top of the model atmosphere and surface levels. -->
    <field id="CMIP6_zmla"          field_ref="s_pblh"           /> <!-- P1 (m) atmosphere_boundary_layer_thickness : Height of Boundary Layer -->
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/ping_nemo.xml
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/ping_nemo.xml	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/ping_nemo.xml	(revision 3969)
@@ -53,9 +53,9 @@
    <field id="CMIP6_difvmfdo"      field_ref="dummy_XYO"        /> <!-- P1 (m2 s-1) ocean_vertical_momentum_diffusivity_due_to_form_drag : unset **** NEMO-RD not relevant for IPSL CM6--> 
    <field id="CMIP6_difvmo"        field_ref="avm_e3w"  expr="@avm_e3w / @e3w" > avm_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_momentum_diffusivity : unset -->
-   <field id="CMIP6_difvmto"       field_ref="av_tide_e3w"  expr="@av_tide_e3w / @e3w" > av_tide_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_momentum_diffusivity_due_to_tides : unset --> 
+   <field id="CMIP6_difvmto"       field_ref="av_wave_e3w" expr="@av_wave_e3w / @e3w" > av_wave_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_momentum_diffusivity_due_to_tides : unset --> 
    <field id="CMIP6_difvso"        field_ref="avs_e3w"  expr="@avs_e3w / @e3w" > avs_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_salt_diffusivity : Vertical/dianeutral diffusivity applied to prognostic salinity field. -->
    <field id="NEMO_difvso_noevd"   field_ref="avs_e3w"  expr="(@avs_e3w - @avt_evd_e3w) / @e3w" > ( avs_e3w - avt_evd_e3w)  / e3w </field>  <!-- P3 (m2 s-1) ocean vertical heat diffusivity without evd contribution ****  NEMO-RD : extra variable not required by CMIP6 -->
    <field id="CMIP6_difvtrbo"      field_ref="dummy_XYO"             /> <!-- P1 (m2 s-1) ocean_vertical_tracer_diffusivity_due_to_background : unset *** NEMO-RD : not relevant for IPSLCM6 -->
-   <field id="CMIP6_difvtrto"      field_ref="av_tide_e3w" expr="@av_tide_e3w / @e3w" > av_tide_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_tracer_diffusivity_due_to_tides : unset -->
+   <field id="CMIP6_difvtrto"      field_ref="av_wave_e3w" expr="@av_wave_e3w / @e3w" > av_wave_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_tracer_diffusivity_due_to_tides : unset -->
    <field id="CMIP6_dispkevfo"     field_ref="dispkevfo"   /> <!-- P1 (W m-2) ocean_kinetic_energy_dissipation_per_unit_area_due_to_vertical_friction. *** NEMO-RD : provides 2D (vertical integral) while not requested by CMIP6 (Griffies et al. 2016) while CMIP5 requested 3D field -->
    <field id="CMIP6_dispkexyfo"    field_ref="dummy_XY0"        /> <!-- P3 (W m-2) ocean_kinetic_energy_dissipation_per_unit_area_due_to_xy_friction : Depth integrated impacts on kinetic energy arising from lateral frictional dissipation associated with Laplacian and/or biharmonic viscosity. For CMIP5, this diagnostic was 3d, whereas the CMIP6 depth integrated diagnostic is sufficient for many purposes and reduces archive requirements. -->
@@ -142,8 +142,8 @@
    <field id="CMIP6_pso"           field_ref="dummy_XY"         /> <!-- P1 (Pa) sea_water_pressure_at_sea_water_surface : Sea Water Pressure at Sea Water Surface **** NEMO-RD: not relevant for IPSLCM6 -->
    <field id="CMIP6_rlntds"        field_ref="dummy_XY"         /> <!-- P1 (W m-2) surface_net_downward_longwave_flux : This is defined as "where ice_free_sea over sea" **** NEMO-RD: does not do -->
-   <field id="CMIP6_rsdo"          field_ref="qsr3d_e3t" expr="@qsr3d_e3t / @e3t" > qsr3d_e3t / e3t </field>  <!-- P1 (W m-2) downwelling_shortwave_flux_in_sea_water : Downwelling Shortwave Radiation in Sea Water -->
+   <field id="CMIP6_rsdo"          field_ref="qsr3d_e3t_SBC" expr="@qsr3d_e3t_SBC / @e3t_SBC" > qsr3d_e3t_SBC / e3t_SBC </field> <!-- P1 (W m-2) downwelling_shortwave_flux_in_sea_water : Downwelling Shortwave Radiation in Sea Water -->
    <field id="CMIP6_rsdoabsorb"    field_ref="dummy_XYO"        /> <!-- P2 (W m-2) net_rate_of_absorption_of_shortwave_energy_in_ocean_layer : Net Rate of Absorption of Shortwave Energy in Ocean Layer **** NEMO-RD: does not do : easy to compute offline -->
    <field id="CMIP6_rsntds"        field_ref="qsr"              /> <!-- P1 (W m-2) net_downward_shortwave_flux_at_sea_water_surface : This is the flux into the surface of liquid sea water only. This excludes shortwave flux absorbed by sea ice, but includes any light that passes through the ice and is absorbed by the ocean. -->
-  <field id="CMIP6_sf6"           field_ref="dummy_XYO"         /> <!-- P2 (mol m-3) mole_concentration_of_sulfur_hexafluoride_in_sea_water : Moles Per Unit Mass of SF6 in sea water **** NEMO-RD: does not do -->
+  <field id="CMIP6_sf6"            field_ref="SF6_E3T" expr="@SF6_E3T / @e3t" > SF6_E3T / e3t </field>  <!-- P2 (mol m-3) mole_concentration_of_sulfur_hexafluoride_in_sea_water : Moles Per Unit Mass of SF6 in sea water **** NEMO-RD: does not do -->
    <field id="CMIP6_sfdsi"         field_ref="saltflx" > this * $convSpsu </field> <!-- P1 (kg m-2 s-1) downward_sea_ice_basal_salt_flux : This field is physical, and it arises since sea ice has a nonzero salt content, so it exchanges salt with the liquid ocean upon melting and freezing. -->
    <field id="CMIP6_sfriver"       field_ref="dummy_XY"         /> <!-- P1 (kg m-2 s-1) salt_flux_into_sea_water_from_rivers : This field is physical, and it arises when rivers carry a nonzero salt content.  Often this is zero, with rivers assumed to be fresh. NEMO-RD : not relevant for IPSLCM6 -->
@@ -208,6 +208,6 @@
    <field id="CMIP6_siage"         field_ref="iceage"            /> <!-- P1 (s) age_of_sea_ice : Age of sea ice -->
    <field id="CMIP6_siareaacrossline" field_ref="transport_siarea_transect"        /> <!-- P2 (m2 s-1) siareaacrossline : net (sum of transport in all directions) sea ice area transport through the following four passages, positive into the Arctic Ocean 1. Fram Strait = (11.5W,81.3N to (10.5E,79.6N) 2. Canadian Archipelego = (128.2W,70.6N) to (59.3W,82.1N) 3. Barents opening = (16.8E,76.5N) to (19.2E,70.2N) 4. Bering Strait = (171W,66.2N) to (166W,65N) -->
-   <field id="CMIP6_siarean"       field_ref="NH_icearea" />     <!-- P2 (1e6 km2) sea_ice_area : total area of sea ice in the Northern hemisphere -->
-   <field id="CMIP6_siareas"       field_ref="SH_icearea" />     <!-- P2 (1e6 km2) sea_ice_area : total area of sea ice in the Southern hemisphere -->
+   <field id="CMIP6_siarean"       field_ref="NH_sc_icearea" />     <!-- P2 (1e6 km2) sea_ice_area : total area of sea ice in the Northern hemisphere -->
+   <field id="CMIP6_siareas"       field_ref="SH_sc_icearea" />     <!-- P2 (1e6 km2) sea_ice_area : total area of sea ice in the Southern hemisphere -->
    <field id="CMIP6_sicompstren"   field_ref="icestr"      /> <!-- P2 (N m-1) compressive_strength_of_sea_ice : Computed strength of the ice pack, defined as the energy (J m-2) dissipated per unit area removed from the ice pack under compression, and assumed proportional to the change in potential energy caused by ridging. For Hibler-type models, this is P (= P*hexp(-C(1-A))) -->
    <field id="CMIP6_siconc"        field_ref="iceconc_pct"           /> <!-- P1 (%) sea_ice_area_fraction : Area fraction of grid cell covered by sea ice -->
@@ -229,6 +229,6 @@
    <field id="CMIP6_sidragbot"     field_ref="dummy_XY"         /> <!-- P3 (1.0) sidragbot : Oceanic drag coefficient that is used to calculate the oceanic momentum drag on sea ice -->
    <field id="CMIP6_sidragtop"     field_ref="dummy_XY"         /> <!-- P3 (1.0) surface_drag_coefficient_for_momentum_in_air : Atmospheric drag coefficient that is used to calculate the atmospheric momentum drag on sea ice -->
-   <field id="CMIP6_siextentn"     field_ref="NH_iceextt"  />   <!-- P2 (1e6 km2) sea_ice_extent : Total area of all Northern-Hemisphere grid cells that are covered by at least 15 % areal fraction of sea ice -->
-   <field id="CMIP6_siextents"     field_ref="SH_iceextt"  />     <!-- P2 (1e6 km2) sea_ice_extent : Total area of all Southern-Hemisphere grid cells that are covered by at least 15 % areal fraction of sea ice -->
+   <field id="CMIP6_siextentn"     field_ref="NH_sc_iceextt"  />   <!-- P2 (1e6 km2) sea_ice_extent : Total area of all Northern-Hemisphere grid cells that are covered by at least 15 % areal fraction of sea ice -->
+   <field id="CMIP6_siextents"     field_ref="SH_sc_iceextt"  />     <!-- P2 (1e6 km2) sea_ice_extent : Total area of all Southern-Hemisphere grid cells that are covered by at least 15 % areal fraction of sea ice -->
    <field id="CMIP6_sifb"          field_ref="icefb"             /> <!-- P2 (m) sea_ice_freeboard : Mean height of sea-ice surface (=snow-ice interface when snow covered) above sea level -->
    <field id="CMIP6_siflcondbot"   field_ref="hfxconbo"      /> <!-- P2 (W m-2) siflcondbot : the net heat conduction flux at the ice base -->
@@ -286,6 +286,6 @@
    <field id="CMIP6_siv"           field_ref="vice_mv"              /> <!-- P1 (m s-1) sea_ice_y_velocity : The y-velocity of ice on native model grid -->
    <field id="CMIP6_sivol"         field_ref="icevolu"            /> <!-- P1 (m) sea_ice_thickness : Total volume of sea ice divided by grid-cell area (this used to be called ice thickness in CMIP5) -->
-   <field id="CMIP6_sivoln"        field_ref="NH_icevolu"  />     <!-- P2 (1e3 km3) sea_ice_volume : total volume of sea ice in the Northern hemisphere -->
-   <field id="CMIP6_sivols"        field_ref="SH_icevolu"  />     <!-- P2 (1e3 km3) sea_ice_volume : total volume of sea ice in the Southern hemisphere -->
+   <field id="CMIP6_sivoln"        field_ref="NH_sc_icevolu"  />     <!-- P2 (1e3 km3) sea_ice_volume : total volume of sea ice in the Northern hemisphere -->
+   <field id="CMIP6_sivols"        field_ref="SH_sc_icevolu"  />     <!-- P2 (1e3 km3) sea_ice_volume : total volume of sea ice in the Southern hemisphere -->
    <field id="CMIP6_sndmassdyn"    field_ref="dmsdyn"       /> <!-- P2 (kg m-2 s-1) sndmassdyn : the rate of change of snow mass through advection with sea ice divided by grid-cell area -->
    <field id="CMIP6_sndmassmelt"   field_ref="dmsmel"      /> <!-- P1 (kg m-2 s-1) surface_snow_melt_flux : the rate of change of snow mass through melt divided by grid-cell area -->
@@ -403,5 +403,5 @@
    <field id="CMIP6_intpbp"        field_ref="dummy_XY"         /> <!-- P3 (mol m-2 s-1) tendency_of_ocean_mole_content_of_phosphorus_due_to_biological_production : Vertically integrated biogenic phosphorus production -->
    <field id="CMIP6_intpbsi"       field_ref="INTPBSI"          /> <!-- P1 (mol m-2 s-1) tendency_of_ocean_mole_content_of_silicon_due_to_biological_production : Vertically integrated biogenic silica production -->
-   <field id="CMIP6_intpcalcite"   field_ref="INTPCAL"         /> <!-- P1 (mol m-2 s-1) tendency_of_ocean_mole_content_of_calcite_expressed_as_carbon_due_to_biological_production : Vertically integrated calcite production -->
+   <field id="CMIP6_intpcalcite"   field_ref="dummy_XY"         /> <!-- P1 (mol m-2 s-1) tendency_of_ocean_mole_content_of_calcite_expressed_as_carbon_due_to_biological_production : Vertically integrated calcite production -->
    <field id="CMIP6_intpn2"        field_ref="INTNFIX"          /> <!-- P1 (mol m-2 s-1) tendency_of_ocean_mole_content_of_elemental_nitrogen_due_to_fixation : Vertically integrated nitrogen fixation -->
    <field id="CMIP6_intpoc"        field_ref="dummy_XY"           /> <!-- P2 (kg m-2) intpoc : Vertically integrated POC -->
Index: CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/run.def
===================================================================
--- CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/run.def	(revision 3758)
+++ CONFIG/UNIFORM/v6/IPSLESM6/GENERAL/PARAM/run.def	(revision 3969)
@@ -57,3 +57,2 @@
 iflag_phytrac=_AUTO_: DEFAULT = 0
 
-
