Changeset 7646 for trunk/NEMOGCM/TOOLS/SIREN/src/docsrc/main.dox

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/main.dox (modified) (2 diffs)

trunk/NEMOGCM/TOOLS/SIREN/src/docsrc/main.dox

@@ -2 +2 @@
  @mainpage About 
 
- SIREN is a software to create regional configuration with [NEMO](http://www.nemo-ocean.eu).<br/> 
- Actually SIREN create input files needed for a basic NEMO configuration.<br/>
+ SIREN is a software to set up regional configuration with [NEMO](http://www.nemo-ocean.eu).<br/> 
+ Actually SIREN creates the input files you need to run a NEMO regional configuration.<br/>
+ 
+ SIREN allows you to create your own regional configuration embedded in a wider one.<br/>
 
- SIREN allows you to create your own regional configuration embedded in a wider one.<br/>
- In order to help you, a set of GLORYS files (global reanalysis on ORCA025 grid), as well as examples
- of namelists are available in dods repository.
+ To know how to install SIREN see @ref md_src_docsrc_1_install.
 
- @note This software was created, and is maintain by the Configuration Manager Working Group, composed
- of NEMO system team members.
- 
- To know how to install SIREN see @ref md_docsrc_1_install.
-
- You could find a tutorial for a quick start with SIREN in @ref md_docsrc_2_quickstart.<br/>
+ You could find a tutorial for a quick start with SIREN in @ref md_src_docsrc_2_quickstart.<br/>
  For more information about how to use each component of SIREN
  - see create_coord.f90 to create fine grid coordinate file
  - see create_bathy.f90 to create fine grid bathymetry
  - see merge_bathy.f90 to merge fine grid bathymetry
+ - see create_meshmask.f90 to create mesh mask or domain_cfg file.
  - see create_restart.f90 to create initial state file, or other fields.
  - see create_boundary.F90 to create boundary condition
@@ -24 +20 @@
 <HR>
    <b>
-   - @ref md_docsrc_1_install
-   - @ref md_docsrc_2_quickstart
-   - @ref md_docsrc_3_support_bug
-   - @ref md_docsrc_4_codingRules
-   - @ref md_docsrc_5_changeLog
+   - @ref md_src_docsrc_1_install
+   - @ref md_src_docsrc_2_quickstart
+   - @ref md_src_docsrc_3_support_bug
+   - @ref md_src_docsrc_4_codingRules
+   - @ref md_src_docsrc_5_changeLog
    - @ref todo
    </b>