Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_ice_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_ice_ref (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_ice_ref (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/namelist_ice_si3_ref
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_ice_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_ice_ref (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_ice_ref (revision 9575)
@@ -0,0 +1,1 @@
+link 1_namelist_ice_ref
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/field_def_nemo-ice.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/field_def_nemo-ice.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/field_def_nemo-ice.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-ice.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-oce.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_ice_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_ice_ref (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_ice_ref (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/namelist_ice_si3_ref
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-oce.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-oce.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-oce.xml
Index: anches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/AA_job
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/AA_job (revision 9574)
+++ (revision )
@@ -1,142 +1,0 @@
-#-Q- sxnec ##################
-#-Q- sxnec ## SXNEC IDRIS
-#-Q- sxnec ##################
-#-Q- sxnec #@$-r :XXX:XXX:XXX: # job name
-#-Q- sxnec #@$-o output_XXXXXXX.1 # outputfile name
-#-Q- sxnec #@$-me # sends a mail at the end of execution
-#-Q- sxnec #@$-eo # merge standard error and output
-#-Q- sxnec #@$-jo # print a short performance analysis
-#-Q- sxnec #@$-lT 00:30:00 # Max total CPU time
-#-Q- sxnec #@$-lt 00:30:00 # Max CPU time per process
-#-Q- sxnec #@$-lM 500Mb # Max memory
-#-Q- sxnec ##@$-c 4 # Max number of simultaneous procs used (here=4)
-#-Q- sxnec ##@$-q multi # Use more than 1 proc
-#-Q- aix ##################
-#-Q- aix ## IBM IDRIS ##
-#-Q- aix ##################
-#-Q- aix #@job_name= :XXX:XXX:XXX:
-#-Q- aix #@output= output_XXXXXXX.1
-#-Q- aix #@error= error_XXXXXXX.1
-#-Q- aix #@cpu_limit= 1800
-#-Q- aix #@stack_limit= 200Mb
-#-Q- aix #@data_limit= 1.8Gb
-#-Q- aix #@notification= complete
-#-Q- aix #@total_tasks= 1
-#-Q- aix #@job_type= parallel
-#-Q- aix #@queue
-#-Q- sx8brodie ##################
-#-Q- sx8brodie ## SX8NEC IDRIS ##
-#-Q- sx8brodie ##################
-#-Q- sx8brodie #PBS -N :XXX:XXX:XXX: # job name
-#-Q- sx8brodie #PBS -o output_XXXXXXX.1 # outputfile name
-#-Q- sx8brodie #PBS -j o # merge standard error and output
-#-Q- sx8brodie #PBS -S /usr/bin/ksh # user shell
-#-Q- sx8brodie #PBS -l memsz_job=3.6gb # Max memory
-#-Q- sx8brodie #PBS -l cputim_prc=1:01:00 # Max CPU time/prc
-#-Q- sx8brodie #PBS -l cputim_job=1:01:00 # Max CPU time/job
-#-Q- sx8brodie ##PBS -l cpunum_job=4
-#-Q- sx8brodie ##PBS -q multi
-#-Q- sx8mercure ##################
-#-Q- sx8mercure ## SX8NEC CEA ##
-#-Q- sx8mercure ##################
-#-Q- sx8mercure #PBS -N :XXX:XXX:XXX: # job name
-#-Q- sx8mercure #PBS -o output_XXXXXXX.1 # outputfile name
-#-Q- sx8mercure #PBS -j o # merge standard error and output
-#-Q- sx8mercure #PBS -S /usr/bin/ksh # user shell
-#-Q- sx8mercure #PBS -l memsz_job=500mb # Max memory
-#-Q- sx8mercure #PBS -l cputim_job=00:30:00 # Max CPU time
-#-Q- sx8mercure ##PBS -l cpunum_job=4
-########################################################################
-##
-## Script to run a short experiment when installing the
-## GYRE configuration
-##
-## Rachid Benshila, OPA System Team
-##
-##
-#########################################################################
-##-- print echo of commands before and after shell interpretation
-date
-set -vx
-
-#################################
-# Beginning of user modification
-#################################
-
-##-- define some directories:
-#- Launching run repository
-#-Q- sxnec R_EXPER=${QSUB_WORKDIR:-${PWD}}
-#-Q- sx8brodie R_EXPER=${PBS_O_WORKDIR}
-#-Q- aix R_EXPER=${QSUB_WORKDIR:-${PWD}}
-#-Q- sx8mercure R_EXPER=${PWD}
-#- modipsl repository
-R_EXEDIR=MMMMMMM
-#- output files storing
-R_SORTIE_OCE=AAAAAAA/GYRE_PISCES
-#- execution repository
-R_TMP=$TMPDIR
-
-#################################
-# End of user modification
-#################################
-
-[ -d ${R_TMP} ] || mkdir ${R_TMP}
-cd ${R_TMP}
-
-#-- get the executable
-#-Q- sxnec rcp ${LOGNAME}@rhodes:${R_EXEDIR}/bin/opa opa.xx
-#-Q- sx8brodie rcp ${LOGNAME}@brodie:${R_EXEDIR}/bin/opa opa.xx
-#-Q- aix cp ${R_EXEDIR}/bin/opa opa.xx
-#-Q- sx8mercure cp ${R_EXEDIR}/bin/opa opa.xx
-chmod 777 opa.xx
-
-## -- Copy ancillary files
-#
-#- Namelist for the configuration
-cp ${R_EXPER}/namelist namelist
-cp ${R_EXPER}/namelist_top namelist_top
-cp ${R_EXPER}/namelist_pisces namelist_pisces
-ls -alF
-
-#-Q- sxnec export F_PROGINF=yes
-#-Q- sxnec export F_ERRCNT=5
-#-Q- sx8brodie export F_PROGINF=yes
-#-Q- sx8brodie export F_ERRCNT=5
-#-Q- sx8mercure export F_PROGINF=yes
-#-Q- sx8mercure export F_ERRCNT=5
-
-#-Q- sxnec #- To be use for a mpp run
-#-Q- sxnec #mpirun -np ${NB_PROC} ./opa.xx
-#-Q- sx8brodie #- To be use for a mpp run
-#-Q- sx8brodie #mpirun -np ${NB_PROC} ./opa.xx
-#-Q- sx8mercure #- To be use for a mpp run
-#-Q- sx8mercure #mpirun -np ${NB_PROC} ./opa.xx
-
-./opa.xx
-
-## -- Save output files
-ls -alF
-#- to copy on a storage machine
-#-Q- sxnec DPUT=mfput
-#-Q- sx8brodie DPUT=mfput
-#-Q- aix DPUT=mfput
-#-Q- sx8mercure DPUT=cp
-#-Q- sx8mercure [ -d ${R_SORTIE_OCE} ] || mkdir -p ${R_SORTIE_OCE}
-
-#- Save ocean output files
-$DPUT ocean.output ${R_SORTIE_OCE}/ocean.output
-$DPUT solver.stat ${R_SORTIE_OCE}/solver.stat
-[ -f mpp.output* ] && $DPUT mpp.output* ${R_SORTIE_OCE}/.
-for file_netcdf in *_grid_*.nc *_diad_T*.nc *_ptrc_T*.nc
-do
-$DPUT $file_netcdf ${R_SORTIE_OCE}/$file_netcdf
-done
-#
-#- Save restart files
-for restart in *restart*
-do
-$DPUT $restart ${R_SORTIE_OCE}/$restart
-done
-#
-#- Save ftrace file
-[ -f ftrace.out* ] && $DPUT ftrace.out* ${R_SORTIE_OCE}/.
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,978 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ toce * e3t
+
+ soce * e3t
+
+
+
+
+
+
+ sst * sst
+
+
+
+
+
+
+
+
+
+
+
+ sss * sss
+
+
+
+
+
+
+
+
+ ssh * ssh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ topthdep - pycndep
+
+
+
+
+
+
+
+
+
+ sshdyn * sshdyn
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ uoce * e3u
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ voce * e3v
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ttrd_atf * e3t
+ strd_atf * e3t
+
+ ttrd_atf_e3t * 1026.0 * 3991.86795711963
+ strd_atf_e3t * 1026.0 * 0.001
+
+
+
+
+
+
+
+
+
+
+ sqrt( ttrd_xad^2 + ttrd_yad^2 + ttrd_zad^2 )
+ sqrt( strd_xad^2 + strd_yad^2 + strd_zad^2 )
+
+
+
+
+
+
+
+
+
+
+
+
+ ttrd_ldf + ttrd_zdf - ttrd_zdfp
+ strd_ldf + strd_zdf - strd_zdfp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ttrd_xad * e3t
+ strd_xad * e3t
+ ttrd_yad * e3t
+ strd_yad * e3t
+ ttrd_zad * e3t
+ strd_zad * e3t
+ ttrd_ad * e3t
+ strd_ad * e3t
+ ttrd_totad * e3t
+ strd_totad * e3t
+ ttrd_ldf * e3t
+ strd_ldf * e3t
+ ttrd_zdf * e3t
+ strd_zdf * e3t
+ ttrd_evd * e3t
+ strd_evd * e3t
+
+
+ ttrd_iso * e3t
+ strd_iso * e3t
+ ttrd_zdfp * e3t
+ strd_zdfp * e3t
+
+
+ ttrd_dmp * e3t
+ strd_dmp * e3t
+ ttrd_bbl * e3t
+ strd_bbl * e3t
+ ttrd_npc * e3t
+ strd_npc * e3t
+ ttrd_qns * e3t_surf
+ strd_cdt * e3t_surf
+ ttrd_qsr * e3t
+ ttrd_bbc * e3t
+
+
+ ttrd_totad_e3t * 1026.0 * 3991.86795711963
+ strd_totad_e3t * 1026.0 * 0.001
+ ttrd_evd_e3t * 1026.0 * 3991.86795711963
+ strd_evd_e3t * 1026.0 * 0.001
+ ttrd_iso_e3t * 1026.0 * 3991.86795711963
+ strd_iso_e3t * 1026.0 * 0.001
+ ttrd_zdfp_e3t * 1026.0 * 3991.86795711963
+ strd_zdfp_e3t * 1026.0 * 0.001
+ ttrd_qns_e3t * 1026.0 * 3991.86795711963
+ ttrd_qsr_e3t * 1026.0 * 3991.86795711963
+ ttrd_bbl_e3t * 1026.0 * 3991.86795711963
+ strd_bbl_e3t * 1026.0 * 0.001
+ ttrd_evd_e3t * 1026.0 * 3991.86795711963
+ strd_evd_e3t * 1026.0 * 0.001
+
+
+
+
+
+
+
+
+ ttrd_tot * e3t
+ strd_tot * e3t
+
+ ttrd_tot_e3t * 1026.0 * 3991.86795711963
+ strd_tot_e3t * 1026.0 * 0.001
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: anches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/AA_job
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/AA_job (revision 9574)
+++ (revision )
@@ -1,166 +1,0 @@
-#-Q- sxnec ##################
-#-Q- sxnec ## SXNEC IDRIS
-#-Q- sxnec ##################
-#-Q- sxnec #@$-r :XXX:XXX:XXX: # job name
-#-Q- sxnec #@$-o output_XXXXXXX.1 # outputfile name
-#-Q- sxnec #@$-me # sends a mail at the end of execution
-#-Q- sxnec #@$-eo # merge standard error and output
-#-Q- sxnec #@$-jo # print a short performance analysis
-#-Q- sxnec #@$-lT 3:00:00 # Max total CPU time
-#-Q- sxnec #@$-lt 2:59:00 # Max CPU time per process
-#-Q- sxnec #@$-lM 4Gb # Max memory
-#-Q- sxnec ##@$-c 4 # Max number of simultaneous procs used (here=4)
-#-Q- sxnec ##@$-q multi # Use more than 1 proc
-#-Q- aix ##################
-#-Q- aix ## IBM IDRIS ##
-#-Q- aix ##################
-#-Q- aix #@job_name= :XXX:XXX:XXX:
-#-Q- aix #@output= output_XXXXXXX.1
-#-Q- aix #@error= error_XXXXXXX.1
-#-Q- aix #@cpu_limit= 14200
-#-Q- aix #@stack_limit= 200Mb
-#-Q- aix #@data_limit= 4.8Gb
-#-Q- aix #@notification= complete
-#-Q- aix #@total_tasks= 1
-#-Q- aix #@job_type= parallel
-#-Q- aix #@queue
-#-Q- sx8brodie ##################
-#-Q- sx8brodie ## SX8NEC IDRIS ##
-#-Q- sx8brodie ##################
-#-Q- sx8brodie #PBS -N :XXX:XXX:XXX: # job name
-#-Q- sx8brodie #PBS -o output_XXXXXXX.1 # outputfile name
-#-Q- sx8brodie #PBS -j o # merge standard error and output
-#-Q- sx8brodie #PBS -S /usr/bin/ksh # user shell
-#-Q- sx8brodie #PBS -l memsz_job=4.6gb # Max memory
-#-Q- sx8brodie #PBS -l cputim_prc=3:30:00 # Max CPU time/prc
-#-Q- sx8brodie #PBS -l cputim_job=3:30:00 # Max CPU time/job
-#-Q- sx8brodie ##PBS -l cpunum_job=4
-#-Q- sx8brodie ##PBS -q multi
-#-Q- sx8mercure ##################
-#-Q- sx8mercure ## SX8NEC CEA ##
-#-Q- sx8mercure ##################
-#-Q- sx8mercure #PBS -N :XXX:XXX:XXX: # job name
-#-Q- sx8mercure #PBS -o output_XXXXXXX.1 # outputfile name
-#-Q- sx8mercure #PBS -j o # merge standard error and output
-#-Q- sx8mercure #PBS -S /usr/bin/ksh # user shell
-#-Q- sx8mercure #PBS -l memsz_job=4.6gb # Max memory
-#-Q- sx8mercure #PBS -l cputim_job=3:30:00 # Max CPU time
-#-Q- sx8mercure ##PBS -l cpunum_job=4
-########################################################################
-##
-## Script to run a short experiment when installing the
-## ORCA2_LIM configuration
-##
-## Rachid Benshila, OPA System Team
-##
-##
-#########################################################################
-##-- print echo of commands before and after shell interpretation
-date
-set -vx
-
-#################################
-# Beginning of user modification
-#################################
-
-##-- define some directories :
-#- Input file storing
-#-Q- sxnec R_FORCING="gaya:/u/rech/eee/reee512/NEMO"
-#-Q- sx8brodie R_FORCING="gaya:/u/rech/eee/reee512/NEMO"
-#-Q- aix R_FORCING="gaya:/u/rech/eee/reee512/NEMO"
-#-Q- sx8mercure R_FORCING="/dmnfs10/cont003/p48ethe/FORCINGS/ORCA_R2/NEMO"
-#- Launching run repository
-#-Q- sxnec R_EXPER=${QSUB_WORKDIR:-${PWD}}
-#-Q- sx8brodie R_EXPER=${PBS_O_WORKDIR}
-#-Q- aix R_EXPER=${QSUB_WORKDIR:-${PWD}}
-#-Q- sx8mercure R_EXPER=${PWD}
-#- modipsl repository
-R_EXEDIR=MMMMMMM
-#- output files storing
-R_SORTIE_OCE=AAAAAAA/ORCA2_OFF_PISCES
-#- execution repository
-R_TMP=$TMPDIR
-
-##-- define processus number : to change when running in mpp
-NB_PROC=1
-
-#################################
-# End of user modification
-#################################
-
-#-- define a fonction to get the input tarfile
-#-Q- sxnec Rapatrie () { [ -f $1/$2 ] || ( rcp ${R_FORCING}/$2 $1 ; cd $1; tar xvf $2 ;) }
-#-Q- sx8brodie Rapatrie () { [ -f $1/$2 ] || ( rcp ${R_FORCING}/$2 $1 ; cd $1; tar xvf $2 ;) }
-#-Q- aix Rapatrie () { [ -f $1/$2 ] || ( rcp ${R_FORCING}/$2 $1 ; cd $1; tar xvf $2 ;) }
-#-Q- sx8mercure Rapatrie () { [ -f $1/$2 ] || ( cp ${R_FORCING}/$2 $1 ; cd $1; tar xvf $2 ;) }
-
-[ -d ${R_TMP} ] || mkdir ${R_TMP}
-cd ${R_TMP}
-
-#-- get the executable
-#-Q- sxnec rcp ${LOGNAME}@rhodes:${R_EXEDIR}/bin/opa opa.xx
-#-Q- sx8brodie rcp ${LOGNAME}@brodie:${R_EXEDIR}/bin/opa opa.xx
-#-Q- aix cp ${R_EXEDIR}/bin/opa opa.xx
-#-Q- sx8mercure cp ${R_EXEDIR}/bin/opa opa.xx
-chmod 777 opa.xx
-
-## -- Copy ancillary files
-#
-
-#- Namelist for the configuration
-cp ${R_EXPER}/namelist namelist
-cp ${R_EXPER}/namelist_top namelist_top
-cp ${R_EXPER}/namelist_pisces namelist_pisces
-cp ${R_EXPER}/kRGB61.txt kRGB61.txt
-
-ls -alF
-
-#- Files for the configuration
-Rapatrie ${R_TMP} INPUTS_INIT_v3.tar
-Rapatrie ${R_TMP} INPUTS_DYNA_v3.tar
-Rapatrie ${R_TMP} INPUTS_PISCES_v3.tar
-
-ls -alF
-
-#-Q- sxnec export F_PROGINF=yes
-#-Q- sxnec export F_ERRCNT=5
-#-Q- sx8brodie export F_PROGINF=yes
-#-Q- sx8brodie export F_ERRCNT=5
-#-Q- sx8mercure export F_PROGINF=yes
-#-Q- sx8mercure export F_ERRCNT=5
-
-#-Q- sxnec #- To be use for a mpp run
-#-Q- sxnec #mpirun -np ${NB_PROC} ./opa.xx
-#-Q- sx8brodie #- To be use for a mpp run
-#-Q- sx8brodie #mpirun -np ${NB_PROC} ./opa.xx
-#-Q- sx8mercure #- To be use for a mpp run
-#-Q- sx8mercure #mpirun -np ${NB_PROC} ./opa.xx
-
-./opa.xx
-
-## -- Save output files
-ls -alF
-#- to copy on a storage machine
-#-Q- sxnec DPUT=mfput
-#-Q- sx8brodie DPUT=mfput
-#-Q- aix DPUT=mfput
-#-Q- sx8mercure DPUT=cp
-#-Q- sx8mercure [ -d ${R_SORTIE_OCE} ] || mkdir -p ${R_SORTIE_OCE}
-
-#- Save ocean output files
-$DPUT *ocean.output ${R_SORTIE_OCE}/.
-$DPUT *solver.stat ${R_SORTIE_OCE}/.
-[ -f *mpp.output* ] && $DPUT *mpp.output* ${R_SORTIE_OCE}/.
-for file_netcdf in *_diad_T*.nc *_ptrc_T*.nc
-do
-$DPUT ${file_netcdf} ${R_SORTIE_OCE}/${file_netcdf}
-done
-#
-#- Save restart files
-for restart in *restart*
-do
-$DPUT ${restart} ${R_SORTIE_OCE}/${restart}
-done
-#
-#- Save ftrace file
-[ -f ftrace.out* ] && $DPUT ftrace.out* ${R_SORTIE_OCE}/.
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,978 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ toce * e3t
+
+ soce * e3t
+
+
+
+
+
+
+ sst * sst
+
+
+
+
+
+
+
+
+
+
+
+ sss * sss
+
+
+
+
+
+
+
+
+ ssh * ssh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ topthdep - pycndep
+
+
+
+
+
+
+
+
+
+ sshdyn * sshdyn
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ uoce * e3u
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ voce * e3v
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ttrd_atf * e3t
+ strd_atf * e3t
+
+ ttrd_atf_e3t * 1026.0 * 3991.86795711963
+ strd_atf_e3t * 1026.0 * 0.001
+
+
+
+
+
+
+
+
+
+
+ sqrt( ttrd_xad^2 + ttrd_yad^2 + ttrd_zad^2 )
+ sqrt( strd_xad^2 + strd_yad^2 + strd_zad^2 )
+
+
+
+
+
+
+
+
+
+
+
+
+ ttrd_ldf + ttrd_zdf - ttrd_zdfp
+ strd_ldf + strd_zdf - strd_zdfp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ttrd_xad * e3t
+ strd_xad * e3t
+ ttrd_yad * e3t
+ strd_yad * e3t
+ ttrd_zad * e3t
+ strd_zad * e3t
+ ttrd_ad * e3t
+ strd_ad * e3t
+ ttrd_totad * e3t
+ strd_totad * e3t
+ ttrd_ldf * e3t
+ strd_ldf * e3t
+ ttrd_zdf * e3t
+ strd_zdf * e3t
+ ttrd_evd * e3t
+ strd_evd * e3t
+
+
+ ttrd_iso * e3t
+ strd_iso * e3t
+ ttrd_zdfp * e3t
+ strd_zdfp * e3t
+
+
+ ttrd_dmp * e3t
+ strd_dmp * e3t
+ ttrd_bbl * e3t
+ strd_bbl * e3t
+ ttrd_npc * e3t
+ strd_npc * e3t
+ ttrd_qns * e3t_surf
+ strd_cdt * e3t_surf
+ ttrd_qsr * e3t
+ ttrd_bbc * e3t
+
+
+ ttrd_totad_e3t * 1026.0 * 3991.86795711963
+ strd_totad_e3t * 1026.0 * 0.001
+ ttrd_evd_e3t * 1026.0 * 3991.86795711963
+ strd_evd_e3t * 1026.0 * 0.001
+ ttrd_iso_e3t * 1026.0 * 3991.86795711963
+ strd_iso_e3t * 1026.0 * 0.001
+ ttrd_zdfp_e3t * 1026.0 * 3991.86795711963
+ strd_zdfp_e3t * 1026.0 * 0.001
+ ttrd_qns_e3t * 1026.0 * 3991.86795711963
+ ttrd_qsr_e3t * 1026.0 * 3991.86795711963
+ ttrd_bbl_e3t * 1026.0 * 3991.86795711963
+ strd_bbl_e3t * 1026.0 * 0.001
+ ttrd_evd_e3t * 1026.0 * 3991.86795711963
+ strd_evd_e3t * 1026.0 * 0.001
+
+
+
+
+
+
+
+
+ ttrd_tot * e3t
+ strd_tot * e3t
+
+ ttrd_tot_e3t * 1026.0 * 3991.86795711963
+ strd_tot_e3t * 1026.0 * 0.001
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-oce.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_SI3/EXP00/field_def_nemo-ice.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_SI3/EXP00/field_def_nemo-ice.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_SI3/EXP00/field_def_nemo-ice.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-ice.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_SI3/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_SI3/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_SI3/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-oce.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_SI3/EXP00/namelist_ice_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_SI3/EXP00/namelist_ice_ref (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_SI3/EXP00/namelist_ice_ref (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/namelist_ice_si3_ref
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SI3_PISCES/EXP00/field_def_nemo-ice.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SI3_PISCES/EXP00/field_def_nemo-ice.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SI3_PISCES/EXP00/field_def_nemo-ice.xml (revision 9575)
@@ -0,0 +1,440 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ icemass * icemask + $missval * (1.-icemask )
+ icethic * icemask05 + $missval * (1.-icemask05)
+ snwmass * icemask + $missval * (1.-icemask )
+ snwthic * icemask05 + $missval * (1.-icemask05)
+ iceconc * 100.
+ iceage * icemask15 + $missval * (1.-icemask15)
+ icesalt * icemask + $missval * (1.-icemask )
+ icefrb * icemask + $missval * (1.-icemask )
+
+
+ (icettop+273.15) * icemask + $missval * (1.-icemask)
+ (icetsni+273.15) * icemask + $missval * (1.-icemask)
+ (icetbot+273.15) * icemask + $missval * (1.-icemask)
+ icehc * icemask + $missval * (1.-icemask)
+ snwhc * icemask + $missval * (1.-icemask)
+
+
+ vfxsum * icemask + $missval * (1.-icemask)
+ vfxice * icemask + $missval * (1.-icemask)
+ hfxsensib * icemask + $missval * (1.-icemask)
+ hfxcndtop * icemask + $missval * (1.-icemask)
+ hfxcndbot * icemask + $missval * (1.-icemask)
+ sfxice * icemask + $missval * (1.-icemask)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ uice * icemask + $missval * (1.-icemask)
+ vice * icemask + $missval * (1.-icemask)
+ icevel * icemask + $missval * (1.-icemask)
+ utau_ai * icemask + $missval * (1.-icemask)
+ vtau_ai * icemask + $missval * (1.-icemask)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmtrpice + xmtrpsnw
+ ymtrpice + ymtrpsnw
+
+
+ iceconc_cat * icemask_cat + $missval * (1.-icemask_cat)
+ icethic_cat * icemask_cat + $missval * (1.-icemask_cat)
+ snwthic_cat * icemask_cat + $missval * (1.-icemask_cat)
+ iceconc_cat*100. * icemask_cat + $missval * (1.-icemask_cat)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SI3_PISCES/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SI3_PISCES/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SI3_PISCES/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,978 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ toce * e3t
+
+ soce * e3t
+
+
+
+
+
+
+ sst * sst
+
+
+
+
+
+
+
+
+
+
+
+ sss * sss
+
+
+
+
+
+
+
+
+ ssh * ssh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ topthdep - pycndep
+
+
+
+
+
+
+
+
+
+ sshdyn * sshdyn
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ uoce * e3u
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ voce * e3v
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ttrd_atf * e3t
+ strd_atf * e3t
+
+ ttrd_atf_e3t * 1026.0 * 3991.86795711963
+ strd_atf_e3t * 1026.0 * 0.001
+
+
+
+
+
+
+
+
+
+
+ sqrt( ttrd_xad^2 + ttrd_yad^2 + ttrd_zad^2 )
+ sqrt( strd_xad^2 + strd_yad^2 + strd_zad^2 )
+
+
+
+
+
+
+
+
+
+
+
+
+ ttrd_ldf + ttrd_zdf - ttrd_zdfp
+ strd_ldf + strd_zdf - strd_zdfp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ttrd_xad * e3t
+ strd_xad * e3t
+ ttrd_yad * e3t
+ strd_yad * e3t
+ ttrd_zad * e3t
+ strd_zad * e3t
+ ttrd_ad * e3t
+ strd_ad * e3t
+ ttrd_totad * e3t
+ strd_totad * e3t
+ ttrd_ldf * e3t
+ strd_ldf * e3t
+ ttrd_zdf * e3t
+ strd_zdf * e3t
+ ttrd_evd * e3t
+ strd_evd * e3t
+
+
+ ttrd_iso * e3t
+ strd_iso * e3t
+ ttrd_zdfp * e3t
+ strd_zdfp * e3t
+
+
+ ttrd_dmp * e3t
+ strd_dmp * e3t
+ ttrd_bbl * e3t
+ strd_bbl * e3t
+ ttrd_npc * e3t
+ strd_npc * e3t
+ ttrd_qns * e3t_surf
+ strd_cdt * e3t_surf
+ ttrd_qsr * e3t
+ ttrd_bbc * e3t
+
+
+ ttrd_totad_e3t * 1026.0 * 3991.86795711963
+ strd_totad_e3t * 1026.0 * 0.001
+ ttrd_evd_e3t * 1026.0 * 3991.86795711963
+ strd_evd_e3t * 1026.0 * 0.001
+ ttrd_iso_e3t * 1026.0 * 3991.86795711963
+ strd_iso_e3t * 1026.0 * 0.001
+ ttrd_zdfp_e3t * 1026.0 * 3991.86795711963
+ strd_zdfp_e3t * 1026.0 * 0.001
+ ttrd_qns_e3t * 1026.0 * 3991.86795711963
+ ttrd_qsr_e3t * 1026.0 * 3991.86795711963
+ ttrd_bbl_e3t * 1026.0 * 3991.86795711963
+ strd_bbl_e3t * 1026.0 * 0.001
+ ttrd_evd_e3t * 1026.0 * 3991.86795711963
+ strd_evd_e3t * 1026.0 * 0.001
+
+
+
+
+
+
+
+
+ ttrd_tot * e3t
+ strd_tot * e3t
+
+ ttrd_tot_e3t * 1026.0 * 3991.86795711963
+ strd_tot_e3t * 1026.0 * 0.001
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SI3_PISCES/EXP00/namelist_ice_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SI3_PISCES/EXP00/namelist_ice_ref (revision 9574)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SI3_PISCES/EXP00/namelist_ice_ref (revision 9575)
@@ -1,1 +1,1 @@
-link ../../SHARED/namelist_ice_lim3_ref
+link ../../SHARED/namelist_ice_si3_ref
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/1_namelist_ice_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/1_namelist_ice_ref (revision 9574)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/1_namelist_ice_ref (revision 9575)
@@ -1,1 +1,1 @@
-link namelist_ice_lim3_ref
+link namelist_ice_si3_ref
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/EXP00/field_def_nemo-ice.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/EXP00/field_def_nemo-ice.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/EXP00/field_def_nemo-ice.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-ice.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-oce.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/field_def_nemo-oce.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/field_def_nemo-oce.xml (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/field_def_nemo-oce.xml (revision 9575)
@@ -0,0 +1,1 @@
+link ../../../SHARED/field_def_nemo-oce.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_ice_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_ice_ref (revision 9575)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_ice_ref (revision 9575)
@@ -0,0 +1,1 @@
+link ../../../SHARED/namelist_ice_si3_ref
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (revision 9574)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (revision 9575)
@@ -9,2 +9,8 @@
ORCA2_SI3_PISCES OCE_SRC TOP_SRC ICE_SRC NST_SRC
SPITZ12 OCE_SRC ICE_SRC
+GYRE_PISCES_ST OCE_SRC TOP_SRC
+ORCA2_SI3_PISCES_ST OCE_SRC TOP_SRC ICE_SRC NST_SRC
+ORCA2_OFF_PISCES_ST OCE_SRC TOP_SRC OFF_SRC
+AMM12_ST OCE_SRC
+ORCA2_SAS_SI3_ST OCE_SRC ICE_SRC NST_SRC SAS_SRC
+ORCA2_SI3_OBS_ST OCE_SRC ICE_SRC