'''Stage 1 of 2012 merge party. ''' Merge NOC and Mercator developments '''Step 1'''. Copy NOC 2012 development branch {{{ svn copy svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_NOC_2012_rev3555 \ svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_NOC_MERCATOR_2012 \ -m"Create branch for the merge of all NOC and MERCATOR 2012 developments. See ticket #1020. Step 1: copy NOC branch to 2012/dev_NOC_MERCATOR_2012" }}} '''Step 2'''. Merge Mercator's branch into dev_NOC_MERCATOR_2012 branch {{{ svn co svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_NOC_MERCATOR_2012 dev_NOC_MERCATOR_2012 cd dev_NOC_MERCATOR_2012 svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_MERCATOR_2012_rev3555 . --- Merging r3556 through r3653 into '.': U NEMOGCM/SETTE/iodef_sette.xml U NEMOGCM/SETTE/sette.sh U NEMOGCM/SETTE/param.cfg U NEMOGCM/SETTE/prepare_job.sh U NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER U NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist U NEMOGCM/CONFIG/GYRE/EXP00/namelist U NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist U NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist U NEMOGCM/CONFIG/AMM12/EXP00/namelist --- Merging r3556 through r3653 into 'NEMOGCM/CONFIG/cfg.txt': G NEMOGCM/CONFIG/cfg.txt --- Merging r3556 through r3653 into 'NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm': G NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm --- Merging r3556 through r3653 into 'NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm': G NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm --- Merging r3556 through r3653 into 'NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm': G NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm --- Merging r3556 through r3653 into '.': U NEMOGCM/ARCH/arch-ifort_MERCATOR_CLUSTER.fcm C NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 U NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 U NEMOGCM/NEMO/OPA_SRC/step_oce.F90 A NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90 U NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 U NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90 U NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90 U NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90 U NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 U NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 U NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90 U NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90 U NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 U NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90 U NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 U NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90 U NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90 U NEMOGCM/NEMO/OPA_SRC/step.F90 G . Summary of conflicts: Text conflicts: 1 }}} Resolve simple conflicts and check in. '''Step 3'''. SETTE tests it is ok at Mercator for tests 1 to 8 excepted AMM12 restartability, on Mercator cluster, with ifort: -assume byterecl -convert big_endian -i4 -r8 -automatic -align all -O0