Changeset 7646 for trunk/DOC/TexFiles/Chapters/Chap_CFG.tex

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

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:

• trunk/DOC/TexFiles/Chapters/Chap_CFG.tex (modified) (2 diffs)

trunk/DOC/TexFiles/Chapters/Chap_CFG.tex

@@ -299 +299 @@
 In particular, the AMM uses $S$-coordinates in the vertical rather than
 $z$-coordinates and is forced with tidal lateral boundary conditions
-using a flather boundary condition from the BDY module (key\_bdy).
+using a flather boundary condition from the BDY module.
 The AMM configuration  uses the GLS (key\_zdfgls) turbulence scheme, the
 VVL non-linear free surface(key\_vvl) and time-splitting
@@ -306 +306 @@
 In addition to the tidal boundary condition the model may also take
 open boundary conditions from a North Atlantic model. Boundaries may be
-completely ommited by removing the BDY key (key\_bdy).
+completely omitted by setting \np{ln\_bdy} to false.
 Sample surface fluxes, river forcing and a sample initial restart file
 are included to test a realistic model run. The Baltic boundary is