Changeset 7646 for trunk/NEMOGCM/TOOLS/SIREN/src/create_restart.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_restart.f90 (modified) (15 diffs)

trunk/NEMOGCM/TOOLS/SIREN/src/create_restart.f90

@@ -48 +48 @@
 !>       - 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).
@@ -62 +64 @@
 !>
 !>    * _vertical grid namelist (namzgr)_:<br/>
-!>       - dn_pp_to_be_computed  :
-!>       - dn_ppsur              :
-!>       - dn_ppa0               :
-!>       - dn_ppa1               :
-!>       - dn_ppa2               : 
-!>       - dn_ppkth              :
-!>       - dn_ppkth2             :
-!>       - dn_ppacr              :
-!>       - dn_ppacr2             :
-!>       - dn_ppdzmin            :
-!>       - dn_pphmax             :
+!>       - dn_ppsur              : coefficient to compute vertical grid
+!>       - dn_ppa0               : coefficient to compute vertical grid
+!>       - dn_ppa1               : coefficient to compute vertical grid
+!>       - dn_ppa2               : double tanh function parameter
+!>       - dn_ppkth              : coefficient to compute vertical grid
+!>       - dn_ppkth2             : double tanh function parameter
+!>       - dn_ppacr              : coefficient to compute vertical grid
+!>       - dn_ppacr2             : double tanh function parameter
+!>       - dn_ppdzmin            : minimum vertical spacing
+!>       - dn_pphmax             : maximum depth
 !>       - in_nlevel             : number of vertical level
 !>
+!>     @note If ppa1 and ppa0 and ppsur are undefined
+!>           NEMO will compute them from ppdzmin , pphmax, ppkth, ppacr
+!>
 !>    * _partial step namelist (namzps)_:<br/>
-!>       - dn_e3zps_min          :
-!>       - dn_e3zps_rat          : 
+!>       - dn_e3zps_min          : minimum thickness of partial step level (meters)
+!>       - dn_e3zps_rat          : minimum thickness ratio of partial step level
 !>
 !>    * _variable namelist (namvar)_:<br/>
@@ -158 +162 @@
 !> @date September, 2015
 !> - manage useless (dummy) variable, attributes, and dimension
+!> @date October, 2016
+!> - dimension to be used select from configuration file
+!>
+!> @todo
+!> - rewrite using meshmask instead of bathymetry and coordinates files
 !>
 !> @note Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -196 +205 @@
    INTEGER(i4)                                        :: il_status
    INTEGER(i4)                                        :: il_fileid
+   INTEGER(i4)                                        :: il_attid
    INTEGER(i4)                                        :: il_nvar
-   INTEGER(i4)                                        :: il_attid
    INTEGER(i4)                                        :: il_imin1
    INTEGER(i4)                                        :: il_imax1
@@ -249 +258 @@
 
    ! 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
@@ -262 +272 @@
 
    !namzgr
-   REAL(dp)                                :: dn_pp_to_be_computed = 0._dp
    REAL(dp)                                :: dn_ppsur   = -3958.951371276829_dp
    REAL(dp)                                :: dn_ppa0    =   103.953009600000_dp
@@ -304 +313 @@
    NAMELIST /namcfg/ &  !< configuration namelist
    &  cn_varcfg, &      !< variable configuration file
+   &  cn_dimcfg, &      !< dimension configuration file
    &  cn_dumcfg         !< dummy configuration file
 
@@ -309 +319 @@
    &  cn_coord0,  &     !< coordinate file
    &  in_perio0         !< periodicity index
-   
+
    NAMELIST /namfin/ &  !< fine grid namelist
    &  cn_coord1,   &    !< coordinate file
@@ -316 +326 @@
  
    NAMELIST /namzgr/ &
-   &  dn_pp_to_be_computed, &
    &  dn_ppsur,     &
    &  dn_ppa0,      &
@@ -336 +345 @@
    &  cn_varfile, &     !< list of variable file
    &  cn_varinfo        !< list of variable and interpolation method to be used.
-   
+
    NAMELIST /namnst/ &  !< nesting namelist
    &  in_rhoi,    &     !< refinement factor in i-direction
@@ -387 +396 @@
       CALL var_def_extra(TRIM(cn_varcfg))
 
+      ! get dimension allowed
+      CALL dim_def_extra(TRIM(cn_dimcfg))
+
       ! get dummy variable
       CALL var_get_dummy(TRIM(cn_dumcfg))
@@ -402 +414 @@
       ! match variable with file
       tl_multi=multi_init(cn_varfile)
-      
+ 
       READ( il_fileid, NML = namnst )
       READ( il_fileid, NML = namout )
@@ -592 +604 @@
                !- check grid coincidence
                IF( ll_sameGrid )THEN
+                  il_rho(:)=1
                   CALL grid_check_coincidence( tl_mpp, tl_coord1, &
                   &                            il_imin1, il_imax1, &
@@ -896 +909 @@
    CALL mpp_clean(tl_mppout)
    CALL mpp_clean(tl_coord1)
+   CALL var_clean_extra()
 
    ! close log file
@@ -1200 +1214 @@
             &        tl_depth%d_value(:,:,:,:) ) )THEN
 
-               CALL logger_warn("CREATE BOUNDARY: depth value from "//&
+               CALL logger_warn("CREATE RESTART: depth value from "//&
                &  TRIM(td_mpp%c_name)//" not conform "//&
                &  " to those from former file(s).")