Changeset 7026 for branches/2016/dev_r6999_CONFIGMAN_1/NEMOGCM/TOOLS/SIREN/src/merge_bathy.f90

Timestamp:

2016-10-13T15:50:54+02:00 (8 years ago)

Author:

jpaul

Message:

see ticket 1781

File:

• branches/2016/dev_r6999_CONFIGMAN_1/NEMOGCM/TOOLS/SIREN/src/merge_bathy.f90 (modified) (12 diffs)

branches/2016/dev_r6999_CONFIGMAN_1/NEMOGCM/TOOLS/SIREN/src/merge_bathy.f90

@@ -115 +115 @@
 !>       - cn_east  : east  boundary indices on fine grid<br/>
 !>       - cn_west  : west  boundary indices on fine grid<br/>
+!>       - in_ncrs  : number of point(s) with coarse value save at boundaries<br/>
 !>       - ln_oneseg: use only one segment for each boundary or not
 !>
@@ -130 +131 @@
 !> @date September, 2015
 !> - manage useless (dummy) variable, attributes, and dimension
+!> @date October, 2016
+!> - allow to choose the number of boundary point with coarse grid value.
 !>
 !> @note Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -231 +234 @@
    LOGICAL                                 :: ln_east  = .TRUE.
    LOGICAL                                 :: ln_west  = .TRUE.
-   LOGICAL                                 :: ln_oneseg= .TRUE.
    CHARACTER(LEN=lc)                       :: cn_north = ''
    CHARACTER(LEN=lc)                       :: cn_south = ''
    CHARACTER(LEN=lc)                       :: cn_east  = ''
    CHARACTER(LEN=lc)                       :: cn_west  = ''
+   INTEGER(i4)                             :: in_ncrs  = 2
+   LOGICAL                                 :: ln_oneseg= .TRUE.
 
    ! namout
@@ -276 +280 @@
    &  cn_east ,   &     !< east  boundary indices on fine grid
    &  cn_west ,   &     !< west  boundary indices on fine grid
+   &  in_ncrs,    &     !< number of point with coarse value save at boundaries 
    &  ln_oneseg         !< use only one segment for each boundary or not
 
@@ -435 +440 @@
    DO jk=1,ip_ncard
       CALL merge_bathy_get_boundary(tl_bathy0, tl_bathy1, tl_bdy(jk), &
-      &                             il_rho(:),                        &
+      &                             il_rho(:), in_ncrs,                      &
       &                             dl_refined(:,:,:,:), dl_weight(:,:,:,:), &
       &                             dl_fill)
@@ -638 +643 @@
    !> @param[in] td_bdy          boundary structure
    !> @param[in] id_rho          array of refinement factor
+   !> @param[in] id_ncrs         number of point with coarse value save at boundaries
    !> @param[inout] dd_refined   array of refined bathymetry 
    !> @param[inout] dd_weight    array of weight
    !> @param[in] dd_fill         fillValue
    !>
-   !> @todo improve boundary weight function
    !-------------------------------------------------------------------
    SUBROUTINE merge_bathy_get_boundary( td_bathy0, td_bathy1, td_bdy, &
-   &                                    id_rho,                       &
+   &                                    id_rho, id_ncrs,              &
    &                                    dd_refined, dd_weight, dd_fill )
 
@@ -655 +660 @@
       TYPE(TBDY)                     , INTENT(IN   ) :: td_bdy
       INTEGER(i4), DIMENSION(:)      , INTENT(IN   ) :: id_rho
+      INTEGER(i4)                    , INTENT(IN   ) :: id_ncrs
       REAL(dp)   , DIMENSION(:,:,:,:), INTENT(INOUT) :: dd_refined
       REAL(dp)   , DIMENSION(:,:,:,:), INTENT(INOUT) :: dd_weight
@@ -670 +676 @@
       INTEGER(i4) :: il_jmax0
 
