| 175 | |
| 176 | '''Preparing for 2014 merge''' |
| 177 | |
| 178 | This branch has been prepared for the 2014 merge by the addition of trunk chanes between revision 4743 and 4879: |
| 179 | |
| 180 | |
| 181 | {{{ |
| 182 | svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4743 \ |
| 183 | svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@4879 ./ |
| 184 | svn ci -m 'Branch 2014/dev_r4743_NOC2_ZTS. Merged in trunk changes from r4743 to r4879 in \ |
| 185 | preparation for the annual merge. See ticket #1367 and https://forge.ipsl.jussieu.fr/nemo/wiki/ticket/1367_NOC2_ZTS' |
| 186 | |
| 187 | Sending DOC/TexFiles/Chapters/Chap_DYN.tex |
| 188 | Sending NEMOGCM/ARCH/CMCC/arch-PW6_calypso.fcm |
| 189 | Sending NEMOGCM/ARCH/CMCC/arch-PW6_calypso_debug.fcm |
| 190 | Sending NEMOGCM/ARCH/CMCC/arch-PW6_calypso_tools.fcm |
| 191 | Sending NEMOGCM/ARCH/CMCC/arch-gfortran_athena_xios.fcm |
| 192 | Sending NEMOGCM/ARCH/CMCC/arch-ifort_athena.fcm |
| 193 | Sending NEMOGCM/ARCH/CMCC/arch-ifort_athena_debug.fcm |
| 194 | Sending NEMOGCM/ARCH/CMCC/arch-ifort_athena_tools.fcm |
| 195 | Sending NEMOGCM/ARCH/CMCC/arch-ifort_athena_xios.fcm |
| 196 | Sending NEMOGCM/ARCH/INGV/arch-IBM_EKMAN_INGV.fcm |
| 197 | Sending NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm |
| 198 | Sending NEMOGCM/ARCH/arch-PW7_C2A_XIO.fcm |
| 199 | Sending NEMOGCM/ARCH/arch-PW7_METO.fcm |
| 200 | Sending NEMOGCM/ARCH/arch-X64_CURIE.fcm |
| 201 | Sending NEMOGCM/ARCH/arch-X64_MOBILIS.fcm |
| 202 | Sending NEMOGCM/ARCH/arch-X64_VAYU.fcm |
| 203 | Sending NEMOGCM/ARCH/arch-X64_YELLOWSTONE.fcm |
| 204 | Sending NEMOGCM/ARCH/arch-XC_ARCHER.fcm |
| 205 | Sending NEMOGCM/ARCH/arch-XC_ARCHER_INTEL.fcm |
| 206 | Sending NEMOGCM/ARCH/arch-macport_osx.fcm |
| 207 | Sending NEMOGCM/ARCH/arch-openmpi_NAVITI_MERCATOR.fcm |
| 208 | Sending NEMOGCM/ARCH/arch-x3750_ADA.fcm |
| 209 | Sending NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg |
| 210 | Sending NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/README |
| 211 | Sending NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_IceFrac.pro |
| 212 | Sending NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_all.pro |
| 213 | Sending NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_vardef.sh |
| 214 | Sending NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_vardef.sh.old_names |
| 215 | Sending NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_ICE.pro |
| 216 | Sending NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_ICE_FRAM.pro |
| 217 | Sending NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_ICE_Vol.pro |
| 218 | Sending NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_all.pro |
| 219 | Sending NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_ts_vardef.sh |
| 220 | Sending NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml |
| 221 | Sending NEMOGCM/CONFIG/SHARED/1_namelist_ref |
| 222 | Sending NEMOGCM/CONFIG/SHARED/field_def.xml |
| 223 | Sending NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref |
| 224 | Sending NEMOGCM/CONFIG/SHARED/namelist_ref |
| 225 | Sending NEMOGCM/NEMO/LIM_SRC_3/ice.F90 |
| 226 | Sending NEMOGCM/NEMO/LIM_SRC_3/iceini.F90 |
| 227 | Sending NEMOGCM/NEMO/LIM_SRC_3/limcons.F90 |
| 228 | Sending NEMOGCM/NEMO/LIM_SRC_3/limdiahsb.F90 |
| 229 | Sending NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90 |
| 230 | Sending NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 |
| 231 | Sending NEMOGCM/NEMO/LIM_SRC_3/limitd_me.F90 |
| 232 | Sending NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90 |
| 233 | Sending NEMOGCM/NEMO/LIM_SRC_3/limsbc.F90 |
| 234 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd.F90 |
| 235 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90 |
| 236 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 |
| 237 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90 |
| 238 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 |
| 239 | Sending NEMOGCM/NEMO/LIM_SRC_3/limthd_sal.F90 |
| 240 | Sending NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90 |
| 241 | Sending NEMOGCM/NEMO/LIM_SRC_3/limupdate1.F90 |
| 242 | Sending NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 |
| 243 | Sending NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 |
| 244 | Sending NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 |
| 245 | Sending NEMOGCM/NEMO/LIM_SRC_3/par_ice.F90 |
| 246 | Sending NEMOGCM/NEMO/LIM_SRC_3/thd_ice.F90 |
| 247 | Sending NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 |
| 248 | Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdyice_lim.F90 |
| 249 | Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 |
| 250 | Sending NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 |
| 251 | Sending NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 |
| 252 | Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 |
| 253 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 |
| 254 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 |
| 255 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 |
| 256 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90 |
| 257 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 |
| 258 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 |
| 259 | Sending NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 |
| 260 | Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90 |
| 261 | Sending NEMOGCM/NEMO/OPA_SRC/oce.F90 |
| 262 | Sending NEMOGCM/NEMO/OPA_SRC/step.F90 |
| 263 | Sending NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 |
| 264 | Sending NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmeso.F90 |
| 265 | Sending NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90 |
| 266 | Sending NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90 |
| 267 | Sending NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA |
| 268 | Sending NEMOGCM/SETTE/iodef_sette.xml |
| 269 | Sending NEMOGCM/SETTE/prepare_exe_dir.sh |
| 270 | Sending NEMOGCM/SETTE/prepare_job.sh |
| 271 | Sending NEMOGCM/SETTE/sette.sh |
| 272 | Sending NEMOGCM/SETTE/sette_beginner.sh |
| 273 | Sending NEMOGCM/TOOLS/COMPILE/bld.cfg |
| 274 | Sending NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg |
| 275 | Sending NEMOGCM/TOOLS/COMPILE/bld_tools.cfg |
| 276 | Sending NEMOGCM/TOOLS/COMPILE/bldxag.cfg |
| 277 | Adding NEMOGCM/ARCH/arch-x3750_ADA_O0.fcm |
| 278 | Adding NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_MLD_ortho.pro |
| 279 | Adding NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/std_plot_vardef.sh.pstar4-testht |
| 280 | Adding NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC_ARCHER_INTEL |
| 281 | Adding NEMOGCM/SETTE/BATCH_TEMPLATE/batch-x3750_ADA_O0 |
| 282 | Adding NEMOGCM/SETTE/input_ORCA2_LIM3.cfg |
| 283 | |
| 284 | Committed revision 4899. |
| 285 | }}} |
| 286 | |
| 287 | And finally by confirmation that the branch passes SETTE tests: |
| 288 | |
| 289 | |
| 290 | {{{ |
| 291 | ./sette_rpt |
| 292 | GYRE restartability passed |
| 293 | ORCA2LIMPIS restartability passed |
| 294 | ORCA2OFFPIS restartability passed |
| 295 | AMM12 restartability passed |
| 296 | SAS restartability inconclusive ( solver.stat not found ) |
| 297 | |
| 298 | GYRE reproducibility passed |
| 299 | ORCA2LIMPIS reproducibility passed |
| 300 | ORCA2OFFPIS reproducibility passed |
| 301 | AMM12 reproducibility passed |
| 302 | SAS reproducibility inconclusive ( solver.stat not found ) |
| 303 | }}} |