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.
merge_bathy.nam in trunk/NEMOGCM/TOOLS/SIREN/templates – NEMO

source: trunk/NEMOGCM/TOOLS/SIREN/templates/merge_bathy.nam @ 7646

Last change on this file since 7646 was 7646, checked in by timgraham, 7 years ago

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.
File size: 373 bytes
RevLine 
[5037]1&namlog
[6393]2   cn_logfile=
[5037]3   cn_verbosity=
[6393]4   in_maxerror=
[5037]5/
6
7&namcfg
[6393]8   cn_varcfg=
9   cn_dumcfg=
[5037]10/
11
12&namcrs
13   cn_bathy0=
14   in_perio0=
15/
16
17&namfin
18   cn_bathy1=
19   in_perio1=
20/
21
22&namnst
23   in_rhoi=
24   in_rhoj=
25/
26
27&nambdy
28   ln_north=
29   ln_south=
30   ln_east=
31   ln_west=
32   cn_north=
33   cn_south=
34   cn_east=
35   cn_west=
[7646]36   in_ncrs=
[5037]37   ln_oneseg=
38/
39
40&namout
[6393]41   cn_fileout=
[5037]42/
Note: See TracBrowser for help on using the repository browser.