+      INTEGER(i4) :: il_width
+
       INTEGER(i4), DIMENSION(2,2)         :: il_offset
       INTEGER(i4), DIMENSION(2,2)         :: il_ind
@@ -838 +846 @@
             CASE('north')
 
-!               ! npoint coarse
-!               il_width=td_bdy%t_seg(jl)%i_width-id_npoint
-!               ! compute "distance"
-!               dl_tmp1d(:)=(/(ji,ji=il_width-1,1,-1),(0,ji=1,id_npoint)/)
-!               ! compute weight on segment
-!               dl_tmp1d(:)= 0.5 + 0.5*COS( (dp_pi*dl_tmp1d(:)) / &
-!               &                           (il_width) )
-
+
+               ! save n coarse point
+               il_width=td_bdy%t_seg(jl)%i_width-id_ncrs
                ! compute "distance"
-               dl_tmp1d(:)=(/(ji-1,ji=td_bdy%t_seg(jl)%i_width-1,1,-1),0/)
+               dl_tmp1d(:)=(/(ji,ji=il_width-1,1,-1),(0,ji=1,id_ncrs)/)
 
                ! compute weight on segment
                dl_tmp1d(:)= 0.5 + 0.5*COS( (dp_pi*dl_tmp1d(:)) / &
-               &                           (td_bdy%t_seg(jl)%i_width) )
+               &                           (il_width) )
+
 
                ALLOCATE( dl_wseg(tl_dom1%t_dim(1)%i_len, &
@@ -862 +866 @@
             CASE('south')
 
+               ! save n coarse point
+               il_width=td_bdy%t_seg(jl)%i_width-id_ncrs
                ! compute "distance"
-               dl_tmp1d(:)=(/0,(ji-1,ji=1,td_bdy%t_seg(jl)%i_width-1)/)               
+               dl_tmp1d(:)=(/(0,ji=1,id_ncrs),(ji,ji=1,il_width-1)/)
 
                ! compute weight on segment
                dl_tmp1d(:)= 0.5 + 0.5*COS( (dp_pi*dl_tmp1d(:)) / &
-               &                           (td_bdy%t_seg(jl)%i_width) )
+               &                           (il_width) )
+
 
                ALLOCATE( dl_wseg(tl_dom1%t_dim(1)%i_len, &
@@ -878 +885 @@
             CASE('east')
 
+               ! save n coarse point
+               il_width=td_bdy%t_seg(jl)%i_width-id_ncrs
                ! compute "distance"
-               dl_tmp1d(:)=(/(ji-1,ji=td_bdy%t_seg(jl)%i_width-1,1,-1),0/)
+               dl_tmp1d(:)=(/(ji,ji=il_width-1,1,-1),(0,ji=1,id_ncrs)/)
 
                ! compute weight on segment
                dl_tmp1d(:)= 0.5 + 0.5*COS( (dp_pi*dl_tmp1d(:)) / &
-               &                           (td_bdy%t_seg(jl)%i_width) )
+               &                           (il_width) )
+
 
                ALLOCATE( dl_wseg(tl_dom1%t_dim(1)%i_len, &
@@ -894 +904 @@
             CASE('west')
 
+               ! save n coarse point
+               il_width=td_bdy%t_seg(jl)%i_width-id_ncrs
                ! compute "distance"
-               dl_tmp1d(:)=(/0,(ji-1,ji=1,td_bdy%t_seg(jl)%i_width-1)/)               
+               dl_tmp1d(:)=(/(0,ji=1,id_ncrs),(ji,ji=1,il_width-1)/)
 
                ! compute weight on segment
                dl_tmp1d(:)= 0.5 + 0.5*COS( (dp_pi*dl_tmp1d(:)) / &
-               &                           (td_bdy%t_seg(jl)%i_width) )
+               &                           (il_width) )
+
 
                ALLOCATE( dl_wseg(tl_dom1%t_dim(1)%i_len, &