Changeset 7646 for trunk/NEMOGCM/TOOLS/SIREN/src/docsrc/6_perio.md

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/NEMOGCM/TOOLS/SIREN/src/docsrc/6_perio.md (modified) (1 diff)

trunk/NEMOGCM/TOOLS/SIREN/src/docsrc/6_perio.md

@@ -6 +6 @@
 <dd>ghost cells (solid walls) are imposed at all model boundaries.</dd> 
 @image html perio0_20.png 
-@image latex perio0_20.png
+<center>@image latex perio0_20.png 
+</center>
 <dt>cyclic east-west boundary (in_perio=1)</dt>
 <dd>first and last rows are closed, whilst the first column is set to the value of the last-but-one column and the last column to the value of the second one.</dd>  
 @image html perio1_20.png 
-@image latex perio1_20.png
+<center>@image latex perio1_20.png 
+</center>
 <dt>symmetric boundary condition across the equator. (in_perio=2)</dt>
 <dd>last row, and first and last columns are closed. </dd> 
 @image html perio2_20.png 
-@image latex perio2_20.png
+<center>@image latex perio2_20.png 
+</center>
 <dt>North fold boundary with a T -point pivot (in_perio=3)</dt>
 <dd>first row, and first and last columns are closed. </dd> 
 @image html perio3_20.png 
-@image latex perio3_20.png
+<center>@image latex perio3_20.png 
+</center>
 <dt>North fold boundary with a T -point pivot and cyclic east-west boundary (in_perio=4)</dt>
 <dd>first row is closed. The first column is set to the value of the last-but-one column and the last column to the value of the second one. </dd> 
 @image html perio4_20.png 
-@image latex perio4_20.png
+<center>@image latex perio4_20.png 
+</center>
 <dt>North fold boundary with a F -point pivot (in_perio=5)</dt>
 <dd>first row, and first and last columns are closed. </dd> 
 @image html perio5_20.png 
-@image latex perio5_20.png
+<center>@image latex perio5_20.png 
+</center>
 <dt>North fold boundary with a F -point pivot and cyclic east-west boundary (in_perio=6)</dt>
 <dd>first row is closed. The first column is set to the value of the last-but-one column and the last column to the value of the second one.</dd> 
 @image html perio6_20.png 
-@image latex perio6_20.png
+<center>@image latex perio6_20.png 
+</center>
 </dl>
 @sa For more information about NEMO periodicity, see _Model Boundary Condition_ chapter in [NEMO documentation](http://www.nemo-ocean.eu/About-NEMO/Reference-manuals))