Changeset 8862 for branches/2015/nemo_v3_6_STABLE/NEMOGCM/TOOLS/SIREN/src/create_boundary.F90

Timestamp:

2017-11-30T16:58:49+01:00 (6 years ago)

Author:

jpaul

Message:

Bugs fix: see tickets #1989

File:

• branches/2015/nemo_v3_6_STABLE/NEMOGCM/TOOLS/SIREN/src/create_boundary.F90 (modified) (11 diffs)

branches/2015/nemo_v3_6_STABLE/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).
@@ -161 +164 @@
 !>             - 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 +202 @@
 !> @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 +392 @@
 
    ! 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
@@ -445 +455 @@
    NAMELIST /namcfg/ &  !< config namelist
    &  cn_varcfg, &       !< variable configuration file
+   &  cn_dimcfg, &       !< dimension configuration file
    &  cn_dumcfg          !< dummy configuration file
 
@@ -527 +538 @@
       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))
@@ -761 +775 @@
                   ENDIF
                ENDDO
-               
+
                ! clean
                CALL var_clean(tl_var1)
@@ -879 +893 @@
                         CALL dom_del_extra( tl_segvar1(jvar+jj,jk,jl), &
                         &                   tl_dom1 )
+
                         ! clean extra point information on coarse grid domain
                         CALL dom_clean_extra( tl_dom0 )
@@ -1151 +1166 @@
    CALL mpp_clean(tl_coord1)
    CALL mpp_clean(tl_coord0)
+   CALL var_clean_extra()
 
    CALL multi_clean(tl_multi)
@@ -1382 +1398 @@
       CALL extrap_fill_value( td_var )
 
-      ! interpolate Bathymetry
+      ! interpolate variable
       CALL interp_fill_value( td_var, id_rho(:), &
       &                       id_offset=id_offset(:,:) )