Opened 8 years ago

Closed 8 years ago

Last modified 3 years ago

#1001 closed Task (fixed)

Merge Mercator Dvpts for 2012

Reported by: cbricaud Owned by: cbricaud
Priority: low Milestone:
Component: OCE Version: release-3.4
Severity: Keywords:
Cc: Review:
MP ready?:
Progress:

Description


Commit History (0)

(No commits)

Change History (7)

comment:1 Changed 8 years ago by cbricaud

  • Owner changed from NEMO team to cbricaud

comment:2 Changed 8 years ago by cbricaud

2 branchs to be merged:


svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3327_MERCATOR1_BDY

svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3342_MERCATOR7_SST

=======================

1.phaze dev_r3327_MERCATOR1_BDY with rev3555 of trunk


svn merge -r 3327:3555 svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk dev_r3327_MERCATOR1_BDY

conflicts:
sette.sh
prepare_job.sh

resolutions:
sette.sh: copy sette.sh from trunk rev355
prepare_job.sh: copy prepare_job.sh from trunk rev355 and include Mercator modifications

svn resolved sette.sh
svn resolved prepare_job.sh
svn ci -m " merge branche dev_r3327_MERCATOR1_BDY with trunk: rev3327 to rev3555"
=⇒rev3570

forgotted some updates:

A + ADM/DOC_SCRIPTS/sphinx
A + ADM/DOC_SCRIPTS/sphinx/conf.py
A + ADM/README

svn ci -m " merge branche dev_r3327_MERCATOR1_BDY with trunk: rev3327 to rev3555. commit ADM"
rev 3571

=======================

2.phaze dev_r3342_MERCATOR7_SST with rev3555 of trunk


svn merge -r 3342:3555 svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk dev_r3342_MERCATOR7_SST

Summary of conflicts:

Tree conflicts: 3

resolutions:
sette.sh: copy sette.sh from trunk rev355
prepare_job.sh: copy prepare_job.sh from trunk rev355 and include Mercator modifications
input_ORCA2_LIM.cfg: keep the file from trunk rev3555

svn resolved sette.sh
svn resolved prepare_job.sh
svn resolved input_ORCA2_LIM.cfg

svn ci -m " merge dev_r3342_MERCATOR7_SST with trunk: rev3342 to rev3555."
Committed revision 3572.

comment:3 Changed 8 years ago by cbricaud

=============================

  1. create branch for merge and check out of this branch

svn copy -r 3555 svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_MERCATOR_2012_rev3555
Password:
Password:

Committed revision 3582.

svn co svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_MERCATOR_2012_rev3555 dev_MERCATOR_2012_rev3555

====================================

  1. Merge first developement branch in dev_MERCATOR_2012_rev3555:

svn merge -r 3327:3555 svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3327_MERCATOR1_BDY dev_MERCATOR_2012_rev3555

Conflict discovered in 'dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/sette.sh'.
Select: (p) postpone, (df) diff-full, (e) edit,

(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p

—- Merging r3328 through r3555 into 'dev_MERCATOR_2012_rev3555':
C dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/sette.sh
U dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/param.cfg
U dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/prepare_job.sh
U dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER
U dev_MERCATOR_2012_rev3555/NEMOGCM/CONFIG/AMM12/EXP00/namelist
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/step_oce.F90
A dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/step.F90
Summary of conflicts:

Text conflicts: 1

svn resolved dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/sette.sh
Resolved conflicted state of 'dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/sette.sh'

svn ci -m " add modification from dev_r3327_MERCATOR1_BDY branch in dev_MERCATOR_2012_rev3555 branch"
Password:
Sending .
Sending NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm
Sending NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm
Sending NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm
Sending NEMOGCM/CONFIG/AMM12/EXP00/namelist
Sending NEMOGCM/CONFIG/cfg.txt
Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90
Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90
Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90
Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90
Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90
Sending NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90
Sending NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
Sending NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90
Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90
Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90
Adding NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90
Sending NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90
Sending NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
Sending NEMOGCM/NEMO/OPA_SRC/step.F90
Sending NEMOGCM/NEMO/OPA_SRC/step_oce.F90
Sending NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER
Sending NEMOGCM/SETTE/param.cfg
Sending NEMOGCM/SETTE/prepare_job.sh
Transmitting file data ………………
Committed revision 3583.

comment:4 Changed 8 years ago by cbricaud

====================================

  1. Merge second developement branch in dev_MERCATOR_2012_rev3555:

svn merge -r 3342:3555
svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_r3342_MERCATOR7_SST
dev_MERCATOR_2012_rev3555
—- Merging r3343 through r3555 into 'dev_MERCATOR_2012_rev3555':
U dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/sette.sh
Conflict discovered in 'dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/prepare_job.sh'.
Select: (p) postpone, (df) diff-full, (e) edit,

(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p

C dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/prepare_job.sh
Conflict discovered in 'dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER'.
Select: (p) postpone, (df) diff-full, (e) edit,

(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p

C dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER
U dev_MERCATOR_2012_rev3555/NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist
U dev_MERCATOR_2012_rev3555/NEMOGCM/CONFIG/GYRE/EXP00/namelist
U dev_MERCATOR_2012_rev3555/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U dev_MERCATOR_2012_rev3555/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U dev_MERCATOR_2012_rev3555/NEMOGCM/CONFIG/AMM12/EXP00/namelist
U dev_MERCATOR_2012_rev3555/NEMOGCM/ARCH/arch-ifort_MERCATOR_CLUSTER.fcm
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90
U dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90
Summary of conflicts:

Text conflicts: 2

svn resolved dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/prepare_job.sh
Resolved conflicted state of 'dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/prepare_job.sh'

svn resolved dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER
Resolved conflicted state of 'dev_MERCATOR_2012_rev3555/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER'

svn ci -m "add modification from dev_r3342_MERCATOR7_SST in dev_MERCATOR_2012_rev3555"
Password:
Sending .
Sending NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm
Sending NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm
Sending NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm
Sending NEMOGCM/ARCH/arch-ifort_MERCATOR_CLUSTER.fcm
Sending NEMOGCM/CONFIG/AMM12/EXP00/namelist
Sending NEMOGCM/CONFIG/AMM12_PISCES/EXP00/namelist
Sending NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending NEMOGCM/CONFIG/cfg.txt
Sending NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
Sending NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90
Sending NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90
Sending NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90
Sending NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90
Sending NEMOGCM/NEMO/OPA_SRC/OBS/obs_surf_def.F90
Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcdcy.F90
Sending NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_MERCATOR_CLUSTER
Sending NEMOGCM/SETTE/prepare_job.sh
Sending NEMOGCM/SETTE/sette.sh
Transmitting file data …………….
Committed revision 3586.

comment:5 Changed 8 years ago by cbricaud

SETTE has been run successfully on Mercator cluster for sette tests 1,2,3,4,5,6,8 with :
-assume byterecl -convert big_endian -i4 -r8 -automatic -align all -O0

7 ( AMM12 restartability ) NOK
9 ( ORCA2_LIM_AGRIF ) doesn't compile

comment:6 Changed 8 years ago by cbricaud

  • Resolution set to fixed
  • Status changed from new to closed

comment:7 Changed 3 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.