Changes between Version 3 and Version 4 of ticket/1020_dev_NOC_MERCATOR_2012

Timestamp:

2012-11-26T12:14:02+01:00 (11 years ago)

Author:

acc

Comment:

--

ticket/1020_dev_NOC_MERCATOR_2012

@@ -20 +20 @@
 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.