New URL for NEMO forge! http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.

Changeset 9024 – NEMO

Context Navigation

← Previous Changeset
Next Changeset →

Changeset 9024

Timestamp:

2017-12-13T19:01:03+01:00 (5 years ago)

Author:

timgraham

Message:

Resolved conflicts in namelists

Location:

branches/2017/dev_merge_2017/NEMOGCM/CONFIG

Files:

: 12 edited
: 2 copied

ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg (modified) (view diffs)
SHARED (modified) (view diffs)
SHARED/namelist_ref (modified) (view diffs)
TEST_CASES/VORTEX (copied) (copied from branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX) (view diffs)
TEST_CASES/WAD/EXP00/namelist_cfg (modified) (view diffs)
TEST_CASES/WAD/MY_DOCS/Namelists/nam_wad (modified) (view diffs)
TEST_CASES/WAD/MY_DOCS/WAD_doc.pdf (modified) (view diffs)
TEST_CASES/WAD/MY_DOCS/WAD_doc.tex (modified) (view diffs)
TEST_CASES/WAD/MY_DOCS/references.bib (copied) (copied from branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_DOCS/references.bib) (view diffs)
TEST_CASES/WAD/MY_SRC/domain.F90 (modified) (view diffs)
TEST_CASES/WAD/MY_SRC/usrdef_istate.F90 (modified) (view diffs)
TEST_CASES/WAD/MY_SRC/usrdef_zgr.F90 (modified) (view diffs)
TEST_CASES/cfg.txt (modified) (view diffs)
cfg.txt (modified) (view diffs)

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: