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

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

@@ -266 +266 @@
    PRIVATE :: mpp__copy_arr            ! copy array of mpp structure
    PRIVATE :: mpp__get_use_unit        ! get sub domains to be used (which cover "zoom domain")
-   PRIVATE :: mpp__init_mask           ! initialise mpp structure, given file name
+   PRIVATE :: mpp__init_mask           ! initialise mpp structure, given mask array
    PRIVATE :: mpp__init_var            ! initialise mpp structure, given variable strcuture
    PRIVATE :: mpp__init_file           ! initialise a mpp structure, given file structure 
@@ -2550 +2550 @@
    !> and the number of processors following I and J.
    !> Then the number of sea/land processors is compute with mask
-   !
+   !>
    !> @author J.Paul
    !> @date October, 2015 - Initial version
-   !
+   !> @date October, 2016
+   !> - compare index to td_lay number of proc instead of td_mpp (bug fix)
+   !>
    !> @param[in] td_mpp mpp strcuture
    !> @param[in] id_mask   sub domain mask (sea=1, land=0)
@@ -2670 +2672 @@
 
             ! east boundary
-            IF( ji == td_mpp%i_niproc )THEN
+            IF( ji == td_lay%i_niproc )THEN
                il_lei = td_lay%i_lci(ji,jj)
             ELSE
@@ -2677 +2679 @@
 
             ! north boundary
-            IF( jj == td_mpp%i_njproc )THEN
+            IF( jj == td_lay%i_njproc )THEN
                il_lej = td_lay%i_lcj(ji,jj)
             ELSE