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

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

@@ -1529 +1529 @@
    !> @author J.Paul 
    !> @date November, 2013 - Initial Version 
-   ! 
+   !> @date June, 2016
+   !> - Bug fix: take into account that boundaries are compute on T point,
+   !>   but expressed on U,V point
+   !>
    !> @param[inout] td_bdy boundary structure 
    !> @param[in] td_var    variable structure 
@@ -1552 +1555 @@
       il_max(jp_west )=td_var%t_dim(2)%i_len
  
-      il_maxindex(jp_north)=td_var%t_dim(2)%i_len-ip_ghost
+      ! index expressed on U,V point, move on T point.
+      il_maxindex(jp_north)=td_var%t_dim(2)%i_len-ip_ghost+1
       il_maxindex(jp_south)=td_var%t_dim(2)%i_len-ip_ghost
-      il_maxindex(jp_east )=td_var%t_dim(1)%i_len-ip_ghost
+      il_maxindex(jp_east )=td_var%t_dim(1)%i_len-ip_ghost+1
       il_maxindex(jp_west )=td_var%t_dim(1)%i_len-ip_ghost