to continue"
+ set y = $<
+ endif
+ endif
+ endif
+
+
if ( -d ./WSAS_32 ) then
set dorv = `ls -1rtd ./WSAS_32/{$mach}/* | tail -1l `
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/batch/X64_ADA.sh
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/batch/X64_ADA.sh (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/batch/X64_ADA.sh (revision 5974)
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Nom de la requete
+# @ job_name = NEMO_CI
+# Type de travail
+# @ job_type = parallel
+# Fichier de sortie standard
+# @ output = $(job_name)_$(jobid)
+# Fichier de sortie erreur
+# @ error = $(job_name)_$(jobid)
+# Nombre de processus demande
+# @ total_tasks = 32
+# Temps CPU max. par processus MPI hh:mm:ss
+# @ wall_clock_limit = 0:30:00
+# Fin de l entete
+# @ queue
+
+cd $LOADL_STEP_INITDIR
+
+# running the job in parallel mode
+poe ./opa
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/batch/X64_CURIE.sh
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/batch/X64_CURIE.sh (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/batch/X64_CURIE.sh (revision 5974)
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+#Config ccc_msub
+#MSUB -A gen7451
+#MSUB -r NEMO_CI
+#MSUB -o NEMO_CI_%I
+#MSUB -e NEMO_CI_%I
+#MSUB -oe
+#MSUB -q xlarge
+#MSUB -n 128
+#MSUB -N 1
+#MSUB -T 1800
+##MSUB -@ ntmlod@locean-ipsl.upmc.fr:begin,end
+ccc_mprun ./opa
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/X64_ADA.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/X64_ADA.cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/X64_ADA.cfg (revision 5974)
@@ -0,0 +1,34 @@
+## Ada configuration
+##---------------------------------------------------
+
+
+## Default settings
+##---------------------------------------------------
+TRUS_ENVI=${TRUS_XIOS}/arch/arch-${TRUS_HPCC}
+
+TRUS_CDOD='cdo diffn'
+
+[ -z "${TRUS_NPRO}" ] && TRUS_NPRO='16'
+[ -z "${TRUS_TOUT}" ] && TRUS_TOUT='10800'
+
+
+## (Super)computer environment
+##---------------------------------------------------
+TRUS_JSPT=${TRUS_HPCC}.sh
+TRUS_JSUB="llsubmit ${TRUS_JSPT} | grep -oe '\<[0-9]*\>'"
+TRUS_JINF="llq -x \${TRUS_JIDN}"
+TRUS_JSTA="llq | grep \${TRUS_JIDN}"
+TRUS_JKIL="llcancel \${TRUS_JIDN}"
+
+TRUS_JTIM="grep IdrisMemMPI NEMO_CI_\${TRUS_JIDN} | cut -d, -f1 | awk '{print \$(NF-1),\$NF}'"
+TRUS_JPME="grep IdrisMemMPI NEMO_CI_\${TRUS_JIDN} | cut -d, -f3 | awk '{print \$3 ,\$4 }'"
+TRUS_JVME="grep IdrisMemMPI NEMO_CI_\${TRUS_JIDN} | cut -d, -f2 | awk '{print \$3 ,\$4 }'"
+
+TRUS_CMPV='ifort'
+TRUS_CDOR='cdo/'
+TRUS_MPIR='intel/impi/'
+TRUS_CDFR='netcdf/'
+
+PATH='/smplocal/pub/cdo/1.5.9/bin':$PATH
+## Not working with module delimiter ':'
+#WRAPPER_LDFLAGS='-L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem '${WRAPPER_LDFLAGS}
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/X64_CURIE.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/X64_CURIE.cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/X64_CURIE.cfg (revision 5974)
@@ -0,0 +1,32 @@
+## Curie configuration
+##---------------------------------------------------
+
+
+## Default settings
+##---------------------------------------------------
+TRUS_ENVI=${TRUS_XIOS}/arch/arch-${TRUS_HPCC}
+
+TRUS_CDOD='cdo diffn'
+
+[ -z "${TRUS_NPRO}" ] && TRUS_NPRO='16'
+[ -z "${TRUS_TOUT}" ] && TRUS_TOUT='10800'
+
+
+## (Super)computer environment
+##---------------------------------------------------
+TRUS_JSPT=${TRUS_HPCC}.sh
+TRUS_JSUB="ccc_msub ${TRUS_JSPT} | grep -oe '\<[0-9]*\>'"
+TRUS_JINF="ccc_macct \${TRUS_JIDN}"
+TRUS_JSTA="ccc_mpp | grep \${TRUS_JIDN}"
+TRUS_JKIL="ccc_mdel \${TRUS_JIDN}"
+
+TRUS_JTIM="ccc_macct \${TRUS_JIDN} | grep \"\${TRUS_JIDN}.0 *opa\" | awk '{print \$9 }'"
+TRUS_JPME="ccc_macct \${TRUS_JIDN} | grep -m1 \"\${TRUS_JIDN}.0\" | awk '{printf \"%d Mo\n\", \$2; exit}'"
+TRUS_JVME="ccc_macct \${TRUS_JIDN} | grep -m1 \"\${TRUS_JIDN}.0\" | awk '{printf \"%d Go\n\", \$7; exit}'"
+
+TRUS_CMPV='ifort'
+TRUS_CDOR='netcdf-utils-'
+TRUS_MPIR='bullxmpi/'
+TRUS_CDFR='netcdf-'
+
+PATH='/usr/local/netcdf-utils-4.3.3.1_hdf5/bin':$PATH
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/arch_template.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/arch_template.cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/arch_template.cfg (revision 5974)
@@ -0,0 +1,50 @@
+## (Super)Computer configuration template
+##---------------------------------------------------
+
+## Copy to root, rename it and then fill in according to your (super)computer environment
+## Rules for completion: undefined variables (=) are mandatory & void variables (='') are optional
+## Look into other configuration file for examples
+
+
+## Default settings
+##---------------------------------------------------
+# (Super)Computer environment (${TRUS_XIOS} is already defined in the user configuration file)
+TRUS_ENVI=${TRUS_XIOS}/arch/arch-${TRUS_HPCC}
+## If `module` is available, ${TRUS_ENVI}.env will be sourced
+## If not (scheduled jobs), it will be ${TRUS_ENVI}.path or finally ${TRUS_ENVI}
+
+## Comparison command with restart files as argument (think to append $PATH by any way)
+TRUS_CDOD='cdo diffn'
+
+[ -z "${TRUS_NPRO}" ] && TRUS_NPRO= ## Number of compiling processes
+[ -z "${TRUS_TOUT}" ] && TRUS_TOUT= ## Timeout for computation (s)
+
+
+## (Super)computer environment
+##---------------------------------------------------
+## Job commands will almost always be used with `eval ${TRUS_JXXX}` because
+## they will certainly need job ID number as argument for working
+TRUS_JSPT= ## Submission script contained ./batch folder, will be copied to testing folder
+TRUS_JSUB= ## Submit a job and get his ID on the fly (assigned to ${TRUS_JIDN})
+ ## ex: `llsubmit ${TRUS_JSPT} | grep -oe '\<[0-9]*\>'`
+TRUS_JSTA= ## Test state of the submitted job (true -> pending/running or false -> completed/crashed)
+ ## ex: "llq | grep \${TRUS_JIDN}"
+TRUS_JKIL= ## Kill the submitted job
+ ## ex: "llcancel \${TRUS_JIDN}"
+
+## Computational performances of job (respectively elapsed time, max physical & virtual memory)
+TRUS_JTIM='' ## ex: "grep IdrisMemMPI NEMO_CI_\${TRUS_JIDN} | cut -d, -f1 | awk '{print \$(NF-1),\$NF}"
+TRUS_JPME='' ## ex: "grep IdrisMemMPI NEMO_CI_\${TRUS_JIDN} | cut -d, -f3 | awk '{print \$3 ,\$4 }"
+TRUS_JVME='' ## ex: "grep IdrisMemMPI NEMO_CI_\${TRUS_JIDN} | cut -d, -f2 | awk '{print \$3 ,\$4 }"
+
+TRUS_JINF='' ## Get job informations to fill in a logfile during computation
+ ## ex: "llq -x \${TRUS_JIDN}"
+
+## Compiler (use with `${TRUS_CMPV} --version`)
+TRUS_CMPV='' ## ex: 'ifort'|'gfortran'|'pgfortran'|...
+
+## Software/libraries (string pattern to match just before the release number in $PATH)
+## Respectively CDO (Climate Data Operators) / MPI libraries / NetCDF libraries
+TRUS_CDOR='' ## ex: 'cdo/'|'netcdf-utils-'
+TRUS_MPIR='' ## ex: 'intel/impi/'|'bullxmpi/'
+TRUS_CDFR='' ## ex: 'netcdf/'|'netcdf-'
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/martin.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/martin.cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/martin.cfg (revision 5974)
@@ -0,0 +1,35 @@
+## Installation for trusting tests on Curie Supercomputer
+##---------------------------------------------------
+
+
+## Default settings
+##---------------------------------------------------
+[ -z "${TRUS_BRAN}" ] && TRUS_BRAN='trunk'
+TRUS_CKOT=( 'ARCH CONFIG NEMO \
+ EXTERNAL/AGRIF EXTERNAL/fcm EXTERNAL/IOIPSL \
+ TOOLS/COMPILE TOOLS/maketools TOOLS/REBUILD_NEMO ' )
+
+[ -z "${TRUS_REFE}" ] && TRUS_REFE='ORCA2_LIM_PISCES'
+TRUS_CONF=${TRUS_REFE}'_trust'
+
+[ -z "${TRUS_TARF}" ] && TRUS_TARF='ORCA2_LIM_nemo_v3.6.tar'
+[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TARF='INPUTS_ORCA1_LIM3_PISCES_V6.tar'
+[ ${TRUS_REFE} == 'AMM12' ] && TRUS_TARF='AMM12_v3.6.tar'
+
+TRUS_KEYA=''; TRUS_KEYD=''
+[ ${TRUS_REFE} == 'ORCA2_LIM' ] && TRUS_KEYA='key_add key_agrif' && TRUS_KEYD='key_del key_zdftmx'
+
+
+## User environment
+##---------------------------------------------------
+TRUS_WORK=$CCCWORKDIR/NEMO
+TRUS_SCRA=$SCRATCHDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${DATE}
+TRUS_STOR=$CCCSTOREDIR/NEMO/trusting_sav/${TRUS_REFE}/${TRUS_BRAN}
+TRUS_FORC=$CCCWORKDIR/NEMO/FORC
+TRUS_XIOS=$CCCWORKDIR/XIOS/xios-1.0
+
+[ ${TRUS_REFE} == 'ORCA2_LIM_PISCES' ] && TRUS_CONF='O2LP_trust'
+[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_CONF='O1L3P_trust'
+[ ${TRUS_REFE} == 'ORCA2_LIM' ] && TRUS_CONF='O2LA_trust'
+
+[ -z "${TRUS_MAIL}" ] && TRUS_MAIL='ntmlod@locean-ipsl.upmc.fr'
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/romr005.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/romr005.cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/romr005.cfg (revision 5974)
@@ -0,0 +1,35 @@
+## Installation for trusting tests on Ada Supercomputer
+##---------------------------------------------------
+
+
+## Default settings
+##---------------------------------------------------
+[ -z "${TRUS_BRAN}" ] && TRUS_BRAN='trunk'
+TRUS_CKOT=( 'ARCH CONFIG NEMO \
+ EXTERNAL/AGRIF EXTERNAL/fcm EXTERNAL/IOIPSL \
+ TOOLS/COMPILE TOOLS/maketools TOOLS/REBUILD_NEMO ' )
+
+[ -z "${TRUS_REFE}" ] && TRUS_REFE='ORCA2_LIM_PISCES'
+TRUS_CONF=${TRUS_REFE}'_trust'
+
+[ -z "${TRUS_TARF}" ] && TRUS_TARF='ORCA2_LIM_nemo_v3.6.tar'
+[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TARF='INPUTS_ORCA1_LIM3_PISCES_V6.tar'
+[ ${TRUS_REFE} == 'AMM12' ] && TRUS_TARF='AMM12_v3.6.tar'
+
+TRUS_KEYA=''; TRUS_KEYD=''
+[ ${TRUS_REFE} == 'ORCA2_LIM' ] && TRUS_KEYA='key_add key_agrif' && TRUS_KEYD='key_del key_zdftmx'
+
+
+## User environment
+##---------------------------------------------------
+TRUS_WORK=$WORKDIR/NEMO
+TRUS_SCRA=$WORKDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${DATE}
+TRUS_STOR=$WORKDIR/NEMO/trusting_sav/${TRUS_REFE}/${TRUS_BRAN}
+TRUS_FORC=$WORKDIR/NEMO/FORC
+TRUS_XIOS=$WORKDIR/XIOS/xios-1.0
+
+[ ${TRUS_REFE} == 'ORCA2_LIM_PISCES' ] && TRUS_CONF='O2LP_trust'
+[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_CONF='O1L3P_trust'
+[ ${TRUS_REFE} == 'ORCA2_LIM' ] && TRUS_CONF='O2LA_trust'
+
+[ -z "${TRUS_MAIL}" ] && TRUS_MAIL='ntmlod@locean-ipsl.upmc.fr'
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/user_template.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/user_template.cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/config/user_template.cfg (revision 5974)
@@ -0,0 +1,49 @@
+## User configuration template
+##---------------------------------------------------
+
+## Copy to root, rename it and then fill in according to your user environment
+## Rules for completion: undefined variables (=) are mandatory & void variables (='') are optional
+## Look into other configuration file for examples
+
+
+## Default settings
+##---------------------------------------------------
+## These settings can be changed directly from command line to reduce number of user configuration file
+## See `./trusting.sh [-h|--help]`
+
+## SVN branch name ('trunk', 'nemo_v3_6_STABLE', development branches)
+[ -z "${TRUS_BRAN}" ] && TRUS_BRAN='trunk'
+
+## Minimal content for code checkout/update
+TRUS_CKOT=( 'ARCH CONFIG NEMO \
+ EXTERNAL/AGRIF EXTERNAL/fcm EXTERNAL/IOIPSL \
+ TOOLS/COMPILE TOOLS/maketools TOOLS/REBUILD_NEMO ' )
+
+[ -z "${TRUS_REFE}" ] && TRUS_REFE='ORCA2_LIM_PISCES' ## Reference configuration to test
+TRUS_CONF=${TRUS_REFE}'_trust' ## Testing configuration name
+
+## Forcing archive, let void if just need to copy the files inside ${TRUS_FORC}
+[ -z "${TRUS_TARF}" ] && TRUS_TARF='ORCA2_LIM_nemo_v3.6.tar'
+[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TARF='INPUTS_ORCA1_LIM3_PISCES_V6.tar'
+[ ${TRUS_REFE} == 'AMM12' ] && TRUS_TARF='AMM12_v3.6.tar'
+
+## CPP keys to add or remove from reference configuration
+TRUS_KEYA=''; TRUS_KEYD=''
+[ ${TRUS_REFE} == 'ORCA2_LIM' ] && TRUS_KEYA='key_add key_agrif' && TRUS_KEYD='key_del key_zdftmx'
+
+
+## User environment
+##---------------------------------------------------
+TRUS_WORK= ## Testing folder for compilation (branches checkouts & configuration compilation)
+TRUS_SCRA= ## " " "" " " computation
+ ## ...../${TRUS_REFE}/${TRUS_BRAN}/${DATE} recommended
+TRUS_STOR= ## Benchmark folder where target files for comparison have been stored, ie:
+ ## Inputs (all) : CPP_*, namelist_*, *.xml et inputs_list.txt (created by initial test)
+ ## Outputs (any) : *.stat, ocean.output, restarts
+ ## ...../${TRUS_REFE}/${TRUS_BRAN} recommended (same layout as ${TRUS_SCRA})
+TRUS_FORC= ## Path to the forcing archive to extract (usage combined with ${TRUS_TARF}) or
+ ## "" all inputs files who will be copied into ${TRUS_SCRA}
+TRUS_XIOS= ## XIOS installation
+
+## Mailing list to notify on failure (-p|--prod option required)
+[ -z "${TRUS_MAIL}" ] && TRUS_MAIL=''
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/cron/ada.env
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/cron/ada.env (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/cron/ada.env (revision 5974)
@@ -0,0 +1,53 @@
+## Set Ada environment for trusting scheduled job
+
+## Equivalent of source arch-X64_ADA.env with module commands
+PATH='/smplocal/intel/composer_xe_2013.1.117/bin/intel64:/smplocal/intel/composer_xe_2013.1.117/bin/intel64_mic:/smplocal/intel/composer_xe_2013.1.117/debugger/gui/intel64:/smplocal/intel/composer_xe_2013.1.117/bin/intel64:/smplocal/intel/composer_xe_2013.1.117/mpirt/bin/intel64:/smplocal/intel/impi/4.1.0.024/intel64/bin:/smplocal/pub/Modules/IDRIS/wrappers:/smplocal/pub/NetCDF/4.1.3/mpi/bin':$PATH
+LD_LIBRARY_PATH='/smplocal/intel/composer_xe_2013.1.117/compiler/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/mkl/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/compiler/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/mpirt/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/ipp/../compiler/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/ipp/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/tbb/lib/intel64:/smplocal/intel/impi/4.1.0.024/intel64/lib':${LD_LIBRARY_PATH}
+INCLUDE='/smplocal/intel/composer_xe_2013.1.117/mkl/include':$INCLUDE
+
+## Wrapper flags
+WRAPPER_CXXFLAGS='-I/smplocal/pub/NetCDF/4.1.3/mpi/include'
+WRAPPER_FFLAGS='-I/smplocal/pub/NetCDF/4.1.3/mpi/include'
+WRAPPER_LDFLAGS='-L/smplocal/pub/NetCDF/4.1.3/mpi/lib -Bstatic -lnetcdff -lnetcdf -lnetcdf_c++ -Bdynamic -L/smplocal/pub/HDF5/1.8.9/par/lib -Bstatic -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -Bdynamic -lz'
+
+## IDRIS files systems (no need with `at`)
+#WORKDIR=/workgpfs/rech/omr/$USER
+#COMMONDIR=/workgpfs/rech/omr/commun
+#TMPDIR=
+
+## Intel license
+INTEL_LICENSE_FILE='/smplocal/intel/composer_xe_2013.1.117/licenses:/smplocal/intel/licenses:/linkhome/rech/omr/romr005/intel/licenses'
+
+## Trusting
+TRUS_HPCC='X64_ADA'
+
+## Export to environment
+export PATH LD_LIBRARY_PATH INCLUDE
+export WRAPPER_CXXFLAGS WRAPPER_FFLAGS WRAPPER_LDFLAGS
+#export WORKDIR COMMONDIR TMPDIR
+export INTEL_LICENSE_FILE
+export TRUS_HPCC
+
+
+#-------------------------------------------------------------------
+#/smplocal/pub/Modules/IDRIS/modulefiles/environnement/intel/2013.0:
+#prepend-path PATH /smplocal/intel/composer_xe_2013.1.117/bin/intel64:/smplocal/intel/composer_xe_2013.1.117/bin/intel64_mic:/smplocal/intel/composer_xe_2013.1.117/debugger/gui/intel64
+#prepend-path PATH /smplocal/intel/composer_xe_2013.1.117/bin/intel64:/smplocal/intel/composer_xe_2013.1.117/mpirt/bin/intel64
+#prepend-path PATH /smplocal/intel/impi/4.1.0.024/intel64/bin
+#prepend-path PATH /smplocal/pub/Modules/IDRIS/wrappers
+#prepend-path LD_LIBRARY_PATH /smplocal/intel/composer_xe_2013.1.117/tbb/lib/intel64
+#prepend-path LD_LIBRARY_PATH /smplocal/intel/composer_xe_2013.1.117/compiler/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/mkl/lib/intel64
+#prepend-path LD_LIBRARY_PATH /smplocal/intel/composer_xe_2013.1.117/ipp/../compiler/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/ipp/lib/intel64
+#prepend-path LD_LIBRARY_PATH /smplocal/intel/composer_xe_2013.1.117/compiler/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/mpirt/lib/intel64
+#prepend-path LD_LIBRARY_PATH /smplocal/intel/impi/4.1.0.024/intel64/lib
+#prepend-path INCLUDE /smplocal/intel/composer_xe_2013.1.117/mkl/include
+#append-path INTEL_LICENSE_FILE /smplocal/intel/composer_xe_2013.1.117/licenses:/smplocal/intel/licenses:/linkhome/rech/omr/romr005/intel/licenses
+#-------------------------------------------------------------------
+#-------------------------------------------------------------------
+#/smplocal/pub/Modules/IDRIS/modulefiles/bibliotheques/netcdf/mpi/4.1.3:
+#prepend-path PATH /smplocal/pub/NetCDF/4.1.3/mpi/bin
+#prepend-path PATH /smplocal/pub/Modules/IDRIS/wrappers
+#prepend-path WRAPPER_FFLAGS -I/smplocal/pub/NetCDF/4.1.3/mpi/include
+#prepend-path WRAPPER_CXXFLAGS -I/smplocal/pub/NetCDF/4.1.3/mpi/include
+#prepend-path WRAPPER_LDFLAGS -L/smplocal/pub/NetCDF/4.1.3/mpi/lib -Bstatic -lnetcdff -lnetcdf -lnetcdf_c++ -Bdynamic -L/smplocal/pub/HDF5/1.8.9/par/lib -Bstatic -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -Bdynamic -lz
+#-------------------------------------------------------------------
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/cron/curie.env
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/cron/curie.env (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/cron/curie.env (revision 5974)
@@ -0,0 +1,74 @@
+## Set Curie environment for trusting scheduled job
+
+## Equivalent of source arch-X64_CURIE.env with module commands
+PATH='/usr/local/ccc_users_env/bin:/opt/intel/14.0.3.174/bin/intel64:/opt/mpi/bullxmpi/1.2.8.2/bin:/usr/local/netcdf-4.3.3.1_hdf5_parallel/bin:/ccc/cont003/home/dsm/p86ipsl/bin':$PATH
+LD_LIBRARY_PATH='/lib64:/lib:/usr/lib64:/usr/lib:/opt/intel/14.0.3.174/compiler/lib/intel64:/usr/local/intel-14.0.3.174/14.0.3.174/mkl/lib/intel64:/opt/intel/14.0.3.174/debugger/lib/intel64:/opt/mpi/bullxmpi/1.2.8.2/lib:/usr/local/netcdf-4.3.3.1_hdf5_parallel/lib':${LD_LIBRARY_PATH}
+
+## NetCDF installation
+NETCDF_INCDIR='/usr/local/netcdf-4.3.3.1_hdf5_parallel/include'
+NETCDF_LDFLAGS='-L/usr/local/netcdf-4.3.3.1_hdf5_parallel/lib -lnetcdf'
+NETCDF_LIBDIR='/usr/local/netcdf-4.3.3.1_hdf5_parallel/lib'
+
+## TGCC files systems
+CCCWORKDIR=/ccc/work/cont003/gen7451/$USER
+SCRATCHDIR=/ccc/scratch/cont003/gen7451/$USER
+CCCSTOREDIR=/ccc/store/cont003/gen7451/$USER
+
+## Intel license
+LM_LICENSE_FILE='27000@licintel.ccc.cea.fr'
+
+## Trusting
+TRUS_HPCC='X64_CURIE'
+
+## Export to environment
+export PATH LD_LIBRARY_PATH
+export NETCDF_INCDIR NETCDF_LDFLAGS NETCDF_LIBDIR
+export CCCWORKDIR SCRATCHDIR CCCSTOREDIR
+export LM_LICENSE_FILE
+export TRUS_HPCC
+
+#-------------------------------------------------------------------
+#/opt/Modules/default/modulefiles/environment/ccc:
+#append-path PATH /usr/local/ccc_users_env/bin
+#prepend-path LD_LIBRARY_PATH /lib64:/lib:/usr/lib64:/usr/lib
+#-------------------------------------------------------------------
+#-------------------------------------------------------------------
+#/opt/Modules/default/modulefiles/environment/dfldatadir/own:
+#setenv CCCSTOREDIR /ccc/store/cont003/gen7451/martin
+#setenv CCCWORKDIR /ccc/work/cont003/gen7451/martin
+#setenv SCRATCHDIR /ccc/scratch/cont003/gen7451/martin
+#-------------------------------------------------------------------
+#-------------------------------------------------------------------
+#/opt/Modules/default/modulefiles/environment/licsrv/intel:
+#append-path LM_LICENSE_FILE 27000@licintel.ccc.cea.fr
+#-------------------------------------------------------------------
+#-------------------------------------------------------------------
+#/opt/Modules/default/modulefiles/compilers/intel/14.0.3.174:
+#module load c/intel/14.0.3.174
+#prepend-path PATH /opt/intel/14.0.3.174/bin/intel64
+#prepend-path LD_LIBRARY_PATH /opt/intel/14.0.3.174/compiler/lib/intel64
+#module load c++/intel/14.0.3.174
+#prepend-path PATH /opt/intel/14.0.3.174/bin/intel64
+#prepend-path LD_LIBRARY_PATH /opt/intel/14.0.3.174/compiler/lib/intel64
+#module load fortran/intel/14.0.3.174
+#append-path PATH /opt/intel/14.0.3.174/bin/intel64
+#prepend-path LD_LIBRARY_PATH /opt/intel/14.0.3.174/compiler/lib/intel64
+#module load mkl/14.0.3.174
+#append-path LD_LIBRARY_PATH /usr/local/intel-14.0.3.174/14.0.3.174/mkl/lib/intel64
+#module load idb/14.0.3.174
+#prepend-path PATH /opt/intel/14.0.3.174/bin/intel64
+#append-path LD_LIBRARY_PATH /opt/intel/14.0.3.174/debugger/lib/intel64
+#-------------------------------------------------------------------
+#-------------------------------------------------------------------
+#/opt/Modules/default/modulefiles/parallel/bullxmpi/1.2.8.2:
+#prepend-path PATH /opt/mpi/bullxmpi/1.2.8.2/bin
+#prepend-path LD_LIBRARY_PATH /opt/mpi/bullxmpi/1.2.8.2/lib
+#-------------------------------------------------------------------
+#-------------------------------------------------------------------
+#/opt/Modules/default/modulefiles/libraries/netcdf/4.3.3.1_hdf5_parallel:
+#prepend-path PATH /usr/local/netcdf-4.3.3.1_hdf5_parallel/bin
+#prepend-path LD_LIBRARY_PATH /usr/local/netcdf-4.3.3.1_hdf5_parallel/lib
+#setenv NETCDF_INCDIR /usr/local/netcdf-4.3.3.1_hdf5_parallel/include
+#setenv NETCDF_LIBDIR /usr/local/netcdf-4.3.3.1_hdf5_parallel/lib
+#setenv NETCDF_LDFLAGS -L/usr/local/netcdf-4.3.3.1_hdf5_parallel/lib -lnetcdf
+#-------------------------------------------------------------------
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/banner.html
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/banner.html (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/banner.html (revision 5974)
@@ -0,0 +1,33 @@
+
+@@@@@@O$$$$$$@@@@@@#$$$$$$&@#$$$$$$$$$$$$$$$&@O$$$$$$&@@@@@@@@@$$$$$$O@@@@@@@@@@@O$$%$O@@@@@@@@@@@@@
+@@@@@@?!!!!!!#@@@@@O!!!!!!#@$!!!!!!!!!!!!!!!#@%!!!!!!?&@@@@@@@$!!!!!!?@@@@@@@@&O#&&&&%??$#@@@@@@@@@@
+@@@@@@?!!!!!!?@@@@@O!!!!!!#@$!!!!!!!!!!!!!!!#@%!!!!!!!%@@@@@@O!!!!!!!?@@@@@@@O#@@&%??!!!!!$@@@@@@@@@
+@@@@@@?!!!!!!!O@@@@O!!!!!!#@$!!!!!!?????????&@%!!!!!!!!$@@@@#!!!!!!!!?@@@@@&O&@&&O$$?!!!!!!%&@@@@@@@
+@@@@@@?!!!!!!!!#@@@O!!!!!!#@$!!!!!!#&&&&&&&&@@%!!!!!!!!!$@@&?!!!!!!!!?@@@@@O&@&??&@@&O!!!!!!%@@@@@@@
+@@@@@@?!!!!!!!!?&@@O!!!!!!#@$!!!!!!#@@@@@@@@@@%!!!!!!!!!!O@%!!!!!!!!!?@@@@O&@@O!O@@@@&O!!!!!!$@@@@@@
+@@@@@@?!!!!!!!!!?#@O!!!!!!#@$!!!!!!#@@@@@@@@@@%!!!!!!!!!!!%!!!!!!!!!!?@@@&O@@$!!O&@@@@&O!!!!!!#@@@@@
+@@@@@@?!!!!!!!!!!!OO!!!!!!#@$!!!!!!$OOOOO@@@@@%!!!!!!!!!!!!!!!!!!!!!!?@@@O@&%!!!!!%#&&@&?!!!!!%@@@@@
+@@@@@@?!!!!!!!!!!!!!!!!!!!#@$!!!!!!!!!!!?@@@@@%!!!!!!!!!!!!!!!!!!!!!!?@@@O&!!!!!!%%eO&@$!!!!!!%&@@@@
+@@@@@@?!!!!!!!!!!!!!!!!!!!#@$!!!!!!!!!!!?@@@@@%!!!!!!!!!!!!!!!!!!!!!!?@@&&$!!!?$O$Oe$@@!!!!!!eO#@@@@
+@@@@@@?!!!!!!!!!!!!!!!!!!!#@$!!!!!!?%%%%$@@@@@%!!!!!!!!!!!!!!!!!!!!!!?@@O&!!!!$&$#%!#@@?!!!!!!$O@@@@
+@@@@@@?!!!!!!!!!!!!!!!!!!!#@$!!!!!!#@@@@@@@@@@%!!!!!!!!!!!!!!!!!!!!!!?@@O&!!!!%?O@%&&&@$!!!!!!?O@@@@
+@@@@@@?!!!!!?#!!!!!!!!!!!!#@$!!!!!!#@@@@@@@@@@%!!!!!!#!!!!!!!!O?!!!!!?@@O#!!!!!!?@@@@@OO!!!!$e?O@@@@
+@@@@@@?!!!!!?@#?!!!!!!!!!!#@$!!!!!!#@@@@@@@@@@%!!!!!!!!!!!!%&?!!!!!?@@OOO?!!!%%@@@@@#?!%$#O%%$@@@@
+@@@@@@?!!!!!?@@&%!!!!!!!!!#@$!!!!!!?????????&@%!!!!!!&@O!!!!?&@?!!!!!?@@##%$&&&@@@@@@$%#&O!??O@@@@
+@@@@@@?!!!!!?@@@@#?!!!!!!!#@$!!!!!!!!!!!!!!!#@%!!!!!!&@@$!!!&@@?!!!!!?@@$&@@@@@@@@@@@?O%%?!!!#@@@@
+@@@@@@?!!!!!?@@@@@@#%!!!!!#@$!!!!!!!!!!!!!!!#@%!!!!!!&@@@$!O@@@?!!!!!?@@@O#&&@@@@@@@@@@O?!!!!!?&@@@@
+@@@@@@?!!!!!?@@@@@@@@&O$%%#@#O##&&&&&&&#OO&@$!!!!!!&@@@@O@@@@?!!!!!?@@@O&&@@@@@@@@@$!!!!!!$@@@@@
+@@@@@@?!!!!!?@@@@@@@@@@@@@@&O$$$%%%%$$$OO#&@@O%?!&@@@@@@@@@?!!!!!?@@@@OOO@@@@@@@@@&!!!!!!!&@@@@@
+@@@@@@?!!!!!?@@@@@@@@@$%?!!!!!!!!!!!!!!!!!!!?%O#@@#@@@@@@@@@@?!!!!!?@@@@#!!%&@@@@@@@%!!!!!!O@@@@@@
+@@@@@@?!!!!!?@@@@@@#$?!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%$&@@@@@@@@@?!!!!!?@@@@@#!!%@@@@@@@O!!$&$$@@@@@@@
+@@@@@@?!!!!!?@@@O%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!?$#@@@@@@?!!!!!?@@@@@@O!!?@@@@@@@&&@#O@@@@@@&&
+@@@@@@?!!!?O$?!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!?$#@@@$?!!!!?@@@@@@@&%!?$#@@@@@&O#@@@@@#O&@
+@@@@@@?!?O%!!!!!!!!!??%%$$$OOOOOOOOOO$$%%??!!!!!!!!!!!!!!!?%O&&&O$%%@@@@@@@@@#%?%####O#@@@$$#@@@
+@@@@@@%O%!!!!!?%$O#&&@@@@@@@@@@@@@@@@@@@@@&O$%?!!!!!!!!!!!!!?$O&&&@@@@@@@@@@@&&&&&&&$%?%#@@@@@
+@@@@@@%!!!?$#&&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&O%?!!!!!!!!!!!!??%$OOO#######OO$%??!!?%#@@@@@@@
+@@@@@&$!?%O&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@O$%?!!!!!!!!!!!!!!!!!!!!!!!!!?$#&@@@@@@@@@
+@@@@O?%O&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@OO$%????!!!!!!!!??%%O#&@@@@@@@@@@@@@
+@@&$$&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&&&&&&&&&@@@@@@@@@@@@@@@@@@@@
+@#O&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+&&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/banner.txt
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/banner.txt (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/banner.txt (revision 5974)
@@ -0,0 +1,31 @@
+@@@@@@O$$$$$$@@@@@@#$$$$$$&@#$$$$$$$$$$$$$$$&@O$$$$$$&@@@@@@@@@$$$$$$O@@@@@@@@@@@O$$%$O@@@@@@@@@@@@@
+@@@@@@?!!!!!!#@@@@@O!!!!!!#@$!!!!!!!!!!!!!!!#@%!!!!!!?&@@@@@@@$!!!!!!?@@@@@@@@&O#&&&&%??$#@@@@@@@@@@
+@@@@@@?!!!!!!?@@@@@O!!!!!!#@$!!!!!!!!!!!!!!!#@%!!!!!!!%@@@@@@O!!!!!!!?@@@@@@@O#@@&%??!!!!!$@@@@@@@@@
+@@@@@@?!!!!!!!O@@@@O!!!!!!#@$!!!!!!?????????&@%!!!!!!!!$@@@@#!!!!!!!!?@@@@@&O&@&&O$$?!!!!!!%&@@@@@@@
+@@@@@@?!!!!!!!!#@@@O!!!!!!#@$!!!!!!#&&&&&&&&@@%!!!!!!!!!$@@&?!!!!!!!!?@@@@@O&@&??&@@&O!!!!!!%@@@@@@@
+@@@@@@?!!!!!!!!?&@@O!!!!!!#@$!!!!!!#@@@@@@@@@@%!!!!!!!!!!O@%!!!!!!!!!?@@@@O&@@O!O@@@@&O!!!!!!$@@@@@@
+@@@@@@?!!!!!!!!!?#@O!!!!!!#@$!!!!!!#@@@@@@@@@@%!!!!!!!!!!!%!!!!!!!!!!?@@@&O@@$!!O&@@@@&O!!!!!!#@@@@@
+@@@@@@?!!!!!!!!!!!OO!!!!!!#@$!!!!!!$OOOOO@@@@@%!!!!!!!!!!!!!!!!!!!!!!?@@@O@&%!!!!!%#&&@&?!!!!!%@@@@@
+@@@@@@?!!!!!!!!!!!!!!!!!!!#@$!!!!!!!!!!!?@@@@@%!!!!!!!!!!!!!!!!!!!!!!?@@@O&!!!!!!%%eO&@$!!!!!!%&@@@@
+@@@@@@?!!!!!!!!!!!!!!!!!!!#@$!!!!!!!!!!!?@@@@@%!!!!!!!!!!!!!!!!!!!!!!?@@&&$!!!?$O$Oe$@@!!!!!!eO#@@@@
+@@@@@@?!!!!!!!!!!!!!!!!!!!#@$!!!!!!?%%%%$@@@@@%!!!!!!!!!!!!!!!!!!!!!!?@@O&!!!!$&$#%!#@@?!!!!!!$O@@@@
+@@@@@@?!!!!!!!!!!!!!!!!!!!#@$!!!!!!#@@@@@@@@@@%!!!!!!!!!!!!!!!!!!!!!!?@@O&!!!!%?O@%&&&@$!!!!!!?O@@@@
+@@@@@@?!!!!!?#!!!!!!!!!!!!#@$!!!!!!#@@@@@@@@@@%!!!!!!#!!!!!!!!O?!!!!!?@@O#!!!!!!?@@@@@OO!!!!$e?O@@@@
+@@@@@@?!!!!!?@#?!!!!!!!!!!#@$!!!!!!#@@@@@@@@@@%!!!!!!!!!!!!%&?!!!!!?@@OOO?!!!%%@@@@@#?!%$#O%%$@@@@
+@@@@@@?!!!!!?@@&%!!!!!!!!!#@$!!!!!!?????????&@%!!!!!!&@O!!!!?&@?!!!!!?@@##%$&&&@@@@@@$%#&O!??O@@@@
+@@@@@@?!!!!!?@@@@#?!!!!!!!#@$!!!!!!!!!!!!!!!#@%!!!!!!&@@$!!!&@@?!!!!!?@@$&@@@@@@@@@@@?O%%?!!!#@@@@
+@@@@@@?!!!!!?@@@@@@#%!!!!!#@$!!!!!!!!!!!!!!!#@%!!!!!!&@@@$!O@@@?!!!!!?@@@O#&&@@@@@@@@@@O?!!!!!?&@@@@
+@@@@@@?!!!!!?@@@@@@@@&O$%%#@#O##&&&&&&&#OO&@$!!!!!!&@@@@O@@@@?!!!!!?@@@O&&@@@@@@@@@$!!!!!!$@@@@@
+@@@@@@?!!!!!?@@@@@@@@@@@@@@&O$$$%%%%$$$OO#&@@O%?!&@@@@@@@@@?!!!!!?@@@@OOO@@@@@@@@@&!!!!!!!&@@@@@
+@@@@@@?!!!!!?@@@@@@@@@$%?!!!!!!!!!!!!!!!!!!!?%O#@@#@@@@@@@@@@?!!!!!?@@@@#!!%&@@@@@@@%!!!!!!O@@@@@@
+@@@@@@?!!!!!?@@@@@@#$?!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%$&@@@@@@@@@?!!!!!?@@@@@#!!%@@@@@@@O!!$&$$@@@@@@@
+@@@@@@?!!!!!?@@@O%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!?$#@@@@@@?!!!!!?@@@@@@O!!?@@@@@@@&&@#O@@@@@@&&
+@@@@@@?!!!?O$?!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!?$#@@@$?!!!!?@@@@@@@&%!?$#@@@@@&O#@@@@@#O&@
+@@@@@@?!?O%!!!!!!!!!??%%$$$OOOOOOOOOO$$%%??!!!!!!!!!!!!!!!?%O&&&O$%%@@@@@@@@@#%?%####O#@@@$$#@@@
+@@@@@@%O%!!!!!?%$O#&&@@@@@@@@@@@@@@@@@@@@@&O$%?!!!!!!!!!!!!!?$O&&&@@@@@@@@@@@&&&&&&&$%?%#@@@@@
+@@@@@@%!!!?$#&&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&O%?!!!!!!!!!!!!??%$OOO#######OO$%??!!?%#@@@@@@@
+@@@@@&$!?%O&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@O$%?!!!!!!!!!!!!!!!!!!!!!!!!!?$#&@@@@@@@@@
+@@@@O?%O&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@OO$%????!!!!!!!!??%%O#&@@@@@@@@@@@@@
+@@&$$&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&&&&&&&&&@@@@@@@@@@@@@@@@@@@@
+@#O&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+&&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/svn_abstract.awk
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/svn_abstract.awk (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/svn_abstract.awk (revision 5974)
@@ -0,0 +1,34 @@
+#!/bin/awk
+
+BEGIN{}
+
+func relative_path() { sub(/.*NEMOGCM\/[[:upper:]]*\//,//); return substr($0,2) }
+
+func array_loop(action,nb,array) {
+ if ( nb != 0 ) {
+ printf("\n%-10s: %3d\n\t",action,nb)
+ j = 0
+ for (i in array) {
+ j += 1
+ printf("%-45s\t",array[i])
+ if ( j % 3 == 0 && j != nb ) { printf"\n\t" }
+ }
+ }
+}
+
+/^A[[:upper:] ]/ { acount += 1; aroutines[acount] = relative_path() }
+/^C[[:upper:] ]/ { ccount += 1; croutines[ccount] = relative_path() }
+/^D[[:upper:] ]/ { dcount += 1; droutines[dcount] = relative_path() }
+/^E[[:upper:] ]/ { ecount += 1; eroutines[ecount] = relative_path() }
+/^G[[:upper:] ]/ { gcount += 1; groutines[gcount] = relative_path() }
+/^U[[:upper:] ]/ { ucount += 1; uroutines[ucount] = relative_path() }
+
+END{
+ array_loop("added", acount,aroutines)
+ array_loop("conflicted",ccount,croutines)
+ array_loop("deleted", dcount,droutines)
+ array_loop("edited", ecount,eroutines)
+ array_loop("merged", gcount,groutines)
+ array_loop("updated", ucount,uroutines)
+ printf "\n"
+}
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/trusting.env
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/trusting.env (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/trusting.env (revision 5974)
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+
+## Global environment variables
+##--------------------------------------
+dat=$( date )
+export DATE=$( date -ud "$dat" +"%Y%m%d%Z%H%M" )
+export PATTERNAME=${TRUS_USER}'_'${TRUS_HPCC}
+export TRUS_SVNH='https://forge.ipsl.jussieu.fr/nemo/svn'
+
+
+## Source user configuration
+##---------------------------------------------------
+. ./config/${TRUS_USER}.cfg
+export TRUS_WORK TRUS_SCRA TRUS_STOR TRUS_XIOS TRUS_FORC
+export TRUS_BRAN TRUS_REFE
+export TRUS_CONF TRUS_TARF TRUS_KEYA TRUS_KEYD
+export TRUS_MAIL
+
+
+## Source (super)computer configuration
+##---------------------------------------------------
+. ./config/${TRUS_HPCC}.cfg
+export TRUS_ENVI TRUS_CDOD TRUS_NPRO TRUS_TOUT
+export TRUS_JSPT TRUS_JSUB TRUS_JSTA TRUS_JKIL
+export TRUS_JPME TRUS_JTIM TRUS_JVME TRUS_JINF
+export TRUS_CMPV TRUS_CDOR TRUS_MPIR TRUS_CDFR
+
+
+export TRUS_NGCM=${TRUS_WORK}/${TRUS_BRAN}/NEMOGCM
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/trusting_func.sh
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/trusting_func.sh (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/trusting_func.sh (revision 5974)
@@ -0,0 +1,427 @@
+#!/bin/bash
+
+
+## Messenger filenames
+FILE_DATE=mesg_01_date_$PATTERNAME.txt ; FILE_RSLT=mesg_02_result_$PATTERNAME.txt
+FILE_STAT=mesg_03_state_$PATTERNAME.txt ; FILE_NEMO=mesg_04_nemo_$PATTERNAME.txt
+FILE_XIOS=mesg_05_xios_$PATTERNAME.txt ; FILE_CMPF=mesg_06_compiler_$PATTERNAME.txt
+FILE_LMPI=mesg_07_mpi_$PATTERNAME.txt ; FILE_NCDF=mesg_08_netcdf_$PATTERNAME.txt
+FILE_INPT=mesg_09_inputs_$PATTERNAME.txt; FILE_TIME=mesg_10_time_$PATTERNAME.txt
+FILE_MEMY=mesg_11_memory_$PATTERNAME.txt; FILE_NOTE=mesg_12_comments_$PATTERNAME.txt
+
+## Trusting timestamped logfile & archive
+TRUS_FILE=trusting_${DATE}_$PATTERNAME.txt; TRUS_ARCH=trusting_${DATE}_$PATTERNAME.tgz
+
+
+## Functions in order of use
+print_step() {
+ local char_nb=$( echo "$1" | wc -c )
+ local outline=$( printf "%${char_nb}s" )
+
+ printf "\nStep.....\n%s\n%s\n" "$1" ${outline// /-}
+}
+
+init_files() {
+ echo 'Date' > ${FILE_DATE}; echo 'Result' > ${FILE_RSLT}
+ echo 'State' > ${FILE_STAT}; echo 'NEMOGCM rev.' > ${FILE_NEMO}
+ echo 'XIOS rev.' > ${FILE_XIOS}; echo 'Fortran compiler' > ${FILE_CMPF}
+ echo 'MPI libs' > ${FILE_LMPI}; echo 'NetCDF libs' > ${FILE_NCDF}
+ echo 'Input files' > ${FILE_INPT}; echo 'Elapsed time' > ${FILE_TIME}
+ echo 'Memory usage (P/V)' > ${FILE_MEMY}; echo 'Comments' > ${FILE_NOTE}
+
+ ## 'Failed' status with 'Unknown error' by default
+ echo ${TRUS_RSLT} \
+ >> ${FILE_RSLT}
+ echo 'Unknown error' \
+ >> ${FILE_STAT}
+}
+
+get_date() {
+ ## UTC time zone for timestamping
+ local dat=$( date -ud "${DATE}" +"%F %R %Z" )
+
+ echo $dat \
+ >> ${FILE_DATE}
+}
+
+get_nemo_rev() {
+ local dir rev_loc
+ local rev=0
+
+ ## Loop on essential NEMO directories
+ for dir in ${TRUS_CKOT} ${TRUS_XIOS}; do
+
+ ## For time being, just get revision from XIOS with no action on directory
+ if [ $dir == ${TRUS_XIOS} ]; then
+ rev_loc=$( svn info $dir | awk '/Last Changed Rev/ {print $NF}' )
+ echo 'XIOS '${rev_loc} \
+ >> model.log
+ echo "${rev_loc}" \
+ >> ${FILE_XIOS}
+ continue
+ fi
+
+ echo $dir && ${TRUS_SVNA} ${TRUS_NGCM}/$dir
+ rev_loc=$( svn info ${TRUS_NGCM}/$dir | awk '/Last Changed Rev/ {print $NF}' )
+
+ ## Keep last rev. nb
+ [ ${rev_loc} -gt $rev ] && rev=${rev_loc}
+ done
+
+ echo 'NEMOGCM '$rev \
+ >> model.log
+ echo "$rev" \
+ >> ${FILE_NEMO}
+}
+
+get_soft_rel() {
+ local soft_rel str
+
+ ## Sourcing environment
+ if [ -n "${TRUS_ENVI}" ]; then
+ if [[ -e ${TRUS_ENVI}.env && $( declare -F | grep ' module' ) ]]; then
+ ## .env file if module function is available
+ . ${TRUS_ENVI}.env
+ else
+ ## .path file if existing, if not the given file
+ [ -e ${TRUS_ENVI}.path ] && . ${TRUS_ENVI}.path || . ${TRUS_ENVI}
+ fi
+ fi
+
+ ## Problem with `prepend-path` of modulefile that use ':' instead of ' ' as delimiter
+ [ $TRUS_HPCC == 'X64_ADA' ] && WRAPPER_LDFLAGS='-L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem '${WRAPPER_LDFLAGS}
+
+ for str in ${TRUS_CMPV} ${TRUS_MPIR} ${TRUS_CDFR} ${TRUS_CDOR}; do
+ [ -z "$str" ] && continue
+ soft_rel=''
+
+ ## Software release: next word after "$soft" in $PATH (case-insensitive)
+ soft_rel=$( echo $PATH | sed "s#.*$str\([0-9.a-z_]*\).*#\1#i" )
+
+ ## option --version would work for main compilers (gfortran, intel, pgfortran, ...)
+ [ $str == ${TRUS_CMPV} ] && soft_rel=$( $str --version | grep -m1 -oe '\<[0-9. ]*\>' )
+
+ ## Cleaning characters string to display proper soft name
+ str=$( echo $str | sed 's#\\##g; s#[/-]$##' )
+
+ echo $str ${soft_rel} \
+ >> model.log
+ done
+
+ sed -n 3p model.log \
+ >> ${FILE_CMPF}
+ sed -n 4p model.log \
+ >> ${FILE_LMPI}
+ sed -n 5p model.log \
+ >> ${FILE_NCDF}
+}
+
+get_inputs() {
+ ## Extract archive or copy files in case of personal inputs
+ [ -z "${TRUS_TARF}" ] && get_io="cp ${TRUS_FORC}/* ." || get_io="tar -vxf ${TRUS_FORC}/${TRUS_TARF}"
+
+ ${get_io} > /dev/null
+ [ $? -ne 0 ] && get_out 3 || echo 'Success'
+ [ $( find -name '*.gz' -print -quit ) ] && gunzip *.gz
+
+ ls -lh > inputs_list.txt
+}
+
+diff_inputs() {
+ local dif file
+ local files_list='' mesg='Same'
+
+ ## Simple diff
+ for file in 'inputs_list.txt' *namelist_* *.xml cpp_*; do
+ dif=''
+
+ ## Continue even if input file is not in here (see after)
+ if [ -e ${TRUS_STOR}/$file ]; then dif=$( diff -q $file ${TRUS_STOR}/$file ); else dif=0; fi
+
+ ## Pass over useless file omission in benckmark directory
+ [[ -n "$dif" && "$dif" != '0' ]] && { mesg='Different'; echo $dif; files_list+=$file' '; }
+ done
+
+ [ $mesg == 'Same' ] && echo $mesg
+ echo $mesg \
+ >> ${FILE_INPT}
+
+ ## List different files for web comment
+ [ -n "${files_list}" ] && echo 'Inputs : '${files_list}'differ
' \
+ >> temp_${FILE_NOTE}
+}
+
+job_pending() {
+ local outline=$( printf "%100s" ) time_elapsed=0 time_increment=30
+
+ sleep ${time_increment}
+
+ ## Append a log file while pending
+ while [[ $( eval ${TRUS_JSTA} ) && ${time_elapsed} -lt ${TRUS_TOUT} ]]; do
+ printf "\n%s\n" ${outline// /#} \
+ >> computation.log
+ [ -n "${TRUS_JINF}" ] && eval ${JOB_INFO} \
+ >> computation.log
+ sleep ${time_increment}
+ time_elapsed=$(( ${time_elapsed} + ${time_increment} ))
+ done
+
+ sleep ${time_increment}
+
+ ## Kill remaining job & stop the test if it's too long
+ [ ${time_elapsed} -eq ${TRUS_TOUT} ] && { eval ${JOB_DELE} &> /dev/null; get_out 6; }
+}
+
+diff_results() {
+ local file
+ local files_list='' mesg='Same'
+
+ ## Simple diff
+ for file in 'ocean.output' *.stat; do
+ ## Stop if no benchmark files (ocean.output, eventual stat files)
+ [ ! -e ${TRUS_STOR}/$file ] && { TRUS_RSLT='FAILED'; get_out 7; }
+
+ diff -q $file ${TRUS_STOR}/$file
+
+ ## Continue even if it differs
+ [ $? -ne 0 ] && { TRUS_RSLT='FAILED'; mesg='Different'; files_list+=$file' '; }
+ done
+
+ [ $mesg == 'Same' ] && echo $mesg
+
+ ## List different files for web comment
+ [ -n "${files_list}" ] && echo 'Results : '${files_list}'differ
' \
+ >> temp_${FILE_NOTE}
+}
+
+diff_restart() {
+ local base_name comp dif file list_comp list_tmsp nb_dom time_step tmsp
+ local files_list='' dif_sum=0
+
+ ## Stop if no benchmark files (ie time.step)
+ [ ! -e ${TRUS_STOR}/time.step ] && { TRUS_RSLT='FAILED'; get_out 7; }
+ time_step=$( cat ${TRUS_STOR}/time.step | tr -d [:space:] )
+
+ ## Find all restart files to rebuild
+ if [ $( find -regex ".*_restart.*[0-9]\.nc" -print -quit ) ]; then
+ base_name=$( find -regex ".*_restart.*[0-9]\.nc" \
+ | sed "s#^\./\(.*\)_[0-9]*_restart.*#\1#" | sort -u )
+ list_comp=$( find -regex ".*_restart.*[0-9]\.nc" \
+ | sed "s#^.*\(restart[a-z_]*\)_[0-9].*\.nc#\1#" | sort -u )
+ list_tmsp=$( find -regex ".*_restart.*[0-9]\.nc" \
+ | sed "s#^.*\([0-9]\{8\}\)_restart.*#\1#" | sort -u )
+
+ ## Loop on each time step
+ for tmsp in ${list_tmsp}; do
+
+ for comp in ${list_comp}; do
+ file=${base_name}_${tmsp}_${comp}
+ nb_dom=$( find -name "${file}_[0-9]*.nc" | wc -l | awk '{ print $1 }' )
+
+ if [ ${nb_dom} -gt 1 ]; then
+ ${TRUS_NGCM}/TOOLS/REBUILD_NEMO/rebuild_nemo -t ${TRUS_NPRO} $file ${nb_dom} \
+ > /dev/null
+
+ ## Possibility of remaining decomposed restarts (even after rebuild)
+ [ $? -eq 0 ] && rm -f ${file}_[0-9]*.nc \
+ > /dev/null
+
+ elif [ ${nb_dom} -eq 0 ]; then
+ TRUS_RSLT='FAILED' && get_out 8
+ fi
+
+ ## Compare restart files at same time step
+ if [ $tmsp -eq ${time_step} ]; then
+
+ ## Stop if no benchmark files (restart file)
+ if [ -e ${TRUS_STOR}/$file.nc ]; then
+
+ ## UNIX `cmp` not suitable (timestamp in .nc file)
+ dif=$( $TRUS_CDOD $file.nc ${TRUS_STOR}/$file.nc 2> /dev/null \
+ | awk '/records/ {print $0}' | sed '2 s/^/,/' | tr -d '\n' )
+
+ ## CDO can return void stdout with no difference
+ if [[ -n "$dif" && $( echo $dif | awk '{print $1}' ) -ne 0 ]]; then
+ TRUS_RSLT='FAILED'
+ files_list+=$comp' ' && let dif_sum+=$( echo $dif | awk '{print $1}' )
+ echo $file.nc': '$dif
+ fi
+
+ else
+ TRUS_RSLT='FAILED' && get_out 7
+ fi
+
+ else
+ continue
+ fi
+
+ done
+
+ done
+
+ ## List different files for web comment with sum of different records
+ if [ ${dif_sum} -ne 0 ]; then
+ echo 'Restarts: '${files_list}${dif_sum}' record(s) differ
' \
+ >> temp_${FILE_NOTE}
+ else
+ echo 'Same'
+ fi
+
+ else
+ TRUS_RSLT='FAILED'
+ fi
+
+}
+
+get_time() {
+ [ -z "${TRUS_JTIM}" ] && return
+
+ ## Interest for checking unusual time computation
+ local time_cpu=$( eval ${TRUS_JTIM} )
+
+ printf "Elapsed time: "
+ echo ${time_cpu} | tee -a ${FILE_TIME}
+}
+
+get_memy() {
+ [[ -z "${TRUS_JPME}" && -z "${TRUS_JVME}" ]] && return
+
+ ## Interest for checking unusual memory usage
+ local memory_pmax=$( eval ${TRUS_JPME} ) memory_vmax=$( eval ${TRUS_JVME} )
+
+ printf "Memory max usage (physical/virtual): "
+ echo ${memory_pmax}' / '${memory_vmax} | tee -a ${FILE_MEMY}
+}
+
+comments() {
+ local opat
+ local line='' state=$1
+
+ if [ -e ocean.output ]; then
+ ## 'W A R N I N G' pattern by default
+ opat="-A2 \"^ $state\""
+ [ "$state" == 'E R R O R' ] && opat="-A4 \"$state\""
+
+ ## Select first occurence for web comment
+ line=$( eval grep -m1 $opat ocean.output | tr -d '\n' )
+ fi
+
+ [ -n "$line" ] && ( echo $line; printf "$line
" \
+ >> temp_${FILE_NOTE} )
+}
+
+log_make() {
+ ## Format comments for web
+ [ -e temp_${FILE_NOTE} ] && cat temp_${FILE_NOTE} | tr -d '\n' | sed 's/
$//' \
+ >> ${FILE_NOTE}
+
+ ## Construct txt file with all messenger files
+ paste -d ';' mesg_*.txt | tee ${TRUS_FILE}
+}
+
+prod_publish() {
+ local cmd
+ local rev=$( awk '/NEMOGCM/ {print $NF}' model.log )
+
+ ## Production mode (-p|--prod)
+ if [ ${TRUS_PROD} -eq 1 ]; then
+
+ ## Create or append trusting logfile
+ if [ -f ${TRUS_STOR}/trusting_$PATTERNAME.txt ]; then cmd='tail -1'; else cmd='cat'; fi
+
+ $cmd ${TRUS_FILE} \
+ >> ${TRUS_STOR}/trusting_$PATTERNAME.txt
+
+ ## Send mail only when FAILED
+ if [[ ! -z "${TRUS_MAIL}" && ${TRUS_RSLT} == 'FAILED' ]]; then
+
+ ## Content
+ cat < trusting.mail
+Dear all,
+
+
+The trusting sequence has not completed successfully on new configuration ${TRUS_CONF} based on ${TRUS_REFE}.
+
+Here is the model summary:
+`cat model.log`
+
+First checking would be on the trusting environment files:
+${TRUS_USER}.cfg & ${TRUS_HPCC}.cfg
+
+For more details, look into the testing folder at:
+${TRUS_SCRA}
+
+An archive has been created to share the questionable configuration for further studies:
+${TRUS_STOR}/${TRUS_ARCH}
+
+END_MAIL
+
+ ## Send with detailed subject
+ mail -s "[NEMO Trusting][$rev][${TRUS_BRAN}][${TRUS_REFE}] ${TRUS_RSLT} ${TRUS_RORR}" ${TRUS_MAIL} \
+ < trusting.mail
+ fi
+
+ fi
+}
+
+get_out() {
+ local time_step=0
+
+ TRUS_RORR=$1
+
+ printf "\n\nEnd of test\n"
+
+ ## In case of compilation error
+ cd ${TRUS_SCRA}
+
+ if [ ${TRUS_RSLT} == 'FAILED' ]; then
+ echo 'Failure'
+
+ ## Error identification
+ case ${TRUS_RORR} in
+ ## Compilation
+ '1') TRUS_RORR='XIOS compilation failed' ;; '2') TRUS_RORR='NEMO compilation failed';;
+ ## Submission
+ '3') TRUS_RORR='Missing input files' ;; '4') TRUS_RORR='Job submission error' ;;
+ ## Computation
+ '5') TRUS_RORR='Crashed at time step' ;; '6') TRUS_RORR='Exceeded time limit' ;;
+ ## Results
+ '7') TRUS_RORR='Missing previous outputs';; '8') TRUS_RORR='New outputs differ' ;;
+ ## Other
+ '*') TRUS_RORR='Unknown error' ;;
+ esac
+
+ else
+ echo 'Success' && TRUS_RORR='Code is reliable'
+ fi
+
+ ## Eventual comments from ocean.output
+ if [ "${TRUS_RORR}" == 'Crashed at time step' ]; then
+ comments 'E R R O R'
+ [ -e time.step ] && time_step=$( grep -o [0-9]* time.step )
+ TRUS_RORR+=' '$time_step
+ else
+ comments 'W A R N I N G'
+ [ "${TRUS_RORR}" == 'Exceeded time limit' ] && TRUS_RORR+=' '$(( ${TRUS_TOUT}/3600 ))'h'
+ fi
+
+ ## Last messenger files
+ #export TRUS_RORR
+ sed -i "2 s/.*/$TRUS_RSLT/" ${FILE_RSLT}; sed -i "2 s/.*/$TRUS_RORR/" ${FILE_STAT}
+
+ ## Save tested configuration if trusting failed in production mode (-p|--prod)
+ if [[ ${TRUS_RSLT} == 'FAILED' && ${TRUS_PROD} -eq 1 ]]; then
+ echo 'Creating archive '${TRUS_ARCH}' under '${TRUS_STOR}
+ tar -czf ${TRUS_STOR}/${TRUS_ARCH} * \
+ -C ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/MY_SRC . \
+ -C ${TRUS_NGCM}/CONFIG/${TRUS_CONF} cpp_${TRUS_CONF}.fcm
+ fi
+
+ ## Logfile construct & eventual sending of notification email
+ printf "\nTrusting digest:\n----------------\n"
+ log_make
+ prod_publish
+
+ exit 0
+}
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/trusting_help.txt
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/trusting_help.txt (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inc/trusting_help.txt (revision 5974)
@@ -0,0 +1,42 @@
+Usage: ./trusting.sh -u $USER -m $ARCH [OPTIONS]
+ ./install_new_branch -u $USER -m $ARCH [OPTIONS]
+
+./trusting.sh Launch trusting test on $ARCH machine from $USER installation
+./install_new_branch Install new branch in $USER installation for trusting test on $ARCH machine
+
+Examples: `./trusting.sh -u romr005 -m X64_CURIE -p -b nemo_v3_6_STABLE`
+ `./install_new_branch -u romr005 -m X64_ADA -w $HOME/NEMO `
+
+Mandatory
+ Default settings to source in ./config, templates (arch_template.cfg & user_template.cfg)
+ -m,--machine Architecture environment (compilation & computation settings)
+ -u,--user User "" (NEMO & XIOS installation)
+
+
+Options (modify default settings)
+SVN
+ -b,--branch Branch name in working directory ('trunk'|'nemo_v3_6_stable'|...)
+ -v,--version Action on working copy ('status' by default)
+ '{'YYYY-MM-DD'}' Update to revision available at this date
+ [0-9]* "" "" "" number
+ HEAD|up|update "" "" last revision
+ st|status Show differences with repository
+ -w,--workdir Installation directory for testing branches
+
+Inputs
+ -a,--archive Forcing input files archive to extract, if void it will copy all files from given folder (see next line)
+ -f,--forcdir Path to your personal folder of forcing inputs
+
+Testing configuration
+ -n,--new_conf Testing configuration folder created in ./CONFIG
+ -r,--ref_conf Reference " " for trusting test
+
+Compiling & computation
+ -j,--job Number of processes for compiling
+ -t,--time Timeout for computation (s)
+
+Trusting output
+ -d,--debug Verbose output for debugging purpose (`set -vx`)
+ -e,--email Email trusting digest report to following addresses only on failure
+ -h,--help Print this help & exit
+ -p,--prod Production mode (append trusting logfile)
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/AMM12/iodef.xml
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/AMM12/iodef.xml (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/AMM12/iodef.xml (revision 5974)
@@ -0,0 +1,157 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10000000
+ 2
+ 0
+ false
+ false
+ oceanx
+
+
+
+
+
+
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/AMM12/namelist_cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/AMM12/namelist_cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/AMM12/namelist_cfg (revision 5974)
@@ -0,0 +1,434 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! NEMO/OPA : AMM12 configuration namelist used to overwrite defaults values defined in SHARED/namelist_ref
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!-----------------------------------------------------------------------
+&namrun ! parameters of the run
+!-----------------------------------------------------------------------
+ cn_exp = "AMM12_trust" ! experience name
+ nn_it000 = 1 ! first time step
+ nn_itend = 576 ! last time step (std 1 day = 144)
+ nn_date0 = 20120102 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+ nn_leapy = 1 ! Leap year calendar (1) or not (0)
+ ln_rstart = .true. ! start from rest (F) or from a restart file (T)
+ nn_euler = 1 ! = 0 : start with forward time step if ln_rstart=.true.
+ cn_ocerst_in = "amm12_restart_oce" ! suffix of ocean restart name (input)
+ cn_ocerst_out = "restart_oce_out" ! suffix of ocean restart name (input)
+ nn_stock = 1296 ! frequency of creation of a restart file (modulo referenced to 1)
+ nn_write = 144 ! frequency of write in the output file (modulo referenced to nit000)
+/
+!-----------------------------------------------------------------------
+&namcfg ! parameters of the configuration
+!-----------------------------------------------------------------------
+ cp_cfg = "amm" ! name of the configuration
+ jp_cfg = 011 ! resolution of the configuration
+ jpidta = 198 ! 1st lateral dimension ( >= jpi )
+ jpjdta = 224 ! 2nd " " ( >= jpj )
+ jpkdta = 51 ! number of levels ( >= jpk )
+ jpiglo = 198 ! 1st dimension of global domain --> i =jpidta
+ jpjglo = 224 ! 2nd - - --> j =jpjdta
+ jpizoom = 1 ! left bottom (i,j) indices of the zoom
+ jpjzoom = 1 ! in data domain indices
+ jperio = 0 ! lateral cond. type (between 0 and 6)
+/
+!-----------------------------------------------------------------------
+&namzgr ! vertical coordinate
+!-----------------------------------------------------------------------
+ ln_zps = .false. ! z-coordinate - partial steps (T/F)
+ ln_sco = .true. ! s- or hybrid z-s-coordinate (T/F)
+/
+!-----------------------------------------------------------------------
+&namzgr_sco ! s-coordinate or hybrid z-s-coordinate
+!-----------------------------------------------------------------------
+ ln_s_sh94 = .false. ! Song & Haidvogel 1994 hybrid S-sigma (T)|
+ ln_s_sf12 = .true. ! Siddorn & Furner 2012 hybrid S-z-sigma (T)| if both are false the NEMO tanh stretching is applied
+ ln_sigcrit = .true. ! use sigma coordinates below critical depth (T) or Z coordinates (F) for Siddorn & Furner stretch
+ ! stretching coefficients for all functions
+ rn_hc = 50.0 ! critical depth for transition to stretched coordinates
+/
+!-----------------------------------------------------------------------
+&namdom ! space and time domain (bathymetry, mesh, timestep)
+!-----------------------------------------------------------------------
+ nn_msh = 0 ! create (=1) a mesh file or not (=0)
+ rn_rdt = 600. ! time step for the dynamics (and tracer if nn_acc=0)
+ rn_rdtmin = 600. ! minimum time step on tracers (used if nn_acc=1)
+ rn_rdtmax = 600. ! maximum time step on tracers (used if nn_acc=1)
+ rn_rdth = 600. ! depth variation of tracer time step (used if nn_acc=1)
+ ppglam0 = 999999.0 ! longitude of first raw and column T-point (jphgr_msh = 1)
+ ppgphi0 = 999999.0 ! latitude of first raw and column T-point (jphgr_msh = 1)
+ ppe1_deg = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_deg = 999999.0 ! meridional grid-spacing (degrees)
+ ppe1_m = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_m = 999999.0 ! meridional grid-spacing (degrees)
+ ppsur = 999999.0 ! ORCA r4, r2 and r05 coefficients
+ ppa0 = 999999.0 ! (default coefficients)
+ ppa1 = 999999.0 !
+ ppkth = 23.563 !
+ ppacr = 9.0 !
+ ppdzmin = 6.0 ! Minimum vertical spacing
+ pphmax = 5720. ! Maximum depth
+ ldbletanh = .FALSE. ! Use/do not use double tanf function for vertical coordinates
+ ppa2 = 999999. ! Double tanh function parameters
+ ppkth2 = 999999. !
+ ppacr2 = 999999.
+/
+!-----------------------------------------------------------------------
+&namsplit ! time splitting parameters ("key_dynspg_ts")
+!-----------------------------------------------------------------------
+ ln_bt_nn_auto = .FALSE. ! Set nn_baro automatically to be just below
+ ! a user defined maximum courant number (rn_bt_cmax)
+ nn_baro = 30 ! Number of iterations of barotropic mode
+/
+!-----------------------------------------------------------------------
+&namcrs ! Grid coarsening for dynamics output and/or
+ ! passive tracer coarsened online simulations
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtsd ! data : Temperature & Salinity
+!-----------------------------------------------------------------------
+ ln_tsd_init = .false. ! Initialisation of ocean T & S with T &S input data (T) or not (F)
+ ln_tsd_tradmp = .false. ! damping of ocean T & S toward T &S input data (T) or not (F)
+/
+!-----------------------------------------------------------------------
+&namsbc ! Surface Boundary Condition (surface module)
+!-----------------------------------------------------------------------
+ nn_fsbc = 1 ! frequency of surface boundary condition computation
+ ! (also = the frequency of sea-ice model call)
+ ln_flx = .true. ! flux formulation (T => fill namsbc_flx )
+ ln_blk_core = .false. ! CORE bulk formulation (T => fill namsbc_core)
+ nn_ice = 0 ! =0 no ice boundary condition ,
+ ln_ssr = .false. ! Sea Surface Restoring on T and/or S (T => fill namsbc_ssr)
+ nn_fwb = 0 ! FreshWater Budget: =0 unchecked
+ ln_apr_dyn = .false. ! Patm gradient added in ocean & ice Eqs. (T => fill namsbc_apr )
+
+/
+!-----------------------------------------------------------------------
+&namsbc_ana ! analytical surface boundary condition
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_flx ! surface boundary condition : flux formulation
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_utau = 'amm12_utau' , 1 , 'utau' , .false. , .false. , 'daily' , '' , '' , ''
+ sn_vtau = 'amm12_vtau' , 1 , 'vtau' , .false. , .false. , 'daily' , '' , '' , ''
+ sn_qtot = 'amm12_flx' , 3 , 'sonsfldo' , .true. , .false. , 'daily' , '' , '' , ''
+ sn_qsr = 'amm12_flx' , 3 , 'soshfldo' , .true. , .false. , 'daily' , '' , '' , ''
+ sn_emp = 'amm12_flx' , 3 , 'sowafldo' , .true. , .false. , 'daily' , '' , '' , ''
+ cn_dir = './fluxes/' ! root directory for the location of the flux files
+/
+!-----------------------------------------------------------------------
+&namsbc_clio ! namsbc_clio CLIO bulk formulae
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_core ! namsbc_core CORE bulk formulae
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_mfs ! namsbc_mfs MFS bulk formulae
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_cpl ! coupled ocean/atmosphere model ("key_oasis3")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_qsr ! penetrative solar radiation
+!-----------------------------------------------------------------------
+ ln_traqsr = .false. ! Light penetration (T) or not (F)
+ nn_chldta = 0 ! RGB : Chl data (=1) or cst value (=0)
+/
+!-----------------------------------------------------------------------
+&namsbc_rnf ! runoffs namelist surface boundary condition
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_rnf = 'amm12_rivers' , 24 , 'rorunoff', .false. , .true. , 'yearly' , '' , '' , ''
+ sn_cnf = 'runoff_1m_nomask' , 0 , 'socoefr0', .false. , .true. , 'yearly' , '' , '' , ''
+ sn_s_rnf = 'amm12_rivers' , 24 , 'rosaline', .false. , .true. , 'yearly' , '' , '' , ''
+ sn_t_rnf = 'amm12_rivers' , 24 , 'rotemper', .false. , .true. , 'yearly' , '' , '' , ''
+ sn_dep_rnf = 'amm12_rivers' , 24 , 'rodepth' , .false. , .true. , 'yearly' , '' , '' , ''
+ ln_rnf_mouth = .false. ! specific treatment at rivers mouths
+ ln_rnf_depth = .true. ! read in depth information for runoff
+ ln_rnf_tem = .true. ! read in temperature information for runoff
+ ln_rnf_sal = .true. ! read in salinity information for runoff
+/
+!-----------------------------------------------------------------------
+&namsbc_apr ! Atmospheric pressure used as ocean forcing or in bulk
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_apr = 'amm12_mslp' , 1 , 'p_msl' , .false. , .false. , 'daily' , '' , '' , ''
+
+ cn_dir = './fluxes/' ! root directory for the location of the bulk files
+ rn_pref = 101000. ! reference atmospheric pressure [N/m2]/
+ ln_ref_apr = .false. ! ref. pressure: global mean Patm (T) or a constant (F)
+ ln_apr_obc = .true. ! inverse barometer added to OBC ssh data
+/
+!-----------------------------------------------------------------------
+&namsbc_ssr ! surface boundary condition : sea surface restoring
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_sst = 'amm12_sstref' , 24 , 'sst' , .true. , .false. , 'daily' , .false. , '' , '' , ''
+ sn_sss = 'sss_data' , -1 , 'sss' , .true. , .true. , 'yearly' , .false. , '' , '' , ''
+
+ cn_dir = 'fluxes/' ! root directory for the location of the runoff files
+ nn_sstr = 1 ! add a retroaction term in the surface heat flux (=1) or not (=0)
+ nn_sssr = 0 ! add a damping term in the surface freshwater flux (=2)
+ ! or to SSS only (=1) or no damping term (=0)
+ rn_deds = -27.7 ! magnitude of the damping on salinity [mm/day]
+/
+!-----------------------------------------------------------------------
+&namsbc_alb ! albedo parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namberg ! iceberg parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namlbc ! lateral momentum boundary condition
+!-----------------------------------------------------------------------
+ rn_shlat = 0 ! shlat = 0 ! 0 < shlat < 2 ! shlat = 2 ! 2 < shlat
+ ! free slip ! partial slip ! no slip ! strong slip
+/
+!-----------------------------------------------------------------------
+&namcla ! cross land advection
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namobc ! open boundaries parameters ("key_obc")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namagrif ! AGRIF zoom ("key_agrif")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nam_tide ! tide parameters (#ifdef key_tide)
+!-----------------------------------------------------------------------
+ clname(1) = 'Q1' ! name of constituent
+ clname(2) = 'O1'
+ clname(3) = 'P1'
+ clname(4) = 'S1'
+ clname(5) = 'K1'
+ clname(6) = '2N2'
+ clname(7) = 'MU2'
+ clname(8) = 'N2'
+ clname(9) = 'NU2'
+ clname(10) = 'M2'
+ clname(11) = 'L2'
+ clname(12) = 'T2'
+ clname(13) = 'S2'
+ clname(14) = 'K2'
+ clname(15) = 'M4'
+/
+!-----------------------------------------------------------------------
+&nambdy ! unstructured open boundaries ("key_bdy")
+ nb_bdy = 1
+ cn_dyn2d = 'flather'
+ nn_dyn2d_dta = 3
+ cn_tra = 'frs'
+ nn_tra_dta = 1
+/
+!-----------------------------------------------------------------------
+&nambdy_dta ! open boundaries - external data ("key_bdy")
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ bn_ssh = 'amm12_bdyT_dyn2d' , 24 , 'sossheig' , .true. , .false. , 'daily' , '' , '' , ''
+ bn_u2d = 'amm12_bdyU_dyn2d' , 24 , 'vobtcrtx' , .true. , .false. , 'daily' , '' , '' , ''
+ bn_v2d = 'amm12_bdyV_dyn2d' , 24 , 'vobtcrty' , .true. , .false. , 'daily' , '' , '' , ''
+ bn_u3d = 'amm12_bdyU_dyn3d' , 24 , 'vozocrtx' , .true. , .false. , 'daily' , '' , '' , ''
+ bn_v3d = 'amm12_bdyV_dyn3d' , 24 , 'vomecrty' , .true. , .false. , 'daily' , '' , '' , ''
+ bn_tem = 'amm12_bdyT_tra' , 24 , 'votemper' , .true. , .false. , 'daily' , '' , '' , ''
+ bn_sal = 'amm12_bdyT_tra' , 24 , 'vosaline' , .true. , .false. , 'daily' , '' , '' , ''
+ cn_dir = './bdydta/'
+ ln_full_vel = .false.
+/
+!-----------------------------------------------------------------------
+&nambdy_tide ! tidal forcing at open boundaries
+!-----------------------------------------------------------------------
+ filtide = 'bdydta/amm12_bdytide_' ! file name root of tidal forcing files
+/
+!-----------------------------------------------------------------------
+&nambfr ! bottom friction
+!-----------------------------------------------------------------------
+ nn_bfr = 2 ! type of bottom friction : = 0 : free slip, = 1 : linear friction
+ ! = 2 : nonlinear friction
+ rn_bfri2 = 2.5e-3 ! bottom drag coefficient (non linear case)
+ rn_bfeb2 = 0.0e0 ! bottom turbulent kinetic energy background (m2/s2)
+ ln_loglayer = .true. ! loglayer bottom friction (only effect when nn_bfr = 2)
+ rn_bfrz0 = 0.003 ! bottom roughness (only effect when ln_loglayer = .true.)
+/
+!-----------------------------------------------------------------------
+&nambbc ! bottom temperature boundary condition
+!-----------------------------------------------------------------------
+ ln_trabbc = .false. ! Apply a geothermal heating at the ocean bottom
+/
+!-----------------------------------------------------------------------
+&nambbl ! bottom boundary layer scheme
+!-----------------------------------------------------------------------
+ nn_bbl_ldf = 0 ! diffusive bbl (=1) or not (=0)
+/
+!-----------------------------------------------------------------------
+&nameos ! ocean physical parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_adv ! advection scheme for tracer
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param)
+!-----------------------------------------------------------------------
+/
+!----------------------------------------------------------------------------------
+&namtra_ldf ! lateral diffusion scheme for tracers
+!----------------------------------------------------------------------------------
+ ln_traldf_hor = .true. ! horizontal (geopotential) (needs "key_ldfslp" when ln_sco=T)
+ ln_traldf_iso = .false. ! iso-neutral (needs "key_ldfslp")
+ rn_aeiv_0 = 0. ! eddy induced velocity coefficient [m2/s]
+ rn_aht_0 = 50. ! horizontal eddy diffusivity for tracers [m2/s]
+/
+!-----------------------------------------------------------------------
+&namtra_dmp ! tracer: T & S newtonian damping
+!-----------------------------------------------------------------------
+ ln_tradmp = .false. ! add a damping termn (T) or not (F)
+/
+!-----------------------------------------------------------------------
+&namdyn_adv ! formulation of the momentum advection
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_vor ! option of physics/algorithm (not control by CPP keys)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_hpg ! Hydrostatic pressure gradient option
+!-----------------------------------------------------------------------
+ ln_hpg_zps = .false. ! z-coordinate - partial steps (interpolation)
+ ln_hpg_prj = .true. ! s-coordinate (Pressure Jacobian scheme)
+/
+!-----------------------------------------------------------------------
+!namdyn_spg ! surface pressure gradient (CPP key only)
+!-----------------------------------------------------------------------
+! ! explicit free surface ("key_dynspg_exp")
+! ! filtered free surface ("key_dynspg_flt")
+! ! split-explicit free surface ("key_dynspg_ts")
+
+!-----------------------------------------------------------------------
+&namdyn_ldf ! lateral diffusion on momentum
+!-----------------------------------------------------------------------
+ ! ! Type of the operator :
+ ln_dynldf_bilap = .true. ! bilaplacian operator
+ ln_dynldf_lap = .false. ! bilaplacian operator
+ ! ! Direction of action :
+ ln_dynldf_level = .true. ! iso-level
+ ln_dynldf_hor = .false. ! horizontal (geopotential) (require "key_ldfslp" in s-coord.)
+ ! Coefficient
+ rn_ahm_0_lap = 60.0 ! horizontal laplacian eddy viscosity [m2/s]
+ rn_ahm_0_blp = -1.0e+10 ! horizontal bilaplacian eddy viscosity [m4/s]
+/
+!-----------------------------------------------------------------------
+&namzdf ! vertical physics
+!-----------------------------------------------------------------------
+ rn_avm0 = 0.1e-6 ! vertical eddy viscosity [m2/s] (background Kz if not "key_zdfcst")
+ rn_avt0 = 0.1e-6 ! vertical eddy diffusivity [m2/s] (background Kz if not "key_zdfcst")
+ ln_zdfevd = .false. ! enhanced vertical diffusion (evd) (T) or not (F)
+ nn_evdm = 1 ! evd apply on tracer (=0) or on tracer and momentum (=1)
+/
+!-----------------------------------------------------------------------
+&namzdf_ric ! richardson number dependent vertical diffusion ("key_zdfric" )
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion ("key_zdftke")
+!-----------------------------------------------------------------------
+/
+!------------------------------------------------------------------------
+&namzdf_kpp ! K-Profile Parameterization dependent vertical mixing ("key_zdfkpp", and optionally:
+!------------------------------------------------------------------------ "key_kppcustom" or "key_kpplktb")
+/
+!-----------------------------------------------------------------------
+&namzdf_gls ! GLS vertical diffusion ("key_zdfgls")
+!-----------------------------------------------------------------------
+ rn_charn = 100000. ! Charnock constant for wb induced roughness length
+ nn_z0_met = 1 ! Method for surface roughness computation (0/1/2)
+/
+!-----------------------------------------------------------------------
+&namzdf_ddm ! double diffusive mixing parameterization ("key_zdfddm")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_tmx ! tidal mixing parameterization ("key_zdftmx")
+!-----------------------------------------------------------------------
+ ln_tmx_itf = .FALSE. ! ITF specific parameterisation
+/
+!-----------------------------------------------------------------------
+&namsol ! elliptic solver / island / free surface
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nammpp ! Massively Parallel Processing ("key_mpp_mpi)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namctl ! Control prints & Benchmark
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namnc4 ! netcdf4 chunking and compression settings ("key_netcdf4")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtrd ! diagnostics on dynamics and/or tracer trends ("key_trddyn" and/or "key_trdtra")
+! ! or mixed-layer trends or barotropic vorticity ("key_trdmld" or "key_trdvor")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namflo ! float parameters ("key_float")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namptr ! Poleward Transport Diagnostic
+!-----------------------------------------------------------------------
+/
+&namhsb ! Heat and salt budgets
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nam_diaharm ! Harmonic analysis of tidal constituents ('key_diaharm')
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdct ! transports through sections
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namobs ! observation usage switch ('key_diaobs')
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nam_asminc ! assimilation increments ('key_asminc')
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_wave ! External fields from wave model
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_nept ! Neptune effect (simplified: lateral and vertical diffusions removed)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsto ! Stochastic parametrization of EOS
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nam_vvl ! vertical coordinate options
+!-----------------------------------------------------------------------
+/
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/GYRE/iodef.xml
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/GYRE/iodef.xml (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/GYRE/iodef.xml (revision 5974)
@@ -0,0 +1,284 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ tdenit * 14. * 86400. * 365. / 1e12
+ tnfix * 14. * 86400. * 365. / 1e12
+ tcflx * -1. * 12. * 86400. * 365. / 1e15
+ tcflxcum * -1. * 12. / 1e15
+ tcexp * 12. * 86400. * 365. / 1e15
+ tintpp * 12. * 86400. * 365. / 1e15
+ pno3tot * 16. / 122. * 1e6
+ ppo4tot * 1. / 122. * 1e6
+ psiltot * 1e6
+ palktot * 1e6
+ pfertot * 1e9
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 50000000
+ 2
+ 0
+ false
+ false
+ oceanx
+
+
+
+
+
+
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/GYRE/namelist_cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/GYRE/namelist_cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/GYRE/namelist_cfg (revision 5974)
@@ -0,0 +1,375 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! NEMO/OPA : GYRE_PISCES Configuration namelist to overwrite reference dynamical namelist
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!-----------------------------------------------------------------------
+&namrun ! parameters of the run
+!-----------------------------------------------------------------------
+ cn_exp = 'GYRE_trust' ! experience name
+ nn_it000 = 1 ! first time step
+ nn_itend = 120 ! last time step
+ nn_stock = 60 ! frequency of creation of a restart file (modulo referenced to 1)
+/
+!-----------------------------------------------------------------------
+&namcfg ! parameters of the configuration
+!-----------------------------------------------------------------------
+ cp_cfg = "gyre" ! name of the configuration
+ jp_cfg = 1 ! resolution of the configuration
+ jpidta = 32 ! 1st lateral dimension ( >= jpi ) = 30*jp_cfg+2
+ jpjdta = 22 ! 2nd " " ( >= jpj ) = 20*jp_cfg+2
+ jpkdta = 31 ! number of levels ( >= jpk )
+ jpiglo = 32 ! 1st dimension of global domain --> i = jpidta
+ jpjglo = 22 ! 2nd - - --> j = jpjdta
+ jpizoom = 1 ! left bottom (i,j) indices of the zoom
+ jpjzoom = 1 ! in data domain indices
+ jperio = 0 ! lateral cond. type (between 0 and 6)
+/
+!-----------------------------------------------------------------------
+&namzgr ! vertical coordinate
+!-----------------------------------------------------------------------
+ ln_zco = .true. ! z-coordinate - full steps (T/F) ("key_zco" may also be defined)
+ ln_zps = .false. ! z-coordinate - partial steps (T/F)
+/
+!-----------------------------------------------------------------------
+&namzgr_sco ! s-coordinate or hybrid z-s-coordinate
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdom ! space and time domain (bathymetry, mesh, timestep)
+!-----------------------------------------------------------------------
+ nn_bathy = 0 ! compute (=0) or read (=1) the bathymetry file
+ rn_rdt = 7200. ! time step for the dynamics (and tracer if nn_acc=0)
+ rn_rdtmin = 7200. ! minimum time step on tracers (used if nn_acc=1)
+ rn_rdtmax = 7200. ! maximum time step on tracers (used if nn_acc=1)
+ jphgr_msh = 5 ! type of horizontal mesh
+ ppglam0 = 0.0 ! longitude of first raw and column T-point (jphgr_msh = 1)
+ ppgphi0 = 29.0 ! latitude of first raw and column T-point (jphgr_msh = 1)
+ ppe1_deg = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_deg = 999999.0 ! meridional grid-spacing (degrees)
+ ppe1_m = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_m = 999999.0 ! meridional grid-spacing (degrees)
+ ppsur = -2033.194295283385 ! ORCA r4, r2 and r05 coefficients
+ ppa0 = 155.8325369664153 ! (default coefficients)
+ ppa1 = 146.3615918601890 !
+ ppkth = 17.28520372419791 !
+ ppacr = 5.0 !
+ ppdzmin = 999999.0 ! Minimum vertical spacing
+ pphmax = 999999.0 ! Maximum depth
+ ldbletanh = .FALSE. ! Use/do not use double tanf function for vertical coordinates
+ ppa2 = 999999.0 ! Double tanh function parameters
+ ppkth2 = 999999.0 !
+ ppacr2 = 999999.0 !
+/
+!-----------------------------------------------------------------------
+&namsplit ! time splitting parameters ("key_dynspg_ts")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namcrs ! Grid coarsening for dynamics output and/or
+ ! passive tracer coarsened online simulations
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtsd ! data : Temperature & Salinity
+!-----------------------------------------------------------------------
+ cn_dir = './' ! root directory for the location of the runoff files
+ ln_tsd_init = .false. ! Initialisation of ocean T & S with T &S input data (T) or not (F)
+ ln_tsd_tradmp = .false. ! damping of ocean T & S toward T &S input data (T) or not (F)
+/
+!-----------------------------------------------------------------------
+&namsbc ! Surface Boundary Condition (surface module)
+!-----------------------------------------------------------------------
+ nn_fsbc = 1 ! frequency of surface boundary condition computation
+ ! ! (also = the frequency of sea-ice model call)
+ ln_ana = .true. ! analytical formulation (T => fill namsbc_ana )
+ ln_blk_core = .false. ! CORE bulk formulation (T => fill namsbc_core)
+ nn_ice = 0 ! =0 no ice boundary condition ,
+ ln_rnf = .false. ! runoffs (T => fill namsbc_rnf)
+ ln_ssr = .false. ! Sea Surface Restoring on T and/or S (T => fill namsbc_ssr)
+ nn_fwb = 0 ! FreshWater Budget: =0 unchecked
+/
+!-----------------------------------------------------------------------
+&namsbc_ana ! analytical surface boundary condition
+!-----------------------------------------------------------------------
+ nn_tau000 = 100 ! gently increase the stress over the first ntau_rst time-steps
+ rn_utau0 = 0.1e0 ! uniform value for the i-stress
+/
+!-----------------------------------------------------------------------
+&namsbc_flx ! surface boundary condition : flux formulation
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_clio ! namsbc_clio CLIO bulk formulae
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_core ! namsbc_core CORE bulk formulae
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_mfs ! namsbc_mfs MFS bulk formulae
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_cpl ! coupled ocean/atmosphere model ("key_oasis3")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_qsr ! penetrative solar radiation
+!-----------------------------------------------------------------------
+ ln_qsr_rgb = .false. ! RGB (Red-Green-Blue) light penetration
+ ln_qsr_2bd = .true. ! 2 bands light penetration
+ nn_chldta = 0 ! RGB : Chl data (=1) or cst value (=0)
+/
+!-----------------------------------------------------------------------
+&namsbc_rnf ! runoffs namelist surface boundary condition
+!-----------------------------------------------------------------------
+ ln_rnf_mouth = .false. ! specific treatment at rivers mouths
+/
+!-----------------------------------------------------------------------
+&namsbc_apr ! Atmospheric pressure used as ocean forcing or in bulk
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_ssr ! surface boundary condition : sea surface restoring
+!-----------------------------------------------------------------------
+ nn_sssr = 0 ! add a damping term in the surface freshwater flux (=2)
+ rn_deds = -27.7 ! magnitude of the damping on salinity [mm/day]
+ ln_sssr_bnd = .false. ! flag to bound erp term (associated with nn_sssr=2)
+/
+!-----------------------------------------------------------------------
+&namsbc_alb ! albedo parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namberg ! iceberg parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namlbc ! lateral momentum boundary condition
+!-----------------------------------------------------------------------
+ rn_shlat = 0. ! shlat = 0 ! 0 < shlat < 2 ! shlat = 2 ! 2 < shlat
+/
+!-----------------------------------------------------------------------
+&namcla ! cross land advection
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namobc ! open boundaries parameters ("key_obc")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namagrif ! AGRIF zoom ("key_agrif")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nam_tide ! tide parameters (#ifdef key_tide)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambdy ! unstructured open boundaries ("key_bdy")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambdy_dta ! open boundaries - external data ("key_bdy")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambdy_tide ! tidal forcing at open boundaries
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambfr ! bottom friction
+!-----------------------------------------------------------------------
+ nn_bfr = 2 ! type of bottom friction : = 0 : free slip, = 1 : linear friction
+/
+!-----------------------------------------------------------------------
+&nambbc ! bottom temperature boundary condition
+!-----------------------------------------------------------------------
+ ln_trabbc = .false. ! Apply a geothermal heating at the ocean bottom
+ nn_geoflx = 0 ! geothermal heat flux: = 0 no flux
+/
+!-----------------------------------------------------------------------
+&nambbl ! bottom boundary layer scheme
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nameos ! ocean physical parameters
+!-----------------------------------------------------------------------
+ nn_eos = 0 ! type of equation of state and Brunt-Vaisala frequency
+ ! =-1, TEOS-10
+ ! = 0, EOS-80
+ ! = 1, S-EOS (simplified eos)
+ ln_useCT = .false. ! use of Conservative Temp. ==> surface CT converted in Pot. Temp. in sbcssm
+ ! !
+ ! ! S-EOS coefficients :
+ ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ rn_a0 = 1.6550e-1 ! thermal expension coefficient (nn_eos= 1)
+ rn_b0 = 7.6554e-1 ! saline expension coefficient (nn_eos= 1)
+ rn_lambda1 = 5.9520e-2 ! cabbeling coeff in T^2 (=0 for linear eos)
+ rn_lambda2 = 7.4914e-4 ! cabbeling coeff in S^2 (=0 for linear eos)
+ rn_mu1 = 1.4970e-4 ! thermobaric coeff. in T (=0 for linear eos)
+ rn_mu2 = 1.1090e-5 ! thermobaric coeff. in S (=0 for linear eos)
+ rn_nu = 2.4341e-3 ! cabbeling coeff in T*S (=0 for linear eos)
+!!org GYRE rn_alpha = 2.0e-4 ! thermal expension coefficient (nn_eos= 1 or 2)
+!!org GYRE rn_beta = 7.7e-4 ! saline expension coefficient (nn_eos= 2)
+!!org caution now a0 = alpha / rau0 with rau0 = 1026
+/
+!-----------------------------------------------------------------------
+&namtra_adv ! advection scheme for tracer
+!-----------------------------------------------------------------------
+ ln_traadv_cen2 = .false. ! 2nd order centered scheme
+ ln_traadv_tvd = .true. ! TVD scheme
+ ln_traadv_muscl = .false. ! MUSCL scheme
+ ln_traadv_muscl2 = .false. ! MUSCL2 scheme + cen2 at boundaries
+ ln_traadv_ubs = .false. ! UBS scheme
+ ln_traadv_qck = .false. ! QUICKEST scheme
+ ln_traadv_msc_ups= .false. ! use upstream scheme within muscl
+/
+!-----------------------------------------------------------------------
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param)
+!-----------------------------------------------------------------------
+/
+!----------------------------------------------------------------------------------
+&namtra_ldf ! lateral diffusion scheme for tracers
+!----------------------------------------------------------------------------------
+ rn_aeiv_0 = 0. ! eddy induced velocity coefficient [m2/s]
+ rn_aht_0 = 1000. ! horizontal eddy diffusivity for tracers [m2/s]
+/
+!-----------------------------------------------------------------------
+&namtra_dmp ! tracer: T & S newtonian damping
+!-----------------------------------------------------------------------
+ ln_tradmp = .false. ! add a damping termn (T) or not (F)
+/
+!-----------------------------------------------------------------------
+&namdyn_adv ! formulation of the momentum advection
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_vor ! option of physics/algorithm (not control by CPP keys)
+!-----------------------------------------------------------------------
+ ln_dynvor_ene = .true. ! energy conserving scheme
+ ln_dynvor_ens = .false. ! enstrophy conserving scheme
+ ln_dynvor_een = .false. ! energy & enstrophy scheme
+/
+!-----------------------------------------------------------------------
+&namdyn_hpg ! Hydrostatic pressure gradient option
+!-----------------------------------------------------------------------
+ ln_hpg_zco = .true. ! z-coordinate - full steps
+ ln_hpg_zps = .false. ! z-coordinate - partial steps (interpolation)
+/
+!-----------------------------------------------------------------------
+!namdyn_spg ! surface pressure gradient (CPP key only)
+!-----------------------------------------------------------------------
+
+!-----------------------------------------------------------------------
+&namdyn_ldf ! lateral diffusion on momentum
+!-----------------------------------------------------------------------
+ rn_ahm_0_lap = 100000. ! horizontal laplacian eddy viscosity [m2/s]
+/
+!-----------------------------------------------------------------------
+&namzdf ! vertical physics
+!-----------------------------------------------------------------------
+ nn_evdm = 1 ! evd apply on tracer (=0) or on tracer and momentum (=1)
+/
+!-----------------------------------------------------------------------
+&namzdf_ric ! richardson number dependent vertical diffusion ("key_zdfric" )
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion ("key_zdftke")
+!-----------------------------------------------------------------------
+ nn_etau = 0 ! penetration of tke below the mixed layer (ML) due to internal & intertial waves
+/
+!------------------------------------------------------------------------
+&namzdf_kpp ! K-Profile Parameterization dependent vertical mixing ("key_zdfkpp", and optionally:
+!------------------------------------------------------------------------ "key_kppcustom" or "key_kpplktb")
+/
+!-----------------------------------------------------------------------
+&namzdf_gls ! GLS vertical diffusion ("key_zdfgls")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_ddm ! double diffusive mixing parameterization ("key_zdfddm")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_tmx ! tidal mixing parameterization ("key_zdftmx")
+!-----------------------------------------------------------------------
+ ln_tmx_itf = .false. ! ITF specific parameterisation
+/
+!-----------------------------------------------------------------------
+&namsol ! elliptic solver / island / free surface
+!-----------------------------------------------------------------------
+ nn_solv = 2 ! elliptic solver: =1 preconditioned conjugate gradient (pcg)
+ nn_nmin = 210 ! minimum of iterations for the SOR solver
+ rn_sor = 1.96 ! optimal coefficient for SOR solver (to be adjusted with the domain)
+/
+!-----------------------------------------------------------------------
+&nammpp ! Massively Parallel Processing ("key_mpp_mpi)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namctl ! Control prints & Benchmark
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namnc4 ! netcdf4 chunking and compression settings ("key_netcdf4")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtrd ! diagnostics on dynamics and/or tracer trends ("key_trddyn" and/or "key_trdtra")
+! ! or mixed-layer trends or barotropic vorticity ("key_trdmld" or "key_trdvor")
+!-----------------------------------------------------------------------
+ ln_glo_trd = .false. ! (T) global domain averaged diag for T, T^2, KE, and PE
+ ln_dyn_trd = .false. ! (T) 3D momentum trend output
+ ln_dyn_mxl = .FALSE. ! (T) 2D momentum trends averaged over the mixed layer (not coded yet)
+ ln_vor_trd = .FALSE. ! (T) 2D barotropic vorticity trends (not coded yet)
+ ln_KE_trd = .false. ! (T) 3D Kinetic Energy trends
+ ln_PE_trd = .false. ! (T) 3D Potential Energy trends
+ ln_tra_trd = .false. ! (T) 3D tracer trend output
+ ln_tra_mxl = .false. ! (T) 2D tracer trends averaged over the mixed layer (not coded yet)
+ nn_trd = 365 ! print frequency (ln_glo_trd=T) (unit=time step)
+/
+!!gm nn_ctls = 0 ! control surface type in mixed-layer trends (0,1 or n /seconds ; =86400. -> /day)
+!!gm cn_trdrst_in = "restart_mld" ! suffix of ocean restart name (input)
+!!gm cn_trdrst_out = "restart_mld" ! suffix of ocean restart name (output)
+!!gm ln_trdmld_restart = .false. ! restart for ML diagnostics
+!!gm ln_trdmld_instant = .false. ! flag to diagnose trends of instantantaneous or mean ML T/S
+!!gm
+!-----------------------------------------------------------------------
+&namflo ! float parameters ("key_float")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namptr ! Poleward Transport Diagnostic
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namhsb ! Heat and salt budgets
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdct ! transports through sections
+!-----------------------------------------------------------------------
+ nn_dct = 60 ! time step frequency for transports computing
+ nn_dctwri = 60 ! time step frequency for transports writing
+ nn_secdebug = 0 ! 0 : no section to debug
+/
+!-----------------------------------------------------------------------
+&namobs ! observation usage switch ('key_diaobs')
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nam_asminc ! assimilation increments ('key_asminc')
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_wave ! External fields from wave model
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_nept ! Neptune effect (simplified: lateral and vertical diffusions removed)
+!-----------------------------------------------------------------------
+ ln_neptramp = .false. ! ramp down Neptune velocity in shallow water
+/
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA1_LIM3_PISCES/namelist_cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA1_LIM3_PISCES/namelist_cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA1_LIM3_PISCES/namelist_cfg (revision 5974)
@@ -0,0 +1,331 @@
+
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! NEMO/OPA Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!
+!-----------------------------------------------------------------------
+&namrun ! parameters of the run
+!-----------------------------------------------------------------------
+ cn_exp = "O1L3P_trust" ! experience name
+ nn_itend = 240 ! last time step (std 5475)
+ nn_euler = 0 ! = 0 : start with forward time step if ln_rstart=T
+ nn_stock = 120 ! frequency of creation of a restart file (modulo referenced to 1)
+/
+!-----------------------------------------------------------------------
+&namcfg ! parameters of the configuration
+!-----------------------------------------------------------------------
+ cp_cfg = "orca" ! name of the configuration
+ jp_cfg = 1 ! resolution of the configuration
+ jpidta = 362 ! 1st lateral dimension ( >= jpi )
+! jpjdta = 292 ! 2nd " " ( >= jpj )
+ jpjdta = 332 ! 2nd " " ( >= jpj )
+ jpkdta = 75 ! number of levels ( >= jpk )
+ jpiglo = 362 ! 1st dimension of global domain --> i =jpidta
+! jpjglo = 292 ! 2nd - - --> j =jpjdta
+ jpjglo = 332 ! 2nd - - --> j =jpjdta
+ jperio = 6 ! lateral cond. type (between 0 and 6)
+/
+!-----------------------------------------------------------------------
+&namzgr ! vertical coordinate
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzgr_sco ! s-coordinate or hybrid z-s-coordinate
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdom ! space and time domain (bathymetry, mesh, timestep)
+!-----------------------------------------------------------------------
+ jphgr_msh = 0 ! type of horizontal mesh
+ ppglam0 = 999999.0 ! longitude of first raw and column T-point (jphgr_msh = 1)
+ ppgphi0 = 999999.0 ! latitude of first raw and column T-point (jphgr_msh = 1)
+ ppe1_deg = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_deg = 999999.0 ! meridional grid-spacing (degrees)
+ ppe1_m = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_m = 999999.0 ! meridional grid-spacing (degrees)
+ ppsur = -3958.951371276829 ! ORCA r4, r2 and r05 coefficients
+ ppa0 = 103.9530096000000 ! (default coefficients)
+ ppa1 = 2.415951269000000 !
+ ppkth = 15.35101370000000 !
+ ppacr = 7.0 !
+ ppdzmin = 999999.0 ! Minimum vertical spacing
+ pphmax = 999999.0 ! Maximum depth
+ ppa2 = 100.7609285000000 ! Double tanh function parameters
+ ppkth2 = 48.02989372000000 !
+ ppacr2 = 13.00000000000 !
+ rn_rdt = 3600. ! time step for the dynamics (and tracer if nn_acc=0)
+ rn_hmin = 20.
+ nn_msh = 0 ! create (=1) a mesh file or not (=0)
+/
+!-----------------------------------------------------------------------
+&namsplit
+!-----------------------------------------------------------------------
+ ln_bt_fw = .TRUE. ! Forward integration of barotropic equations
+ ln_bt_av = .TRUE. ! Time filtering of barotropic variables
+ ln_bt_nn_auto = .TRUE. ! Set nn_baro automatically to be just below
+ ! a user defined maximum courant number (rn_bt_cmax)
+ nn_baro = 30 ! Number of iterations of barotropic mode
+ ! during rn_rdt seconds. Only used if ln_bt_nn_auto=F
+ rn_bt_cmax = 0.8 ! Maximum courant number allowed if ln_bt_nn_auto=T
+ nn_bt_flt = 1 ! Time filter choice
+ ! = 0 None
+ ! = 1 Boxcar over nn_baro barotropic steps
+ ! = 2 Boxcar over 2*nn_baro "
+/
+!-----------------------------------------------------------------------
+&namcrs ! Grid coarsening for dynamics output and/or
+ ! passive tracer coarsened online simulations
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtsd ! data : Temperature & Salinity
+!-----------------------------------------------------------------------
+ ln_tsd_tradmp = .false. ! damping of ocean T & S toward T &S input data (T) or not (F)
+ sn_tem = 'conservative_temperature_WOA13_decav_Reg1L75_clim', -1 ,'votemper' , .true. , .true. , 'yearly' , 'weights_3D_WOA13d1_2_eorca1_bilinear.nc' , '' , ''
+ sn_sal = 'absolute_salinity_WOA13_decav_Reg1L75_clim' , -1 ,'vosaline' , .true. , .true. , 'yearly' , 'weights_3D_WOA13d1_2_eorca1_bilinear.nc' , '' , ''
+/
+!-----------------------------------------------------------------------
+&namsbc ! Surface Boundary Condition (surface module)
+!-----------------------------------------------------------------------
+ nn_fsbc = 3 ! frequency of surface boundary condition computation
+ nn_ice_embd = 1 ! embedded sea-ice (full salt and mass exchanges and pressure)
+ ln_dm2dc = .true. ! Daily mean to diurnal cycle on short wave
+ nn_fwb = 0 ! FreshWater Budget: =0 unchecked
+ ln_rnf = .true. ! runoffs (T => fill namsbc_rnf)
+/
+!-----------------------------------------------------------------------
+&namsbc_core ! namsbc_core CORE bulk formulae
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interpol. ! clim ! 'yearly'/ ! weights ! rotation !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing !
+ sn_wndi = 'u_10.15JUNE2009_fill' , 6 , 'U_10_MOD', .true. , .true. , 'yearly' , 'weights_coreII_2_eorca1_bicubic.nc' , 'U1'
+ sn_wndj = 'v_10.15JUNE2009_fill' , 6 , 'V_10_MOD', .true. , .true. , 'yearly' , 'weights_coreII_2_eorca1_bicubic.nc' , 'V1'
+ sn_qsr = 'ncar_rad.15JUNE2009_fill' , 24 , 'SWDN_MOD', .false. , .true. , 'yearly' , 'weights_coreII_2_eorca1_bilinear.nc' , ''
+ sn_qlw = 'ncar_rad.15JUNE2009_fill' , 24 , 'LWDN_MOD', .true. , .true. , 'yearly' , 'weights_coreII_2_eorca1_bilinear.nc' , ''
+ sn_tair = 't_10.15JUNE2009_fill' , 6 , 'T_10_MOD', .false. , .true. , 'yearly' , 'weights_coreII_2_eorca1_bilinear.nc' , ''
+ sn_humi = 'q_10.15JUNE2009_fill' , 6 , 'Q_10_MOD', .false. , .true. , 'yearly' , 'weights_coreII_2_eorca1_bilinear.nc' , ''
+ sn_prec = 'ncar_precip.15JUNE2009_fill', -1 , 'PRC_MOD1', .true. , .true. , 'yearly' , 'weights_coreII_2_eorca1_bilinear.nc' , ''
+ sn_snow = 'ncar_precip.15JUNE2009_fill', -1 , 'SNOW' , .true. , .true. , 'yearly' , 'weights_coreII_2_eorca1_bilinear.nc' , ''
+/
+!-----------------------------------------------------------------------
+&namtra_qsr ! penetrative solar radiation
+!-----------------------------------------------------------------------
+ sn_chl ='merged_ESACCI_BIOMER4V1R1_CHL_REG05', -1 , 'CHLA' , .true. , .true. , 'yearly' , 'weights_reg05_2_eorca1_bilinear.nc' , '' , ''
+/
+!-----------------------------------------------------------------------
+&namsbc_rnf ! runoffs namelist surface boundary condition
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_rnf = 'eORCA_R1_runoff_clim_v1.0_nomask', -1 , 'sorunoff', .true. , .true. , 'yearly' , '' , '' , ''
+ sn_cnf = 'eORCA_R1_runoff_clim_v1.0_nomask', 0 , 'socoeff' , .false. , .true. , 'yearly' , '' , '' , ''
+ sn_s_rnf = 'runoffs' , 24 , 'rosaline', .true. , .true. , 'yearly' , '' , '' , ''
+ sn_t_rnf = 'runoffs' , 24 , 'rotemper', .true. , .true. , 'yearly' , '' , '' , ''
+ sn_dep_rnf = 'runoffs' , 0 , 'rodepth' , .false. , .true. , 'yearly' , '' , '' , ''
+
+ ln_rnf_mouth = .false. ! specific treatment at rivers mouths
+ ln_rnf_depth = .false. ! read in depth information for runoff
+ ln_rnf_tem = .false. ! read in temperature information for runoff
+ ln_rnf_sal = .false. ! read in salinity information for runoff
+ ln_rnf_depth_ini = .true. ! compute depth at initialisation from runoff file
+ rn_rnf_max = 0.05 ! max value of the runoff climatology over global domain ( if ln_rnf_depth_ini = .true )
+ rn_dep_max = 150. ! depth over which runoffs is spread ( ln_rnf_depth_ini = .true )
+ nn_rnf_depth_file = 1 ! create (=1) a runoff depth file or not (=0)
+/
+!-----------------------------------------------------------------------
+&namsbc_apr ! Atmospheric pressure used as ocean forcing or in bulk
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_ssr ! surface boundary condition : sea surface restoring
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interpol. ! clim ! 'yearly'/ ! weights ! rotation !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing !
+ sn_sss = 'sss_absolute_salinity_WOA13_decav_Reg1L75_clim', -1. , 'sosaline', .true. , .true. , 'yearly' , 'weights_WOA13d1_2_eorca1_bilinear.nc' , ''
+/
+!-----------------------------------------------------------------------
+&namsbc_alb ! albedo parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namberg ! iceberg parameters
+!-----------------------------------------------------------------------
+ ln_icebergs = .false.
+ ln_bergdia = .false. ! Calculate budgets
+ nn_verbose_level = 0 ! Turn on more verbose output if level > 0
+ nn_verbose_write = 120 ! Timesteps between verbose messages
+ nn_sample_rate = 1 ! Timesteps between sampling for trajectory storage
+ ! Initial mass required for an iceberg of each class
+ rn_initial_mass = 8.8e7, 4.1e8, 3.3e9, 1.8e10, 3.8e10, 7.5e10, 1.2e11, 2.2e11, 3.9e11, 7.4e11
+ ! Proportion of calving mass to apportion to each class
+ rn_distribution = 0.24, 0.12, 0.15, 0.18, 0.12, 0.07, 0.03, 0.03, 0.03, 0.02
+ ! Ratio between effective and real iceberg mass (non-dim)
+ ! i.e. number of icebergs represented at a point
+ rn_mass_scaling = 2000, 200, 50, 20, 10, 5, 2, 1, 1, 1
+ ! thickness of newly calved bergs (m)
+ rn_initial_thickness = 40., 67., 133., 175., 250., 250., 250., 250., 250., 250.
+ rn_rho_bergs = 850. ! Density of icebergs
+ rn_LoW_ratio = 1.5 ! Initial ratio L/W for newly calved icebergs
+ ln_operator_splitting = .true. ! Use first order operator splitting for thermodynamics
+ rn_bits_erosion_fraction = 0. ! Fraction of erosion melt flux to divert to bergy bits
+ rn_sicn_shift = 0. ! Shift of sea-ice concn in erosion flux (0>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! NEMO/LIM-3 : Ice configuration namelist. Overwrites SHARED/namelist_ice_lim3_ref
+!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+!-----------------------------------------------------------------------
+&namicerun ! Share parameters for dynamics/advection/thermo
+!-----------------------------------------------------------------------
+ ln_limdiahsb = .false. ! check the heat and salt budgets (T) or not (F)
+ ln_limdiaout = .false. ! output the heat and salt budgets (T) or not (F)
+/
+!-----------------------------------------------------------------------
+&namiceini ! ice initialisation
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namicedyn ! ice dynamic
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namicethd ! ice thermodynamic
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namicesal ! ice salinity
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namiceitdme ! parameters for mechanical redistribution of ice
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namicedia ! ice diagnostics
+!-----------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namiceitd ! Ice discretization
+!------------------------------------------------------------------------------
+/
+!------------------------------------------------------------------------------
+&namicehdf ! Ice horizontal diffusion
+!------------------------------------------------------------------------------
+/
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM/1_namelist_cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM/1_namelist_cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM/1_namelist_cfg (revision 5974)
@@ -0,0 +1,228 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! NEMO/OPA : Configuration namelist used to overwrite SHARED/1_namelist_ref
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!-----------------------------------------------------------------------
+&namrun ! parameters of the run
+!-----------------------------------------------------------------------
+ cn_exp = "O2LA_trust" ! experience name
+ nn_itend = 300 ! last time step
+ nn_stock = 150 ! frequency of creation of a restart file (modulo referenced to 1)
+/
+!-----------------------------------------------------------------------
+&namcfg ! parameters of the configuration
+!-----------------------------------------------------------------------
+ cp_cfg = "default" ! name of the configuration
+ jp_cfg = -1 ! resolution of the configuration
+ jpidta = 182 ! 1st lateral dimension ( >= jpi )
+ jpjdta = 149 ! 2nd " " ( >= jpj )
+ jpkdta = 31 ! number of levels ( >= jpk )
+ jpiglo = 182 ! 1st dimension of global domain --> i =jpidta
+ jpjglo = 149 ! 2nd - - --> j =jpjdta
+ jpizoom = 1 ! left bottom (i,j) indices of the zoom
+ jpjzoom = 1 ! in data domain indices
+ jperio = 0 ! lateral cond. type (between 0 and 6)
+/
+!-----------------------------------------------------------------------
+&namzgr ! vertical coordinate
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdom ! space and time domain (bathymetry, mesh, timestep)
+!-----------------------------------------------------------------------
+ nn_msh = 0 ! create (=1) a mesh file or not (=0)
+ jphgr_msh = 0 ! type of horizontal mesh
+ ppglam0 = 999999.0 ! longitude of first raw and column T-point (jphgr_msh = 1)
+ ppgphi0 = 999999.0 ! latitude of first raw and column T-point (jphgr_msh = 1)
+ ppe1_deg = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_deg = 999999.0 ! meridional grid-spacing (degrees)
+ ppe1_m = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_m = 999999.0 ! meridional grid-spacing (degrees)
+ ppsur = -4762.96143546300 ! ORCA r4, r2 and r05 coefficients
+ ppa0 = 255.58049070440 ! (default coefficients)
+ ppa1 = 245.58132232490 !
+ ppkth = 21.43336197938 !
+ ppacr = 3.0 !
+ ppdzmin = 999999. ! Minimum vertical spacing
+ pphmax = 999999. ! Maximum depth
+ ldbletanh = .FALSE. ! Use/do not use double tanf function for vertical coordinates
+ ppa2 = 999999. ! Double tanh function parameters
+ ppkth2 = 999999. !
+ ppacr2 = 999999. !
+ rn_rdt = 2880. ! time step for the dynamics (and tracer if nn_acc=0)
+ rn_rdtmin = 14400. ! minimum time step on tracers (used if nn_acc=1)
+ rn_rdtmax = 14400. ! maximum time step on tracers (used if nn_acc=1)
+/
+!-----------------------------------------------------------------------
+&namsplit ! time splitting parameters ("key_dynspg_ts")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namcrs ! Grid coarsening for dynamics output and/or
+ ! passive tracer coarsened online simulations
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtsd ! data : Temperature & Salinity
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc ! Surface Boundary Condition (surface module)
+!-----------------------------------------------------------------------
+ nn_ice = 0 ! =0 no ice boundary condition ,
+ ! =1 use observed ice-cover ,
+ ! =2 ice-model used ("key_lim3" or "key_lim2)
+ ln_rnf = .false. ! runoffs (T => fill namsbc_rnf)
+ ln_ssr = .false. ! Sea Surface Restoring on T and/or S (T => fill namsbc_ssr)
+ nn_fwb = 0 ! FreshWater Budget: =0 unchecked
+ ! =1 global mean of e-p-r set to zero at each time step
+ ! =2 annual global mean of e-p-r set to zero
+ ! =3 global emp set to zero and spread out over erp area
+/
+!-----------------------------------------------------------------------
+&namsbc_core ! namsbc_core CORE bulk formulae
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_wndi = 'u_10.15JUNE2009_fill' , 6 , 'U_10_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bicubic.nc' , 'Uwnd' , ''
+ sn_wndj = 'v_10.15JUNE2009_fill' , 6 , 'V_10_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bicubic.nc' , 'Vwnd' , ''
+ sn_qsr = 'ncar_rad.15JUNE2009_fill' , 24 , 'SWDN_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
+ sn_qlw = 'ncar_rad.15JUNE2009_fill' , 24 , 'LWDN_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
+ sn_tair = 't_10.15JUNE2009_fill' , 6 , 'T_10_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
+ sn_humi = 'q_10.15JUNE2009_fill' , 6 , 'Q_10_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
+ sn_prec = 'ncar_precip.15JUNE2009_fill' , -1 , 'PRC_MOD1', .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
+ sn_snow = 'ncar_precip.15JUNE2009_fill' , -1 , 'SNOW' , .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
+ sn_tdif = 'taudif_core' , 24 , 'taudif' , .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
+
+ cn_dir = './' ! root directory for the location of the bulk files
+ ln_taudif = .false. ! HF tau contribution: use "mean of stress module - module of the mean stress" data
+ rn_zqt = 10. ! Air temperature and humidity reference height (m)
+ rn_zu = 10. ! Wind vector reference height (m)
+ rn_pfac = 1. ! multiplicative factor for precipitation (total & snow)
+ rn_efac = 1. ! multiplicative factor for evaporation (0. or 1.)
+ rn_vfac = 0. ! multiplicative factor for ocean/ice velocity
+ ! in the calculation of the wind stress (0.=absolute winds or 1.=relative winds)
+/
+!-----------------------------------------------------------------------
+&namtra_qsr ! penetrative solar radiation
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing !
+ sn_chl ='chlorophyll', -1 , 'CHLA' , .true. , .true. , 'yearly' , 'weights_bilin.nc' , ''
+/
+!-----------------------------------------------------------------------
+&namlbc ! lateral momentum boundary condition
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namcla ! cross land advection
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namagrif ! AGRIF zoom ("key_agrif")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambfr ! bottom friction
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambbc ! bottom temperature boundary condition
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambbl ! bottom boundary layer scheme
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nameos ! ocean physical parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_dmp ! tracer: T & S newtonian damping
+!-----------------------------------------------------------------------
+ ln_tradmp = .false. ! add a damping termn (T) or not (F)
+/
+!-----------------------------------------------------------------------
+&namtra_adv ! advection scheme for tracer
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_ldf ! lateral diffusion scheme for tracers
+!-----------------------------------------------------------------------
+
+ rn_aht_0 = 1000. ! horizontal eddy diffusivity for tracers [m2/s]
+ rn_aeiv_0 = 0. ! eddy induced velocity coefficient [m2/s] (require "key_traldf_eiv")
+/
+!-----------------------------------------------------------------------
+&namdyn_adv ! formulation of the momentum advection
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_vor ! option of physics/algorithm (not control by CPP keys)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_hpg ! Hydrostatic pressure gradient option
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_ldf ! lateral diffusion on momentum
+!-----------------------------------------------------------------------
+ ! ! Type of the operator :
+ ln_dynldf_lap = .false. ! laplacian operator
+ ln_dynldf_bilap = .true. ! bilaplacian operator
+ rn_ahm_0_blp = -8.5e+11 ! horizontal bilaplacian eddy viscosity [m4/s]
+/
+!-----------------------------------------------------------------------
+&namzdf ! vertical physics
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion ("key_zdftke")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_ddm ! double diffusive mixing parameterization ("key_zdfddm")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_tmx ! tidal mixing parameterization ("key_zdftmx")
+!-----------------------------------------------------------------------
+ ln_tmx_itf = .false. ! ITF specific parameterisation
+/
+!-----------------------------------------------------------------------
+&namsol ! elliptic solver / island / free surface
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nammpp ! Massively Parallel Processing ("key_mpp_mpi)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nammpp_dyndist ! Massively Parallel Distribution for AGRIF zoom ("key_agrif" && "key_mpp_dyndist")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namctl ! Control prints & Benchmark
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namptr ! Poleward Transport Diagnostic
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namhsb ! Heat and salt budgets
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_nept ! Neptune effect (simplified: lateral and vertical diffusions removed)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namobs ! observation usage ('key_diaobs')
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nam_asminc ! assimilation increments ('key_asminc')
+!-----------------------------------------------------------------------
+/
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM/namelist_cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM/namelist_cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM/namelist_cfg (revision 5974)
@@ -0,0 +1,203 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! NEMO/OPA Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!
+!-----------------------------------------------------------------------
+&namrun ! parameters of the run
+!-----------------------------------------------------------------------
+ cn_exp = "O2LA_trust" ! experience name
+ nn_itend = 150 ! last time step
+ nn_stock = 75 ! frequency of creation of a restart file (modulo referenced to 1)
+/
+!-----------------------------------------------------------------------
+&namcfg ! parameters of the configuration
+!-----------------------------------------------------------------------
+ cp_cfg = "orca" ! name of the configuration
+ jp_cfg = 2 ! resolution of the configuration
+ jpidta = 182 ! 1st lateral dimension ( >= jpi )
+ jpjdta = 149 ! 2nd " " ( >= jpj )
+ jpkdta = 31 ! number of levels ( >= jpk )
+ jpiglo = 182 ! 1st dimension of global domain --> i =jpidta
+ jpjglo = 149 ! 2nd - - --> j =jpjdta
+ jpizoom = 1 ! left bottom (i,j) indices of the zoom
+ jpjzoom = 1 ! in data domain indices
+ jperio = 4 ! lateral cond. type (between 0 and 6)
+/
+!-----------------------------------------------------------------------
+&namzgr ! vertical coordinate
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdom ! space and time domain (bathymetry, mesh, timestep)
+!-----------------------------------------------------------------------
+ nn_msh = 0 ! create (=1) a mesh file or not (=0)
+ jphgr_msh = 0 ! type of horizontal mesh
+ ppglam0 = 999999.0 ! longitude of first raw and column T-point (jphgr_msh = 1)
+ ppgphi0 = 999999.0 ! latitude of first raw and column T-point (jphgr_msh = 1)
+ ppe1_deg = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_deg = 999999.0 ! meridional grid-spacing (degrees)
+ ppe1_m = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_m = 999999.0 ! meridional grid-spacing (degrees)
+ ppsur = -4762.96143546300 ! ORCA r4, r2 and r05 coefficients
+ ppa0 = 255.58049070440 ! (default coefficients)
+ ppa1 = 245.58132232490 !
+ ppkth = 21.43336197938 !
+ ppacr = 3.0 !
+ ppdzmin = 999999. ! Minimum vertical spacing
+ pphmax = 999999. ! Maximum depth
+ ldbletanh = .FALSE. ! Use/do not use double tanf function for vertical coordinates
+ ppa2 = 999999. ! Double tanh function parameters
+ ppkth2 = 999999. !
+ ppacr2 = 999999. !
+/
+!-----------------------------------------------------------------------
+&namsplit ! time splitting parameters ("key_dynspg_ts")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namcrs ! Grid coarsening for dynamics output and/or
+ ! passive tracer coarsened online simulations
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtsd ! data : Temperature & Salinity
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc ! Surface Boundary Condition (surface module)
+!-----------------------------------------------------------------------
+ nn_fwb = 0 ! FreshWater Budget: =0 unchecked
+/
+!-----------------------------------------------------------------------
+&namsbc_core ! namsbc_core CORE bulk formulae
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_qsr ! penetrative solar radiation
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_rnf ! runoffs namelist surface boundary condition
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_ssr ! surface boundary condition : sea surface restoring
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_alb ! albedo parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namberg ! iceberg parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namlbc ! lateral momentum boundary condition
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namcla ! cross land advection
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambfr ! bottom friction
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambbc ! bottom temperature boundary condition
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambbl ! bottom boundary layer scheme
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nameos ! ocean physical parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_adv ! advection scheme for tracer
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param)
+!-----------------------------------------------------------------------
+/
+!----------------------------------------------------------------------------------
+&namtra_ldf ! lateral diffusion scheme for tracers
+!----------------------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_dmp ! tracer: T & S newtonian damping
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_adv ! formulation of the momentum advection
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_vor ! option of physics/algorithm (not control by CPP keys)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_hpg ! Hydrostatic pressure gradient option
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_ldf ! lateral diffusion on momentum
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf ! vertical physics
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion ("key_zdftke")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_ddm ! double diffusive mixing parameterization ("key_zdfddm")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_tmx ! tidal mixing parameterization ("key_zdftmx")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsol ! elliptic solver / island / free surface
+!-----------------------------------------------------------------------
+ nn_solv = 2 ! elliptic solver: =2 successive-over-relaxation (sor)
+/
+!-----------------------------------------------------------------------
+&nammpp ! Massively Parallel Processing ("key_mpp_mpi)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namctl ! Control prints & Benchmark
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namptr ! Poleward Transport Diagnostic
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namhsb ! Heat and salt budgets
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_nept ! Neptune effect (simplified: lateral and vertical diffusions removed)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namobs ! observation usage ('key_diaobs')
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nam_asminc ! assimilation increments ('key_asminc')
+!-----------------------------------------------------------------------
+/
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/iodef.xml
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/iodef.xml (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/iodef.xml (revision 5974)
@@ -0,0 +1,284 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ tdenit * 14. * 86400. * 365. / 1e12
+ tnfix * 14. * 86400. * 365. / 1e12
+ tcflx * -1. * 12. * 86400. * 365. / 1e15
+ tcflxcum * -1. * 12. / 1e15
+ tcexp * 12. * 86400. * 365. / 1e15
+ tintpp * 12. * 86400. * 365. / 1e15
+ pno3tot * 16. / 122. * 1e6
+ ppo4tot * 1. / 122. * 1e6
+ psiltot * 1e6
+ palktot * 1e6
+ pfertot * 1e9
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 50000000
+ 2
+ 0
+ false
+ false
+ oceanx
+
+
+
+
+
+
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_cfg (revision 5974)
@@ -0,0 +1,205 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! NEMO/OPA Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_ref
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!
+!-----------------------------------------------------------------------
+&namrun ! parameters of the run
+!-----------------------------------------------------------------------
+ cn_exp = "O2LP_trust" ! experience name
+ nn_itend = 150 ! last time step (std 5475)
+ nn_euler = 0 ! = 0 : start with forward time step if ln_rstart=T
+ nn_stock = 75 ! frequency of creation of a restart file (modulo referenced to 1)
+/
+!-----------------------------------------------------------------------
+&namcfg ! parameters of the configuration
+!-----------------------------------------------------------------------
+ cp_cfg = "orca" ! name of the configuration
+ jp_cfg = 2 ! resolution of the configuration
+ jpidta = 182 ! 1st lateral dimension ( >= jpi )
+ jpjdta = 149 ! 2nd " " ( >= jpj )
+ jpkdta = 31 ! number of levels ( >= jpk )
+ jpiglo = 182 ! 1st dimension of global domain --> i =jpidta
+ jpjglo = 149 ! 2nd - - --> j =jpjdta
+ jpizoom = 1 ! left bottom (i,j) indices of the zoom
+ jpjzoom = 1 ! in data domain indices
+ jperio = 4 ! lateral cond. type (between 0 and 6)
+/
+!-----------------------------------------------------------------------
+&namzgr ! vertical coordinate
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdom ! space and time domain (bathymetry, mesh, timestep)
+!-----------------------------------------------------------------------
+ nn_msh = 0 ! create (=1) a mesh file or not (=0)
+ jphgr_msh = 0 ! type of horizontal mesh
+ ppglam0 = 999999.0 ! longitude of first raw and column T-point (jphgr_msh = 1)
+ ppgphi0 = 999999.0 ! latitude of first raw and column T-point (jphgr_msh = 1)
+ ppe1_deg = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_deg = 999999.0 ! meridional grid-spacing (degrees)
+ ppe1_m = 999999.0 ! zonal grid-spacing (degrees)
+ ppe2_m = 999999.0 ! meridional grid-spacing (degrees)
+ ppsur = -4762.96143546300 ! ORCA r4, r2 and r05 coefficients
+ ppa0 = 255.58049070440 ! (default coefficients)
+ ppa1 = 245.58132232490 !
+ ppkth = 21.43336197938 !
+ ppacr = 3.0 !
+ ppdzmin = 999999. ! Minimum vertical spacing
+ pphmax = 999999. ! Maximum depth
+ ldbletanh = .FALSE. ! Use/do not use double tanf function for vertical coordinates
+ ppa2 = 999999. ! Double tanh function parameters
+ ppkth2 = 999999. !
+ ppacr2 = 999999. !
+/
+!-----------------------------------------------------------------------
+&namsplit ! time splitting parameters ("key_dynspg_ts")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namcrs ! Grid coarsening for dynamics output and/or
+ ! passive tracer coarsened online simulations
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtsd ! data : Temperature & Salinity
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc ! Surface Boundary Condition (surface module)
+!-----------------------------------------------------------------------
+ nn_fwb = 0 ! FreshWater Budget: =0 unchecked
+/
+!-----------------------------------------------------------------------
+&namsbc_core ! namsbc_core CORE bulk formulae
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_qsr ! penetrative solar radiation
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_rnf ! runoffs namelist surface boundary condition
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_ssr ! surface boundary condition : sea surface restoring
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsbc_alb ! albedo parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namberg ! iceberg parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namlbc ! lateral momentum boundary condition
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namcla ! cross land advection
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambfr ! bottom friction
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambbc ! bottom temperature boundary condition
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambbl ! bottom boundary layer scheme
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nameos ! ocean physical parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_adv ! advection scheme for tracer
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param)
+!-----------------------------------------------------------------------
+/
+!----------------------------------------------------------------------------------
+&namtra_ldf ! lateral diffusion scheme for tracers
+!----------------------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtra_dmp ! tracer: T & S newtonian damping
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_adv ! formulation of the momentum advection
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_vor ! option of physics/algorithm (not control by CPP keys)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_hpg ! Hydrostatic pressure gradient option
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_ldf ! lateral diffusion on momentum
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf ! vertical physics
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion ("key_zdftke")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_ddm ! double diffusive mixing parameterization ("key_zdfddm")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namzdf_tmx ! tidal mixing parameterization ("key_zdftmx")
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsol ! elliptic solver / island / free surface
+!-----------------------------------------------------------------------
+ nn_solv = 2 ! elliptic solver: =2 successive-over-relaxation (sor)
+/
+!-----------------------------------------------------------------------
+&nammpp ! Massively Parallel Processing ("key_mpp_mpi)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namctl ! Control prints & Benchmark
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namptr ! Poleward Transport Diagnostic
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namhsb ! Heat and salt budgets
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdyn_nept ! Neptune effect (simplified: lateral and vertical diffusions removed)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsto ! Stochastic parametrization of EOS
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtrd ! diagnostics on dynamics and/or tracer trends
+! ! and/or mixed-layer trends and/or barotropic vorticity
+!-----------------------------------------------------------------------
+/
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_pisces_cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_pisces_cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_pisces_cfg (revision 5974)
@@ -0,0 +1,72 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! PISCES : Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_pis_ref
+!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampisext ! air-sea exchange
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampisatm ! Atmospheric prrssure
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+ ln_presatm = .false. ! constant atmopsheric pressure (F) or from a file (T)
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampisbio ! biological parameters
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampislim ! parameters for nutrient limitations
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampisopt ! parameters for optics
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+ ln_varpar = .false. ! boolean for PAR variable
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampisprod ! parameters for phytoplankton growth
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampismort ! parameters for phytoplankton sinks
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampismes ! parameters for mesozooplankton
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampiszoo ! parameters for microzooplankton
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampisfer ! parameters for iron chemistry
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampisrem ! parameters for remineralization
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampiscal ! parameters for Calcite chemistry
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampissbc ! parameters for inputs deposition
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+ ln_dust = .false. ! boolean for dust input from the atmosphere
+ ln_solub = .false. ! boolean for variable solubility of atm. Iron
+ ln_river = .false. ! boolean for river input of nutrients
+ ln_ndepo = .false. ! boolean for atmospheric deposition of N
+ ln_ironsed = .false. ! boolean for Fe input from sediments
+ ln_hydrofe = .false. ! boolean for from hydrothermal vents
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampisdmp ! Damping
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+ ln_pisdmp = .false. ! Relaxation fo some tracers to a mean value
+/
+!'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+&nampismass ! Mass conservation
+!,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_top_cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_top_cfg (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/inputs/ORCA2_LIM_PISCES/namelist_top_cfg (revision 5974)
@@ -0,0 +1,97 @@
+!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!! NEMO/TOP1 : Configuration namelist : used to overwrite defaults values defined in SHARED/namelist_top_ref
+!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!-----------------------------------------------------------------------
+&namtrc_run ! run information
+!-----------------------------------------------------------------------
+! ln_top_euler = .true. ! use Euler time-stepping for TOP
+/
+!-----------------------------------------------------------------------
+&namtrc ! tracers definition
+!-----------------------------------------------------------------------
+ ln_trcdta = .false. ! Initialisation from data input file (T) or not (F)
+! ! name ! title of the field ! initial data ! initial data ! save !
+! ! ! ! units ! from file ! or not !
+! ! ! ! ! or not ! !
+ sn_tracer(1) = 'DIC ' , 'Dissolved inorganic Concentration ', 'mol-C/L' , .true. , .true.
+ sn_tracer(2) = 'Alkalini' , 'Total Alkalinity Concentration ', 'eq/L ' , .true. , .true.
+ sn_tracer(3) = 'O2 ' , 'Dissolved Oxygen Concentration ', 'mol-C/L' , .true. , .true.
+ sn_tracer(4) = 'CaCO3 ' , 'Calcite Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(5) = 'PO4 ' , 'Phosphate Concentration ', 'mol-C/L' , .true. , .true.
+ sn_tracer(6) = 'POC ' , 'Small organic carbon Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(7) = 'Si ' , 'Silicate Concentration ', 'mol-C/L' , .true. , .true.
+ sn_tracer(8) = 'PHY ' , 'Nanophytoplankton Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(9) = 'ZOO ' , 'Microzooplankton Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(10) = 'DOC ' , 'Dissolved organic Concentration ', 'mol-C/L' , .true. , .true.
+ sn_tracer(11) = 'PHY2 ' , 'Diatoms Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(12) = 'ZOO2 ' , 'Mesozooplankton Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(13) = 'DSi ' , 'Diatoms Silicate Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(14) = 'Fer ' , 'Dissolved Iron Concentration ', 'mol-C/L' , .true. , .true.
+ sn_tracer(15) = 'BFe ' , 'Big iron particles Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(16) = 'GOC ' , 'Big organic carbon Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(17) = 'SFe ' , 'Small iron particles Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(18) = 'DFe ' , 'Diatoms iron Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(19) = 'GSi ' , 'Sinking biogenic Silicate Concentration', 'mol-C/L' , .false. , .true.
+ sn_tracer(20) = 'NFe ' , 'Nano iron Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(21) = 'NCHL ' , 'Nano chlorophyl Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(22) = 'DCHL ' , 'Diatoms chlorophyl Concentration ', 'mol-C/L' , .false. , .true.
+ sn_tracer(23) = 'NO3 ' , 'Nitrates Concentration ', 'mol-C/L' , .true. , .true.
+ sn_tracer(24) = 'NH4 ' , 'Ammonium Concentration ', 'mol-C/L' , .false. , .true.
+/
+!-----------------------------------------------------------------------
+&namtrc_dta ! Initialisation from data input file
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_trcdta(1) = 'data_DIC_nomask' , -12 , 'DIC' , .false. , .true. , 'yearly' , '' , '' , ''
+ sn_trcdta(2) = 'data_Alkalini_nomask' , -12 , 'Alkalini', .false. , .true. , 'yearly' , '' , '' , ''
+ sn_trcdta(3) = 'data_O2_nomask' , -1 , 'O2' , .true. , .true. , 'yearly' , '' , '' , ''
+ sn_trcdta(5) = 'data_PO4_nomask' , -1 , 'PO4' , .true. , .true. , 'yearly' , '' , '' , ''
+ sn_trcdta(7) = 'data_Si_nomask' , -1 , 'Si' , .true. , .true. , 'yearly' , '' , '' , ''
+ sn_trcdta(10) = 'data_DOC_nomask' , -12 , 'DOC' , .false. , .true. , 'yearly' , '' , '' , ''
+ sn_trcdta(14) = 'data_Fer_nomask' , -12 , 'Fer' , .false. , .true. , 'yearly' , '' , '' , ''
+ sn_trcdta(23) = 'data_NO3_nomask' , -1 , 'NO3' , .true. , .true. , 'yearly' , '' , '' , ''
+ rn_trfac(1) = 1.0e-06 ! multiplicative factor
+ rn_trfac(2) = 1.0e-06 ! - - - -
+ rn_trfac(3) = 44.6e-06 ! - - - -
+ rn_trfac(5) = 122.0e-06 ! - - - -
+ rn_trfac(7) = 1.0e-06 ! - - - -
+ rn_trfac(10) = 1.0 ! - - - -
+ rn_trfac(14) = 1.0 ! - - - -
+ rn_trfac(23) = 7.6e-06 ! - - - -
+/
+!-----------------------------------------------------------------------
+&namtrc_adv ! advection scheme for passive tracer
+!-----------------------------------------------------------------------
+ ln_trcadv_tvd = .false. ! TVD scheme
+ ln_trcadv_muscl = .true. ! MUSCL scheme
+/
+!-----------------------------------------------------------------------
+&namtrc_ldf ! lateral diffusion scheme for passive tracer
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtrc_zdf ! vertical physics
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtrc_rad ! treatment of negative concentrations
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtrc_dia ! parameters for passive tracer additional diagnostics
+!----------------------------------------------------------------------
+ ln_diatrc = .false. ! save additional diag. (T) or not (F)
+/
+!----------------------------------------------------------------------
+&namtrc_bc ! data for boundary conditions
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtrc_dmp ! passive tracer newtonian damping
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtrc_ice ! Representation of sea ice growth & melt effects
+!-----------------------------------------------------------------------
+/
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/install_new_branch.sh
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/install_new_branch.sh (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/install_new_branch.sh (revision 5974)
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+
+cd $( dirname $0 )
+
+## Set defaults
+##---------------------------------------------------
+TRUS_DBUG=0; TRUS_PROD=0; TRUS_HELP=0
+
+
+## Get options (for replacing initials settings)
+##---------------------------------------------------
+while [ $# -ne 0 ]; do
+ case $1 in
+ '-d'|'--debug' ) TRUS_DBUG=1 ; shift ;; '-j'|'--job' ) TRUS_NPRO=$2; shift 2;;
+ '-m'|'--machine') TRUS_HPCC=$2; shift 2;; '-h'|'--help' ) TRUS_HELP=1 ; shift ;;
+ '-u'|'--user' ) TRUS_USER=$2; shift 2;; "*" ) TRUS_HELP=1 ; shift ;;
+ esac
+done
+
+
+## Initialization (HPC & user environment)
+##---------------------------------------------------
+if [[ ! -e config/${TRUS_USER}.cfg || ! -e config/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then
+ cat ./inc/trusting_help.txt
+
+ if [ ${TRUS_HELP} -eq 0 ]; then
+ printf "\n\n\033[0;33m"
+ printf "At least one configuration (arch or user) file is missing or misspelled:"
+ printf "\t'%s'.cfg\t'%s'.cfg" ${TRUS_USER} ${TRUS_HPCC}
+ printf "\033[0m"
+ fi
+
+ printf "\n\nContent of 'config' folder:\n"
+ find config -name *.cfg | cut -d/ -f2 \
+ | xargs -n 4 printf "\t- %-25s\t- %-25s\t- %-25s\t- %-25s\n"
+ exit 1
+else
+ . ./inc/trusting.env
+ [ ${TRUS_DBUG} -eq 1 ] && set -vx
+fi
+
+
+## List last branches from NEMO Forge
+##---------------------------------------------------
+printf "\nWhat branch do you want to install in "${TRUS_WORK}" for trusting test ? "
+echo 'Enter 0 to abort'
+select branch in 'trunk' $( svn ls ${TRUS_SVNH}/branches/2015 | tr -d / | sort -r ); do
+
+ if [ $REPLY -eq 0 ]; then exit 1; else export TRUS_BRAN=$branch; fi
+
+ printf "\nInstallation of a working copy of '%s' branch in '%s'? " ${TRUS_BRAN} ${TRUS_WORK}
+ printf "\nType [Y|y|yes] to confirm, if not back to branches list number\n"
+ read answer
+ [[ $answer == 'Y' || $answer == 'y' || $answer == 'yes' ]] && break
+
+done
+
+echo
+
+
+## First checkout of selected branch
+##---------------------------------------------------
+echo 'Initial checkout of '${TRUS_BRAN}' branch'
+mkdir -p ${TRUS_WORK}/${TRUS_BRAN}/NEMOGCM
+cd ${TRUS_WORK}/${TRUS_BRAN}/NEMOGCM
+
+svn_bran=branches/2015/${TRUS_BRAN}
+[ ${TRUS_BRAN} == 'trunk' ] && svn_bran=${TRUS_BRAN}
+
+for elmt in ${TRUS_CKOT}; do
+ [ $elmt == '\' ] && continue
+ printf "%s " $elmt
+
+ if [ $elmt == 'TOOLS/maketools' ]; then
+ svn co -q ${TRUS_SVNH}/${svn_bran}/NEMOGCM/TOOLS --depth empty
+ svn up -q $elmt
+ else
+ svn co -q ${TRUS_SVNH}/${svn_bran}/NEMOGCM/$elmt $elmt
+ fi
+
+done
+
+printf "\n\n"
+
+
+## Compile rebuild_nemo.exe in anticipation
+##---------------------------------------------------
+if [ $( find ARCH -name arch-${TRUS_HPCC}.fcm ) ]; then
+ echo 'Compile NEMO rebuild tool'
+ cd TOOLS && ./maketools -n REBUILD_NEMO -m ${TRUS_HPCC} -j ${TRUS_NPRO} >& /dev/null
+ [ -e REBUILD_NEMO/rebuild_nemo.exe ] && printf "\033[0;32mOK\033[0m" || printf "\033[0;31mKO\033[0m"
+ printf "\n\n"
+else
+ printf "\033[0;31mNo arch file found to compile NEMO rebuild tool\033[0m\n\n"
+fi
+
+exit 0
+
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/trusting.sh
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/trusting.sh (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/trusting.sh (revision 5974)
@@ -0,0 +1,181 @@
+#!/bin/bash
+
+
+cd $( dirname $0 )
+
+## Set defaults
+##---------------------------------------------------
+TRUS_DIRE=$PWD
+TRUS_DBUG=0; TRUS_PROD=0; TRUS_HELP=0
+## No update on SVN directories & 'FAILED' result for 'Unknown error' )
+TRUS_SVNA='svn status'; TRUS_RSLT='FAILED'; TRUS_RORR=0
+xios_mode='--full'; stdout_redir='>&'
+rev=$( svn info | awk '(NR == 9) {print $NF}' )
+
+
+## Get options (replacing initials settings)
+##---------------------------------------------------
+while [ $# -ne 0 ]; do
+ case $1 in
+ '-a'|'--archive') TRUS_TARF=$2; shift 2;; '-b'|'--branch' ) TRUS_BRAN=$2; shift 2;;
+ '-d'|'--debug' ) TRUS_DBUG=1 ; shift ;; '-e'|'--email' ) TRUS_MAIL=$2; shift 2;;
+ '-f'|'--forcdir') TRUS_FORC=$2; shift 2;; '-j'|'--job' ) TRUS_NPRO=$2; shift 2;;
+ '-h'|'--help' ) TRUS_HELP=1 ; shift ;; '-m'|'--machine') TRUS_HPCC=$2; shift 2;;
+ '-n'|'--newconf') TRUS_CONF=$2; shift 2;; '-r'|'--refconf') TRUS_REFE=$2; shift 2;;
+ '-t'|'--time' ) TRUS_TOUT=$2; shift 2;; '-p'|'--prod' ) TRUS_PROD=1 ; shift ;;
+ '-u'|'--user' ) TRUS_USER=$2; shift 2;; '-v'|'--version') TRUS_SVNV=$2; shift 2;;
+ '-w'|'--workdir') TRUS_WORK=$2; shift 2;; "*" ) TRUS_HELP=1 ; shift ;;
+ esac
+done
+
+
+## Initialization (HPC & user environment)
+##---------------------------------------------------
+if [[ ! -e config/${TRUS_USER}.cfg || ! -e config/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then
+ cat ./inc/trusting_help.txt
+
+ if [ ${TRUS_HELP} -eq 0 ]; then
+ printf "\n\n\033[0;33m"
+ printf "At least one configuration (arch or user) file is missing or misspelled:"
+ printf "\t'%s'.cfg\t'%s'.cfg" ${TRUS_USER} ${TRUS_HPCC}
+ printf "\033[0m"
+ fi
+
+ printf "\n\nContent of 'config' folder:"
+ find config -name *.cfg | cut -d/ -f2 \
+ | xargs -n 4 printf "%-25s\t%-25s\t%-25s\n"
+ exit 1
+else
+ . ./inc/trusting.env && . ./inc/trusting_func.sh
+
+ ## DEBUG option to speed up & expand verbosity of compilation
+ [ ${TRUS_DBUG} -eq 1 ] && { set -vx; xios_mode=''; stdout_redir='>'; }
+
+ ## If -v|--version option has been set, modify default SVN action on directories
+ if [ $( echo ${TRUS_SVNV} | grep "HEAD\|up\|update" ) ]; then
+ TRUS_SVNA='svn update -r HEAD'
+ elif [ $( echo ${TRUS_SVNV} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' ) ]; then
+ TRUS_SVNA='svn update -r '$( echo ${TRUS_SVNV} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' )
+ elif [ $( echo ${TRUS_SVNV} | grep -o '[0-9]*' ) ]; then
+ TRUS_SVNA='svn update -r '$( echo ${TRUS_SVNV} | grep -o '[0-9]*' )
+ fi
+
+fi
+
+
+## Display contextual summary of trusting test
+##---------------------------------------------------
+echo
+if [ -t 0 ]; then cat ./inc/banner.txt; else cat ./inc/banner.html; fi
+echo
+echo '****************************************************************************************************'
+echo '* *'
+echo '* NEMO Trusting (Continuous Integration Tool) *'
+echo "* ver.$rev *"
+echo '* *'
+echo '****************************************************************************************************'
+echo
+printf "\t§ Testing configuration\t\t%s based on %s\n" ${TRUS_CONF} ${TRUS_REFE}
+printf "\t§ SVN working copy\t\t%s/%s\n" ${TRUS_WORK} ${TRUS_BRAN}
+printf "\t§ Benchmark folder\t\t%s\n" ${TRUS_STOR}
+printf "\t§ (Super)Computer\t\t%s\n" ${TRUS_HPCC}
+printf "\t§ User installation\t\t%s\n\n" ${TRUS_USER}
+
+
+## Make timestamped directory with messenger files
+##---------------------------------------------------
+print_step 'Timestamped testing directory'
+mkdir -p ${TRUS_SCRA} ${TRUS_STOR}
+cd ${TRUS_SCRA}
+echo ${TRUS_SCRA}
+init_files
+get_date
+
+
+## Get SVN revision on XIOS & NEMO essentials directories
+##---------------------------------------------------
+print_step "SVN action on NEMO directories: ${TRUS_SVNA}"
+get_nemo_rev
+
+
+## Check softwares versions (after sourced arch environment)
+##---------------------------------------------------
+print_step 'Get testing environement'
+get_soft_rel
+cat model.log | awk '{printf "%-20s %s %s\n", $1, $2, $3}'
+env | sort > env.log
+
+
+## XIOS compilation from scratch
+##---------------------------------------------------
+print_step 'Compile XIOS'
+cd ${TRUS_XIOS}
+eval ./make_xios ${xios_mode} --arch ${TRUS_HPCC} --job ${TRUS_NPRO} \
+ ${stdout_redir} /dev/null
+[ ! -e lib/libxios.a ] && get_out 1 || echo 'Success'
+
+
+## NEMO compilation from scratch
+##---------------------------------------------------
+print_step "Compile ${TRUS_REFE} configuration"
+cd ${TRUS_NGCM}/CONFIG
+[[ -d ${TRUS_CONF} && ${TRUS_DBUG} -eq 0 ]] && ./makenemo -n ${TRUS_CONF} clean_config \
+ > /dev/null < descending, false -> ascending
+SortableTable.prototype.defaultDescending = false;
+
+// shared between all instances. This is intentional to allow external files
+// to modify the prototype
+SortableTable.prototype._sortTypeInfo = {};
+
+SortableTable.prototype.setTable = function (oTable) {
+ if ( this.tHead )
+ this.uninitHeader();
+ this.element = oTable;
+ this.setTHead( oTable.tHead );
+ this.setTBody( oTable.tBodies[0] );
+};
+
+SortableTable.prototype.setTHead = function (oTHead) {
+ if (this.tHead && this.tHead != oTHead )
+ this.uninitHeader();
+ this.tHead = oTHead;
+ this.initHeader( this.sortTypes );
+};
+
+SortableTable.prototype.setTBody = function (oTBody) {
+ this.tBody = oTBody;
+};
+
+SortableTable.prototype.setSortTypes = function ( oSortTypes ) {
+ if ( this.tHead )
+ this.uninitHeader();
+ this.sortTypes = oSortTypes || [];
+ if ( this.tHead )
+ this.initHeader( this.sortTypes );
+};
+
+// adds arrow containers and events
+// also binds sort type to the header cells so that reordering columns does
+// not break the sort types
+SortableTable.prototype.initHeader = function (oSortTypes) {
+ if (!this.tHead) return;
+ var cells = this.tHead.rows[0].cells;
+ var doc = this.tHead.ownerDocument || this.tHead.document;
+ this.sortTypes = oSortTypes || [];
+ var l = cells.length;
+ var img, c;
+ for (var i = 0; i < l; i++) {
+ c = cells[i];
+ if (this.sortTypes[i] != null && this.sortTypes[i] != "None") {
+ img = doc.createElement("IMG");
+ img.src = "html/images/blank.png";
+ c.appendChild(img);
+ if (this.sortTypes[i] != null)
+ c._sortType = this.sortTypes[i];
+ if (typeof c.addEventListener != "undefined")
+ c.addEventListener("click", this._headerOnclick, false);
+ else if (typeof c.attachEvent != "undefined")
+ c.attachEvent("onclick", this._headerOnclick);
+ else
+ c.onclick = this._headerOnclick;
+ }
+ else
+ {
+ c.setAttribute( "_sortType", oSortTypes[i] );
+ c._sortType = "None";
+ }
+ }
+ this.updateHeaderArrows();
+};
+
+// remove arrows and events
+SortableTable.prototype.uninitHeader = function () {
+ if (!this.tHead) return;
+ var cells = this.tHead.rows[0].cells;
+ var l = cells.length;
+ var c;
+ for (var i = 0; i < l; i++) {
+ c = cells[i];
+ if (c._sortType != null && c._sortType != "None") {
+ c.removeChild(c.lastChild);
+ if (typeof c.removeEventListener != "undefined")
+ c.removeEventListener("click", this._headerOnclick, false);
+ else if (typeof c.detachEvent != "undefined")
+ c.detachEvent("onclick", this._headerOnclick);
+ c._sortType = null;
+ c.removeAttribute( "_sortType" );
+ }
+ }
+};
+
+SortableTable.prototype.updateHeaderArrows = function () {
+ if (!this.tHead) return;
+ var cells = this.tHead.rows[0].cells;
+ var l = cells.length;
+ var img;
+ for (var i = 0; i < l; i++) {
+ if (cells[i]._sortType != null && cells[i]._sortType != "None") {
+ img = cells[i].lastChild;
+ if (i == this.sortColumn)
+ img.className = "sort-arrow " + (this.descending ? "descending" : "ascending");
+ else
+ img.className = "sort-arrow";
+ }
+ }
+};
+
+SortableTable.prototype.headerOnclick = function (e) {
+ // find TD element
+ var el = e.target || e.srcElement;
+ while (el.tagName != "TD")
+ el = el.parentNode;
+
+ this.sort(SortableTable.msie ? SortableTable.getCellIndex(el) : el.cellIndex);
+};
+
+// IE returns wrong cellIndex when columns are hidden
+SortableTable.getCellIndex = function (oTd) {
+ var cells = oTd.parentNode.childNodes
+ var l = cells.length;
+ var i;
+ for (i = 0; cells[i] != oTd && i < l; i++)
+ ;
+ return i;
+};
+
+SortableTable.prototype.getSortType = function (nColumn) {
+ return this.sortTypes[nColumn] || "String";
+};
+
+// only nColumn is required
+// if bDescending is left out the old value is taken into account
+// if sSortType is left out the sort type is found from the sortTypes array
+
+SortableTable.prototype.sort = function (nColumn, bDescending, sSortType) {
+ if (!this.tBody) return;
+ if (sSortType == null)
+ sSortType = this.getSortType(nColumn);
+
+ // exit if None
+ if (sSortType == "None")
+ return;
+
+ if (bDescending == null) {
+ if (this.sortColumn != nColumn)
+ this.descending = this.defaultDescending;
+ else
+ this.descending = !this.descending;
+ }
+ else
+ this.descending = bDescending;
+
+ this.sortColumn = nColumn;
+
+ if (typeof this.onbeforesort == "function")
+ this.onbeforesort();
+
+ var f = this.getSortFunction(sSortType, nColumn);
+ var a = this.getCache(sSortType, nColumn);
+ var tBody = this.tBody;
+
+ a.sort(f);
+
+ if (this.descending)
+ a.reverse();
+
+ if (SortableTable.removeBeforeSort) {
+ // remove from doc
+ var nextSibling = tBody.nextSibling;
+ var p = tBody.parentNode;
+ p.removeChild(tBody);
+ }
+
+ // insert in the new order
+ var l = a.length;
+ for (var i = 0; i < l; i++)
+ tBody.appendChild(a[i].element);
+
+ if (SortableTable.removeBeforeSort) {
+ // insert into doc
+ p.insertBefore(tBody, nextSibling);
+ }
+
+ this.updateHeaderArrows();
+
+ this.destroyCache(a);
+
+ if (typeof this.onsort == "function")
+ this.onsort();
+};
+
+SortableTable.prototype.asyncSort = function (nColumn, bDescending, sSortType) {
+ var oThis = this;
+ this._asyncsort = function () {
+ oThis.sort(nColumn, bDescending, sSortType);
+ };
+ window.setTimeout(this._asyncsort, 1);
+};
+
+SortableTable.prototype.getCache = function (sType, nColumn) {
+ if (!this.tBody) return [];
+ var rows = this.tBody.rows;
+ var l = rows.length;
+ var a = new Array(l);
+ var r;
+ for (var i = 0; i < l; i++) {
+ r = rows[i];
+ a[i] = {
+ value: this.getRowValue(r, sType, nColumn),
+ element: r
+ };
+ };
+ return a;
+};
+
+SortableTable.prototype.destroyCache = function (oArray) {
+ var l = oArray.length;
+ for (var i = 0; i < l; i++) {
+ oArray[i].value = null;
+ oArray[i].element = null;
+ oArray[i] = null;
+ }
+};
+
+SortableTable.prototype.getRowValue = function (oRow, sType, nColumn) {
+ // if we have defined a custom getRowValue use that
+ if (this._sortTypeInfo[sType] && this._sortTypeInfo[sType].getRowValue)
+ return this._sortTypeInfo[sType].getRowValue(oRow, nColumn);
+
+ var s;
+ var c = oRow.cells[nColumn];
+ if (typeof c.innerText != "undefined")
+ s = c.innerText;
+ else
+ s = SortableTable.getInnerText(c);
+ return this.getValueFromString(s, sType);
+};
+
+SortableTable.getInnerText = function (oNode) {
+ var s = "";
+ var cs = oNode.childNodes;
+ var l = cs.length;
+ for (var i = 0; i < l; i++) {
+ switch (cs[i].nodeType) {
+ case 1: //ELEMENT_NODE
+ s += SortableTable.getInnerText(cs[i]);
+ break;
+ case 3: //TEXT_NODE
+ s += cs[i].nodeValue;
+ break;
+ }
+ }
+ return s;
+};
+
+SortableTable.prototype.getValueFromString = function (sText, sType) {
+ if (this._sortTypeInfo[sType])
+ return this._sortTypeInfo[sType].getValueFromString( sText );
+ return sText;
+ /*
+ switch (sType) {
+ case "Number":
+ return Number(sText);
+ case "CaseInsensitiveString":
+ return sText.toUpperCase();
+ case "Date":
+ var parts = sText.split("-");
+ var d = new Date(0);
+ d.setFullYear(parts[0]);
+ d.setDate(parts[2]);
+ d.setMonth(parts[1] - 1);
+ return d.valueOf();
+ }
+ return sText;
+ */
+ };
+
+SortableTable.prototype.getSortFunction = function (sType, nColumn) {
+ if (this._sortTypeInfo[sType])
+ return this._sortTypeInfo[sType].compare;
+ return SortableTable.basicCompare;
+};
+
+SortableTable.prototype.destroy = function () {
+ this.uninitHeader();
+ var win = this.document.parentWindow;
+ if (win && typeof win.detachEvent != "undefined") { // only IE needs this
+ win.detachEvent("onunload", this._onunload);
+ }
+ this._onunload = null;
+ this.element = null;
+ this.tHead = null;
+ this.tBody = null;
+ this.document = null;
+ this._headerOnclick = null;
+ this.sortTypes = null;
+ this._asyncsort = null;
+ this.onsort = null;
+};
+
+// Adds a sort type to all instance of SortableTable
+// sType : String - the identifier of the sort type
+// fGetValueFromString : function ( s : string ) : T - A function that takes a
+// string and casts it to a desired format. If left out the string is just
+// returned
+// fCompareFunction : function ( n1 : T, n2 : T ) : Number - A normal JS sort
+// compare function. Takes two values and compares them. If left out less than,
+// <, compare is used
+// fGetRowValue : function( oRow : HTMLTRElement, nColumn : int ) : T - A function
+// that takes the row and the column index and returns the value used to compare.
+// If left out then the innerText is first taken for the cell and then the
+// fGetValueFromString is used to convert that string the desired value and type
+
+SortableTable.prototype.addSortType = function (sType, fGetValueFromString, fCompareFunction, fGetRowValue) {
+ this._sortTypeInfo[sType] = {
+ type: sType,
+ getValueFromString: fGetValueFromString || SortableTable.idFunction,
+ compare: fCompareFunction || SortableTable.basicCompare,
+ getRowValue: fGetRowValue
+ };
+};
+
+// this removes the sort type from all instances of SortableTable
+SortableTable.prototype.removeSortType = function (sType) {
+ delete this._sortTypeInfo[sType];
+};
+
+SortableTable.basicCompare = function compare(n1, n2) {
+ if (n1.value < n2.value)
+ return -1;
+ if (n2.value < n1.value)
+ return 1;
+ return 0;
+};
+
+SortableTable.idFunction = function (x) {
+ return x;
+};
+
+SortableTable.toUpperCase = function (s) {
+ return s.toUpperCase();
+};
+
+SortableTable.toDate = function (s) {
+ var parts = s.split("-");
+ var d = new Date(0);
+ d.setFullYear(parts[0]);
+ d.setDate(parts[2]);
+ d.setMonth(parts[1] - 1);
+ return d.valueOf();
+};
+
+
+// add sort types
+SortableTable.prototype.addSortType("Number", Number);
+SortableTable.prototype.addSortType("CaseInsensitiveString", SortableTable.toUpperCase);
+SortableTable.prototype.addSortType("Date", SortableTable.toDate);
+SortableTable.prototype.addSortType("String");
+// None is a special case
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/html/tab-view.css
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/html/tab-view.css (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/html/tab-view.css (revision 5974)
@@ -0,0 +1,60 @@
+ .dhtmlgoodies_tabPane{
+ height:21px; /* Height of tabs */
+ border-bottom:1px solid #919b9c;
+ }
+ .dhtmlgoodies_aTab{
+ border-left:1px solid #919b9c;
+ border-right:1px solid #919b9c;
+ border-bottom:1px solid #919b9c;
+ font-family: Trebuchet MS, Lucida Sans Unicode, Arial, sans-serif;
+ padding:5px;
+
+ }
+ .dhtmlgoodies_tabPane DIV{
+ float:left;
+ height:100%; /* Height of tabs */
+ padding-left:3px;
+ vertical-align:middle;
+ background-repeat:no-repeat;
+ background-position:bottom left;
+ cursor:pointer;
+ position:relative;
+ bottom:-1px;
+ margin-left:0px;
+ margin-right:0px;
+ }
+ .dhtmlgoodies_tabPane .tabActive{
+ background-image:url('../images/tab_left_active.gif');
+ margin-left:0px;
+ margin-right:0px;
+ z-index:10;
+ }
+ .dhtmlgoodies_tabPane .tabInactive{
+ background-image:url('../images/tab_left_inactive.gif');
+ margin-left:0px;
+ margin-right:0px;
+ z-index:1;
+ }
+
+ .dhtmlgoodies_tabPane .inactiveTabOver{
+ background-image:url('../images/tab_left_over.gif');
+ margin-left:0px;
+ margin-right:0px;
+ }
+ .dhtmlgoodies_tabPane span{
+ font-family:arial;
+ vertical-align:top;
+ font-size:11px;
+ padding-left:3px;
+ padding-right:3px;
+ line-height:21px;
+ float:left;
+ }
+ .dhtmlgoodies_tabPane .tabActive span{
+ padding-bottom:1px;
+ line-height:20px;
+ }
+
+ .dhtmlgoodies_tabPane img{
+ float:left;
+ }
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/html/tab-view.js
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/html/tab-view.js (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/html/tab-view.js (revision 5974)
@@ -0,0 +1,375 @@
+ /************************************************************************************************************
+ (C) www.dhtmlgoodies.com, October 2005
+
+ This is a script from www.dhtmlgoodies.com. You will find this and a lot of other scripts at our website.
+
+ Terms of use:
+ You are free to use this script as long as the copyright message is kept intact. However, you may not
+ redistribute, sell or repost it without our permission.
+
+ Updated:
+
+ March, 14th, 2006 - Create new tabs dynamically
+ March, 15th, 2006 - Dynamically delete a tab
+
+ Thank you!
+
+ www.dhtmlgoodies.com
+ Alf Magne Kalleland
+
+ ************************************************************************************************************/
+ var textPadding = 3; // Padding at the left of tab text - bigger value gives you wider tabs
+ var strictDocType = true;
+ var tabView_maxNumberOfTabs = 6; // Maximum number of tabs
+
+ /* Don't change anything below here */
+ var dhtmlgoodies_tabObj = new Array();
+ var activeTabIndex = new Array();
+ var MSIE = navigator.userAgent.indexOf('MSIE')>=0?true:false;
+
+ var regExp = new RegExp(".*MSIE ([0-9]\.[0-9]).*","g");
+ var navigatorVersion = navigator.userAgent.replace(regExp,'$1');
+
+ var ajaxObjects = new Array();
+ var tabView_countTabs = new Array();
+ var tabViewHeight = new Array();
+ var tabDivCounter = 0;
+ var closeImageHeight = 8; // Pixel height of close buttons
+ var closeImageWidth = 8; // Pixel height of close buttons
+
+
+ function setPadding(obj,padding){
+ var span = obj.getElementsByTagName('SPAN')[0];
+ span.style.paddingLeft = padding + 'px';
+ span.style.paddingRight = padding + 'px';
+ }
+ function showTab(parentId,tabIndex)
+ {
+ var parentId_div = parentId + "_";
+ if(!document.getElementById('tabView' + parentId_div + tabIndex)){
+ return;
+ }
+ if(activeTabIndex[parentId]>=0){
+ if(activeTabIndex[parentId]==tabIndex){
+ return;
+ }
+
+ var obj = document.getElementById('tabTab'+parentId_div + activeTabIndex[parentId]);
+
+ obj.className='tabInactive';
+ var img = obj.getElementsByTagName('IMG')[0];
+ if(img.src.indexOf('tab_')==-1)img = obj.getElementsByTagName('IMG')[1];
+ img.src = 'images/tab_right_inactive.gif';
+ document.getElementById('tabView' + parentId_div + activeTabIndex[parentId]).style.display='none';
+ }
+
+ var thisObj = document.getElementById('tabTab'+ parentId_div +tabIndex);
+
+ thisObj.className='tabActive';
+ var img = thisObj.getElementsByTagName('IMG')[0];
+ if(img.src.indexOf('tab_')==-1)img = thisObj.getElementsByTagName('IMG')[1];
+ img.src = 'images/tab_right_active.gif';
+
+ document.getElementById('tabView' + parentId_div + tabIndex).style.display='block';
+ activeTabIndex[parentId] = tabIndex;
+
+
+ var parentObj = thisObj.parentNode;
+ var aTab = parentObj.getElementsByTagName('DIV')[0];
+ countObjects = 0;
+ var startPos = 2;
+ var previousObjectActive = false;
+ while(aTab){
+ if(aTab.tagName=='DIV'){
+ if(previousObjectActive){
+ previousObjectActive = false;
+ startPos-=2;
+ }
+ if(aTab==thisObj){
+ startPos-=2;
+ previousObjectActive=true;
+ setPadding(aTab,textPadding+1);
+ }else{
+ setPadding(aTab,textPadding);
+ }
+
+ aTab.style.left = startPos + 'px';
+ countObjects++;
+ startPos+=2;
+ }
+ aTab = aTab.nextSibling;
+ }
+
+ return;
+ }
+
+ function tabClick()
+ {
+ var idArray = this.id.split('_');
+ showTab(this.parentNode.parentNode.id,idArray[idArray.length-1].replace(/[^0-9]/gi,''));
+
+ }
+
+ function rolloverTab()
+ {
+ if(this.className.indexOf('tabInactive')>=0){
+ this.className='inactiveTabOver';
+ var img = this.getElementsByTagName('IMG')[0];
+ if(img.src.indexOf('tab_')<=0)img = this.getElementsByTagName('IMG')[1];
+ img.src = 'images/tab_right_over.gif';
+ }
+
+ }
+ function rolloutTab()
+ {
+ if(this.className == 'inactiveTabOver'){
+ this.className='tabInactive';
+ var img = this.getElementsByTagName('IMG')[0];
+ if(img.src.indexOf('tab_')<=0)img = this.getElementsByTagName('IMG')[1];
+ img.src = 'images/tab_right_inactive.gif';
+ }
+
+ }
+
+ function hoverTabViewCloseButton()
+ {
+ this.src = this.src.replace('close.gif','close_over.gif');
+ }
+
+ function stopHoverTabViewCloseButton()
+ {
+ this.src = this.src.replace('close_over.gif','close.gif');
+ }
+
+ function initTabs(mainContainerID,tabTitles,activeTab,width,height,closeButtonArray,additionalTab)
+ {
+ if(!closeButtonArray)closeButtonArray = new Array();
+
+ if(!additionalTab || additionalTab=='undefined'){
+ dhtmlgoodies_tabObj[mainContainerID] = document.getElementById(mainContainerID);
+ width = width + '';
+ if(width.indexOf('%')<0)width= width + 'px';
+ dhtmlgoodies_tabObj[mainContainerID].style.width = width;
+
+ height = height + '';
+ if(height.length>0){
+ if(height.indexOf('%')<0)height= height + 'px';
+ dhtmlgoodies_tabObj[mainContainerID].style.height = height;
+ }
+
+
+ tabViewHeight[mainContainerID] = height;
+
+ var tabDiv = document.createElement('DIV');
+ var firstDiv = dhtmlgoodies_tabObj[mainContainerID].getElementsByTagName('DIV')[0];
+
+ dhtmlgoodies_tabObj[mainContainerID].insertBefore(tabDiv,firstDiv);
+ tabDiv.className = 'dhtmlgoodies_tabPane';
+ tabView_countTabs[mainContainerID] = 0;
+
+ }else{
+ var tabDiv = dhtmlgoodies_tabObj[mainContainerID].getElementsByTagName('DIV')[0];
+ var firstDiv = dhtmlgoodies_tabObj[mainContainerID].getElementsByTagName('DIV')[1];
+ height = tabViewHeight[mainContainerID];
+ activeTab = tabView_countTabs[mainContainerID];
+
+
+ }
+
+
+
+ for(var no=0;no0)tabs[no].style.height = height;
+ tabs[no].style.display='none';
+ tabs[no].id = 'tabView' + mainContainerID + "_" + divCounter;
+ divCounter++;
+ }
+ }
+ tabView_countTabs[mainContainerID] = tabView_countTabs[mainContainerID] + tabTitles.length;
+ showTab(mainContainerID,activeTab);
+
+ return activeTab;
+ }
+
+ function showAjaxTabContent(ajaxIndex,parentId,tabId)
+ {
+ var obj = document.getElementById('tabView'+parentId + '_' + tabId);
+ obj.innerHTML = ajaxObjects[ajaxIndex].response;
+ }
+
+ function resetTabIds(parentId)
+ {
+ var tabTitleCounter = 0;
+ var tabContentCounter = 0;
+
+
+ var divs = dhtmlgoodies_tabObj[parentId].getElementsByTagName('DIV');
+
+
+ for(var no=0;no=0){
+ divs[no].id = 'tabTab' + parentId + '_' + tabContentCounter;
+ tabContentCounter++;
+ }
+
+
+ }
+
+ tabView_countTabs[parentId] = tabContentCounter;
+ }
+
+
+ function createNewTab(parentId,tabTitle,tabContent,tabContentUrl,closeButton)
+ {
+ if(tabView_countTabs[parentId]>=tabView_maxNumberOfTabs)return; // Maximum number of tabs reached - return
+ var div = document.createElement('DIV');
+ div.className = 'dhtmlgoodies_aTab';
+ dhtmlgoodies_tabObj[parentId].appendChild(div);
+
+ var tabId = initTabs(parentId,Array(tabTitle),0,'','',Array(closeButton),true);
+ if(tabContent)div.innerHTML = tabContent;
+ if(tabContentUrl){
+ var ajaxIndex = ajaxObjects.length;
+ ajaxObjects[ajaxIndex] = new sack();
+ ajaxObjects[ajaxIndex].requestFile = tabContentUrl; // Specifying which file to get
+
+ ajaxObjects[ajaxIndex].onCompletion = function(){ showAjaxTabContent(ajaxIndex,parentId,tabId); }; // Specify function that will be executed after file has been found
+ ajaxObjects[ajaxIndex].runAJAX(); // Execute AJAX function
+
+ }
+
+ }
+
+ function getTabIndexByTitle(tabTitle)
+ {
+ var regExp = new RegExp("(.*?) .*$","gi");
+ tabTitle = tabTitle.replace(regExp,'$1');
+ for(var prop in dhtmlgoodies_tabObj){
+ var divs = dhtmlgoodies_tabObj[prop].getElementsByTagName('DIV');
+ for(var no=0;no=0){
+ var span = divs[no].getElementsByTagName('SPAN')[0];
+ var regExp2 = new RegExp("(.*?) .*$","gi");
+ var spanTitle = span.innerHTML.replace(regExp2,'$1');
+
+ if(spanTitle == tabTitle){
+
+ var tmpId = divs[no].id.split('_');
+ return Array(prop,tmpId[tmpId.length-1].replace(/[^0-9]/g,'')/1);
+ }
+ }
+ }
+ }
+
+ return -1;
+
+ }
+
+ /* Call this function if you want to display some content from external file in one of the tabs
+ Arguments: Title of tab and relative path to external file */
+
+ function addAjaxContentToTab(tabTitle,tabContentUrl)
+ {
+ var index = getTabIndexByTitle(tabTitle);
+ if(index!=-1){
+ var ajaxIndex = ajaxObjects.length;
+
+ tabId = index[1];
+ parentId = index[0];
+
+
+ ajaxObjects[ajaxIndex] = new sack();
+ ajaxObjects[ajaxIndex].requestFile = tabContentUrl; // Specifying which file to get
+
+ ajaxObjects[ajaxIndex].onCompletion = function(){ showAjaxTabContent(ajaxIndex,parentId,tabId); }; // Specify function that will be executed after file has been found
+ ajaxObjects[ajaxIndex].runAJAX(); // Execute AJAX function
+
+ }
+ }
+
+
+
+ function deleteTab(tabLabel,tabIndex,parentId)
+ {
+
+ if(tabLabel){
+ var index = getTabIndexByTitle(tabLabel);
+ if(index!=-1){
+ deleteTab(false,index[1],index[0]);
+ }
+
+ }else if(tabIndex>=0){
+ if(document.getElementById('tabTab' + parentId + '_' + tabIndex)){
+ var obj = document.getElementById('tabTab' + parentId + '_' + tabIndex);
+ var id = obj.parentNode.parentNode.id;
+ obj.parentNode.removeChild(obj);
+ var obj2 = document.getElementById('tabView' + parentId + '_' + tabIndex);
+ obj2.parentNode.removeChild(obj2);
+ resetTabIds(parentId);
+ activeTabIndex[parentId]=-1;
+ showTab(parentId,'0');
+ }
+ }
+
+
+
+
+
+ }
+
+
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/index.html
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/index.html (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/index.html (revision 5974)
@@ -0,0 +1,354 @@
+
+
+
+
+ NEMO Trusting Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/index.php
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/index.php (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/index.php (revision 5974)
@@ -0,0 +1,354 @@
+
+
+
+
+ Trusting Dashboard
+
+
+
+
+
+
+
+
+
+
+
+ array('timeout'=>1)));
+ $test=file_get_contents("${DODS_TGCC}/ORCA2_LIM_PISCES/nemo_v3_6_STABLE/trusting_info.html", 0, $ctx);
+ if ($test == FALSE ) { $LOCATION="./src/martin"; } else { $LOCATION="${DODS_TGCC}"; }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/read_trusting.php
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/read_trusting.php (revision 5974)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/TRUST/web/read_trusting.php (revision 5974)
@@ -0,0 +1,52 @@
+
+\n\n"); print("\n");
+ break;
+ default:
+ if ( $row % 2 == 1 ) { print("
\n") ; }
+ else { print("
\n"); }
+ }
+
+ $num = count($data);
+ #echo " $num champs ligne $row:
\n";
+
+ for ($c=0; $c<$num1; $c++) {
+ #echo $data[$c] . "
\n";
+ if ($c > $num ) { $var=""; } else { $var=trim($data[$c]); }
+
+ switch ($var) {
+ case "FAILED" : print("".$var." | \n"); break;
+ case "Different": print("".$var." | \n"); break;
+ case "OK" : print("".$var." | \n"); break;
+ default : print("".$var." | \n") ;
+ }
+
+ }
+
+ print("
\n\n");
+ if ( $row == 1 ) { print("\n\n"); print("\n\n"); }
+ $row++;
+ }
+
+ fclose($handle);
+ }
+
+ print("\n");
+}
+
+?>
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-amm12.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-amm12.cfg (revision 5973)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-amm12.cfg (revision 5974)
@@ -1,2 +1,2 @@
preprocess.prop{fpp.defs} = \
- key_bdy key_tide key_dynspg_ts key_ldfslp key_zdfgls key_vvl key_diainstant key_mpp_mpi key_iomput
+ key_bdy key_tide key_ldfslp key_zdfgls key_vvl key_diainstant key_mpp_mpi key_iomput
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-gyre.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-gyre.cfg (revision 5973)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-gyre.cfg (revision 5974)
@@ -1,2 +1,2 @@
preprocess.prop{fpp.defs} = \
- key_dynspg_flt key_ldfslp key_zdftke key_iomput key_mpp_mpi key_nosignedzero
+ key_ldfslp key_zdftke key_iomput key_mpp_mpi key_nosignedzero
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-gyre_pisces.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-gyre_pisces.cfg (revision 5973)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-gyre_pisces.cfg (revision 5974)
@@ -1,2 +1,2 @@
preprocess.prop{fpp.defs} = \
- key_dynspg_flt key_ldfslp key_zdftke key_top key_pisces_reduced key_iomput key_mpp_mpi
+ key_ldfslp key_zdftke key_top key_pisces_reduced key_iomput key_mpp_mpi
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim.cfg (revision 5973)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim.cfg (revision 5974)
@@ -1,2 +1,2 @@
preprocess.prop{fpp.defs} = \
- key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_asminc
+ key_trabbl key_lim2 key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_asminc
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim3.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim3.cfg (revision 5973)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim3.cfg (revision 5974)
@@ -1,2 +1,3 @@
preprocess.prop{fpp.defs} = \
- key_trabbl key_lim3 key_vvl key_dynspg_ts key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_asminc
+ key_trabbl key_lim3 key_vvl key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_asminc
+ key_trabbl key_lim3 key_vvl key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_diaobs key_asminc
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim_cfc.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim_cfc.cfg (revision 5973)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim_cfc.cfg (revision 5974)
@@ -1,2 +1,2 @@
preprocess.prop{fpp.defs} = \
- key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_top key_cfc key_c14b key_iomput key_mpp_mpi
+ key_trabbl key_lim2 key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_top key_cfc key_c14b key_iomput key_mpp_mpi
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim_pisces.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim_pisces.cfg (revision 5973)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_lim_pisces.cfg (revision 5974)
@@ -1,2 +1,2 @@
preprocess.prop{fpp.defs} = \
- key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_top key_pisces key_iomput key_mpp_mpi
+ key_trabbl key_lim2 key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_top key_pisces key_iomput key_mpp_mpi
Index: /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_sas_lim.cfg
===================================================================
--- /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_sas_lim.cfg (revision 5973)
+++ /branches/2015/dev_r5072_UKMO2_OBS_simplification/NEMOGCM/fcm-make/inc/keys-orca2_sas_lim.cfg (revision 5974)
@@ -1,2 +1,2 @@
preprocess.prop{fpp.defs} = \
- key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi
+ key_trabbl key_lim2 key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi