Changeset 7646 for trunk/NEMOGCM/TOOLS/SIREN/src/create_boundary.F90

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/create_boundary.F90 (modified) (12 diffs)

trunk/NEMOGCM/TOOLS/SIREN/src/create_boundary.F90

@@ -26 +26 @@
 !>  <br/> 
 !> \image html  boundary_NEATL36_70.png 
-!> \image latex boundary_NEATL36_70.png
+!> <center>\image latex boundary_NEATL36_70.png
+!> </center>
 !>
 !> @note 
@@ -51 +52 @@
 !>       - cn_varcfg : variable configuration file
 !> (see ./SIREN/cfg/variable.cfg)
+!>       - cn_dimcfg : dimension configuration file. define dimensions allowed
+!> (see ./SIREN/cfg/dimension.cfg).
 !>       - cn_dumcfg : useless (dummy) configuration file, for useless 
 !> dimension or variable (see ./SIREN/cfg/dummy.cfg).
@@ -65 +68 @@
 !>
 !>    * _vertical grid namelist (namzgr)_:<br/>
-!>       - dn_pp_to_be_computed  :
 !>       - dn_ppsur              :
 !>       - dn_ppa0               :
@@ -161 +163 @@
 !>             - cn_north='index1(width),first1:last1|index2,first2:last2'
 !>             \image html  boundary_50.png 
-!>             \image latex boundary_50.png
+!>             <center>\image latex boundary_50.png
+!>             </center>
 !>       - cn_south  : south boundary indices on fine grid
 !>       - cn_east   : east  boundary indices on fine grid
@@ -198 +201 @@
 !> @date January, 2016
 !> - same process use for variable extracted or interpolated from input file.
+!> @date October, 2016
+!> - dimension to be used select from configuration file
+!>
+!> @todo
+!> - rewitre using meshmask instead of bathymetry and coordinates files.
 !>
 !> @note Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -383 +391 @@
 
    ! namcfg
-   CHARACTER(LEN=lc)                       :: cn_varcfg = 'variable.cfg' 
-   CHARACTER(LEN=lc)                       :: cn_dumcfg = 'dummy.cfg'
+   CHARACTER(LEN=lc)                       :: cn_varcfg = './cfg/variable.cfg' 
+   CHARACTER(LEN=lc)                       :: cn_dimcfg = './cfg/dimension.cfg'
+   CHARACTER(LEN=lc)                       :: cn_dumcfg = './cfg/dummy.cfg'
 
    ! namcrs
@@ -396 +405 @@
 
    !namzgr
-   REAL(dp)                                :: dn_pp_to_be_computed = 0._dp
    REAL(dp)                                :: dn_ppsur   = -3958.951371276829_dp
    REAL(dp)                                :: dn_ppa0    =   103.953009600000_dp
@@ -445 +453 @@
    NAMELIST /namcfg/ &  !< config namelist
    &  cn_varcfg, &       !< variable configuration file
+   &  cn_dimcfg, &       !< dimension configuration file
    &  cn_dumcfg          !< dummy configuration file
 
@@ -457 +466 @@
  
    NAMELIST /namzgr/ &
-   &  dn_pp_to_be_computed, &
    &  dn_ppsur,     &
    &  dn_ppa0,      &
@@ -526 +534 @@
       ! get variable extra information
       CALL var_def_extra(TRIM(cn_varcfg))
+
+      ! get dimension allowed
+      CALL dim_def_extra(TRIM(cn_dimcfg))
 
       ! get dummy variable
@@ -1151 +1162 @@
    CALL mpp_clean(tl_coord1)
    CALL mpp_clean(tl_coord0)
+   CALL var_clean_extra()
 
    CALL multi_clean(tl_multi)
@@ -1613 +1625 @@
 
       ENDIF
+
    END FUNCTION create_boundary_get_level
    !-------------------------------------------------------------------