Changeset 10251 for branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/TOOLS/SIREN/src/create_bathy.f90

Timestamp:

2018-10-29T15:20:26+01:00 (5 years ago)

Author:

kingr

Message:

Rolled back to r10247 - i.e., undid merge of pkg br and 3.6_stable br

File:

• branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/TOOLS/SIREN/src/create_bathy.f90 (modified) (15 diffs)

branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/TOOLS/SIREN/src/create_bathy.f90

@@ -20 +20 @@
 !>    ./SIREN/bin/create_bathy create_bathy.nam
 !> @endcode
-!> <br/>    
-!> \image html  bathy_40.png 
-!> \image latex bathy_30.png
-!>
-!> @note 
-!>    you could find a template of the namelist in templates directory.
-!>
+!>    
 !>    create_bathy.nam comprise 7 namelists:<br/>
 !>       - logger namelist (namlog)
@@ -43 +37 @@
 !>       - cn_logfile   : log filename
 !>       - cn_verbosity : verbosity ('trace','debug','info',
-!> 'warning','error','fatal','none')
+!> 'warning','error','fatal')
 !>       - in_maxerror  : maximum number of error allowed
 !>
@@ -58 +52 @@
 !>       - cn_coord1 : coordinate file
 !>       - in_perio1 : periodicity index
-!>       - ln_fillclosed : fill closed sea or not (default is .TRUE.)
+!>       - ln_fillclosed : fill closed sea or not
 !>
 !>    * _variable namelist (namvar)_:<br/>
 !>       - cn_varinfo : list of variable and extra information about request(s) 
 !>       to be used.<br/>
-!>          each elements of *cn_varinfo* is a string character
-!>          (separated by ',').<br/>
+!>          each elements of *cn_varinfo* is a string character.<br/>
 !>          it is composed of the variable name follow by ':', 
 !>          then request(s) to be used on this variable.<br/> 
 !>          request could be:
-!>             - int = interpolation method
-!>             - ext = extrapolation method
-!>             - flt = filter method
-!>             - min = minimum value
-!>             - max = maximum value
-!>             - unt = new units
-!>             - unf = unit scale factor (linked to new units)
+!>             - interpolation method
+!>             - extrapolation method
+!>             - filter method
+!>             - > minimum value
+!>             - < maximum value
 !>
 !>                requests must be separated by ';'.<br/>
@@ -81 +72 @@
 !>          informations about available method could be find in @ref interp,
 !>          @ref extrap and @ref filter modules.<br/>
-!>          Example: 'Bathymetry: flt=2*hamming(2,3); min=0'
+!>          Example: 'Bathymetry: 2*hamming(2,3); > 0'
 !>          @note 
 !>             If you do not specify a method which is required, 
@@ -99 +90 @@
 !>                - ',' for line
 !>                - '/' for row
+!>                - '\' for level<br/>
 !>                Example:<br/>
 !>                   3,2,3/1,4,5  =>  @f$ \left( \begin{array}{ccc}
@@ -107 +99 @@
 !>             - 'Bathymetry:gridT.nc'
 !>             - 'Bathymetry:5000,5000,5000/5000,3000,5000/5000,5000,5000'
+!>
+!>          \image html  bathy_40.png 
+!>          \image latex bathy_30.png
 !>
 !>    * _nesting namelist (namnst)_:<br/>
@@ -124 +119 @@
 !> - add header for user
 !> - Bug fix, compute offset depending of grid point
-!> @date June, 2015
-!> - extrapolate all land points.
-!> - allow to change unit.
 !
-!> @todo
-!> - use create_bathy_check_depth as in create_boundary
-!> - use create_bathy_check_time  as in create_boundary
-!> - check tl_multi is not empty
-!>
 !> @note Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
 !----------------------------------------------------------------------
@@ -495 +482 @@
    ENDIF
 
-   ! use additional request
    DO jk=1,tl_multi%i_nvar
-
-         ! change unit and apply factor
-         CALL var_chg_unit(tl_var(jk))
-
          ! forced min and max value
          CALL var_limit_value(tl_var(jk))
@@ -575 +557 @@
 
    ! add other variables
-   DO jk=tl_multi%i_nvar,1,-1
+   DO jk=1,tl_multi%i_nvar
       CALL file_add_var(tl_fileout, tl_var(jk))
       CALL var_clean(tl_var(jk))
@@ -641 +623 @@
    !>
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
+   !> - November, 2013- Initial Version
    !>
    !> @param[in] td_var    variable structure 
@@ -777 +759 @@
    !> 
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
+   !> - November, 2013- Initial Version
    !>
    !> @param[in] td_var    variable structure 
@@ -896 +878 @@
    !> 
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
+   !> - November, 2013- Initial Version
    !>
    !> @param[in] td_var    variable structure
@@ -915 +897 @@
       IMPLICIT NONE
       ! Argument
-      TYPE(TVAR)                 , INTENT(IN) :: td_var  
-      TYPE(TMPP)                 , INTENT(IN) :: td_mpp 
-      INTEGER(i4)                , INTENT(IN) :: id_imin
-      INTEGER(i4)                , INTENT(IN) :: id_imax
-      INTEGER(i4)                , INTENT(IN) :: id_jmin
-      INTEGER(i4)                , INTENT(IN) :: id_jmax
+      TYPE(TVAR) , INTENT(IN) :: td_var  
+      TYPE(TMPP) , INTENT(IN) :: td_mpp 
+      INTEGER(i4), INTENT(IN) :: id_imin
+      INTEGER(i4), INTENT(IN) :: id_imax
+      INTEGER(i4), INTENT(IN) :: id_jmin
+      INTEGER(i4), INTENT(IN) :: id_jmax
       INTEGER(i4), DIMENSION(:,:), INTENT(IN) :: id_offset
       INTEGER(i4), DIMENSION(:)  , INTENT(IN) :: id_rho
@@ -1007 +989 @@
    !> 
    !> @author J.Paul
-   !> @date November, 2013 - Initial Version
+   !> - November, 2013- Initial Version
    !>
    !> @param[inout] td_var variable structure 
@@ -1091 +1073 @@
 
       ! extrapolate variable
-      CALL extrap_fill_value( td_var )
+      CALL extrap_fill_value( td_var, id_offset=id_offset(:,:), &
+      &                               id_rho=id_rho(:),         &
+      &                               id_iext=il_iext, id_jext=il_jext )
 
       ! interpolate Bathymetry