Opened 4 years ago

Closed 3 years ago

Last modified 3 years ago

#1809 closed Task (fixed)

merge 2016: merge dev_MERCATOR_2016 and dev_CNRS_2016

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

Description

Context

2016 merge party: merge CNRS and Mercator developments branches

Implementation

  1. create create dev_CNRS_MERCATOR_2016

svn cp -m "create dev_CNRS_MERCATOR_2016 as a copy of trunk at rev7161" -r 7161 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/2016/dev_CNRS_MERCATOR_2016

Commit History (0)

(No commits)

Change History (5)

comment:2 Changed 4 years ago by cbricaud

  1. merge in dev_CNRS_MERCATOR_2016 Mercator branch dev_MERCATOR_2016

svn co svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_CNRS_MERCATOR_2016 dev_CNRS_MERCATOR_2016
cd dev_CNRS_MERCATOR_2016
svn merge -r 7313:7371 svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_MERCATOR_2016/ .

ar5@cca-login3:/scratch/ms/fr/ar5/MERGE/dev_CNRS_MERCATOR_2016> svn st

M .
M NEMOGCM

A + NEMOGCM/TOOLS/SIREN/Doxyfile
M NEMOGCM/TOOLS/SIREN/README
A + NEMOGCM/TOOLS/SIREN/cfg/dimension.cfg
M NEMOGCM/TOOLS/SIREN/cfg/dummy.cfg
M NEMOGCM/TOOLS/SIREN/cfg/variable.cfg
A + NEMOGCM/TOOLS/SIREN/doc/refman.pdf
D NEMOGCM/TOOLS/SIREN/src/Doxyfile
M NEMOGCM/TOOLS/SIREN/src/attribute.f90
M NEMOGCM/TOOLS/SIREN/src/boundary.f90
M NEMOGCM/TOOLS/SIREN/src/create_bathy.f90
M NEMOGCM/TOOLS/SIREN/src/create_boundary.F90
M NEMOGCM/TOOLS/SIREN/src/create_coord.f90
A + NEMOGCM/TOOLS/SIREN/src/create_meshmask.f90
M NEMOGCM/TOOLS/SIREN/src/create_restart.f90
M NEMOGCM/TOOLS/SIREN/src/dimension.f90
M NEMOGCM/TOOLS/SIREN/src/docsrc/1_install.md
M NEMOGCM/TOOLS/SIREN/src/docsrc/2_quickstart.md
M NEMOGCM/TOOLS/SIREN/src/docsrc/3_support_bug.md
M NEMOGCM/TOOLS/SIREN/src/docsrc/4_codingRules.md
M NEMOGCM/TOOLS/SIREN/src/docsrc/5_changeLog.md
M NEMOGCM/TOOLS/SIREN/src/docsrc/6_perio.md
M NEMOGCM/TOOLS/SIREN/src/docsrc/main.dox
M NEMOGCM/TOOLS/SIREN/src/global.f90
M NEMOGCM/TOOLS/SIREN/src/grid.f90
A + NEMOGCM/TOOLS/SIREN/src/grid_hgr.f90
A + NEMOGCM/TOOLS/SIREN/src/grid_zgr.f90
M NEMOGCM/TOOLS/SIREN/src/iom.f90
M NEMOGCM/TOOLS/SIREN/src/iom_cdf.f90
A + NEMOGCM/TOOLS/SIREN/src/lbc.f90
M NEMOGCM/TOOLS/SIREN/src/merge_bathy.f90
M NEMOGCM/TOOLS/SIREN/src/mpp.f90
M NEMOGCM/TOOLS/SIREN/src/phycst.f90
M NEMOGCM/TOOLS/SIREN/src/variable.f90
M NEMOGCM/TOOLS/SIREN/src/vgrid.f90
A + NEMOGCM/TOOLS/SIREN/templates/create_meshmask.nam
M NEMOGCM/TOOLS/SIREN/templates/merge_bathy.nam

svn ci -m "merge party 2016: merge MERCATOR branch in CNRS_MERCATOR branch"

=⇒ merge commited at rev7390

comment:3 Changed 4 years ago by cbricaud

  1. SETTE test results

# Description of configuration tested:
# GYRE : 1 & 2 =⇒ OK
# ORCA2_LIM3 : 3 & 4 =⇒ OK
# ORCA2_LIM3_PISCES : 5 & 6 =⇒ OK
# ORCA2_OFF_PISCES : 7 & 8 =⇒ OK
# AMM12 : 9 & 10 =⇒ OK
# SAS : 11 fos SAS there is no solver so is useless to test REPRO =⇒ NOK: not restartable
# ISOMIP : 12 & 13 =⇒ OK
# ORCA2_LIM3_OBS : 14 =⇒ OK
# ORCA2_AGRIF_LIM : 15 & 16 =⇒ OK
# 17 & 18 =⇒ not restartable (17) , not reproducable ( 18 )

comment:4 Changed 3 years ago by cbricaud

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

comment:5 Changed 3 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.