Changeset 7993 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS

Timestamp:

2017-05-02T13:29:51+02:00 (7 years ago)

Author:

frrh

Message:

Merge in missing revisions 6428:2477 inclusive and 6482 from nemo_v3_6_STABLE
branch. In ptic, this includes the fix for restartability of runoff fields in coupled
models. Evolution of coupled models will therefor be affected.

These changes donot affect evolution of the current stand-alone NEMO-CICE GO6
standard configuration.

Work and testing documented in Met Office GMED ticket 320.

Location:

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS

Files:

• REBUILD_NEMO/icb_combrest.py (modified) (1 diff)
• SIREN/Doxyfile (copied) (copied from branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/TOOLS/SIREN/Doxyfile)
• SIREN/README (modified) (1 diff)
• SIREN/src/Doxyfile (deleted)
• SIREN/src/docsrc/1_install.md (modified) (1 diff)
• SIREN/src/docsrc/2_quickstart.md (copied) (copied from branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/TOOLS/SIREN/src/docsrc/2_quickstart.md)
• SIREN/src/docsrc/3_support_bug.md (copied) (copied from branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/TOOLS/SIREN/src/docsrc/3_support_bug.md)
• SIREN/src/docsrc/4_codingRules.md (copied) (copied from branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/TOOLS/SIREN/src/docsrc/4_codingRules.md)
• SIREN/src/docsrc/5_changeLog.md (copied) (copied from branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/TOOLS/SIREN/src/docsrc/5_changeLog.md)
• SIREN/src/docsrc/6_perio.md (copied) (copied from branches/UKMO/dev_r5518_GO6_missing_STABLE_revs/NEMOGCM/TOOLS/SIREN/src/docsrc/6_perio.md)
• SIREN/src/docsrc/main.dox (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS/REBUILD_NEMO/icb_combrest.py

@@ -180 +180 @@
     if "units" in invar.ncattrs():
         fo.variables[var].units = invar.units
-    os.remove(pathout.replace('.nc','_WORK.nc'))
+  os.remove(pathout.replace('.nc','_WORK.nc'))
 #
 add_k = 1

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS/SIREN/README

@@ -1 @@
-This is a first release of SIREN.
 
-To create SIREN documentation, go to ./src and run doxygen 
+To create SIREN documentation, run doxygen in TOOLS/SIREN directory
 (http://www.stack.nl/~dimitri/doxygen/index.html version 1.8.3.1 or upper)
 then
-   open ../doc/index.html 
+   open ./TOOLS/SIREN/doc/html/index.html in your web browser 
 or 
-   run ../doc/latex/gmake and open refman.pdf 
-
-
-templates of namelists could be find in templates directory.
-read documentation for more information.
-
- 1- program to create coordinate file :
-
-   ./create_coord create_coord.nam
-
-
- Variables are extracted from the input coordinates coarse grid and
- interpolated to create fine coordinates files.
-
- 2- program to create bathymetry file:
-
- ./create_bathy create_bathy.nam
-
- Bathymetry could be extracted from fine grid Bathymetry file, or
- interpolated from coarse grid Bathymetry file.
-
- 3- program to merge bathymetry file at boundaries :
-
- ./merge_bathy merge_bathy.nam
-
- Coarse grid Bathymetry is interpolated on fine grid.
- Then fine Bathymetry and refined coarse bathymetry are merged at
- boundaries.
-
- 4- program to create restart file :
-
- ./create_restart create_restart.nam
-
- Variables are read from restart file, or standard output.
- Then theses variables are interpolated on fine grid.
- Finally table are split over new decomposition.
-
- 5- program to create boundary files (OBC) :
-
- ./create_boundary create_boundary.nam
-
- Variables are read from standard output.
- Then theses variables are interpolated on fine grid boundaries.
+   run ./TOOLS/SIREN/doc/latex/gmake and open ./TOOLS/SIREN/doc/latex/refman.pdf 

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS/SIREN/src/docsrc/1_install.md

@@ -17 +17 @@
 <!--   - pgf95 (version 13.9-0) -->
 
- <HR>
-   <b>
-   - @ref index
-   - @ref md_docsrc_3_codingRules
-   - @ref md_docsrc_4_changeLog
-   - @ref todo
-   </b>
+# Fortran Compiler #
+SIREN codes were succesfully tested with :
+  - ifort (version 15.0.1)
+  - gfortran (version 4.8.2 20140120) 
+
+<HR>
+  <b>
+  - @ref index
+  - @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>

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS/SIREN/src/docsrc/main.dox

@@ -13 +13 @@
    - create_boundary.f90 to create boundary condition from coarse grid standard outputs.
 
-To install those programs see @ref md_docsrc_1_install.
+ 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/>
 
- @note SIREN can not:
- - create global configuration
- - create configuarion around or close to north pole
- - change number of vertical level
- - change grid (horizontal or vertical)
+ To know how to install SIREN see @ref md_src_docsrc_1_install.
 
- @section howto How to use
-   @subsection howto_coord to create fine grid coordinate file
-   see create_coord.f90
-   @subsection howto_bathy to create fine grid bathymetry
-   see create_bathy.f90
-   @subsection howto_merge to merge fine grid bathymetry
-   see merge_bathy.f90
-   @subsection howto_restart to create initial state file
-   see create_restart.f90
-   @subsection howto_boundary to create boundary condition
-   see create_boundary.f90
+ 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_restart.f90 to create initial state file, or other fields.
+ - see create_boundary.F90 to create boundary condition
 
 <HR>
    <b>
-   - @ref md_docsrc_1_install
-   - @ref md_docsrc_3_codingRules
-   - @ref md_docsrc_4_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>