Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.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/NEMO/OPA_SRC/DIA/diadct.F90 (modified) (7 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

@@ -392 +392 @@
         ENDIF               
 
-        IF( iptglo .NE. 0 )THEN
+        IF( iptglo /= 0 )THEN
              
            !read points'coordinates and directions 
@@ -399 +399 @@
            directemp(:) = 0                  !value of directions of each points
            DO jpt=1,iptglo
-              READ(numdct_in)i1,i2
+              READ(numdct_in) i1, i2
               coordtemp(jpt)%I = i1 
               coordtemp(jpt)%J = i2
            ENDDO
-           READ(numdct_in)directemp(1:iptglo)
+           READ(numdct_in) directemp(1:iptglo)
     
            !debug
@@ -416 +416 @@
            !Now each proc selects only points that are in its domain:
            !--------------------------------------------------------
-           iptloc = 0                    !initialize number of points selected
-           DO jpt=1,iptglo               !loop on listpoint read in the file
-                    
+           iptloc = 0                    ! initialize number of points selected
+           DO jpt = 1, iptglo            ! loop on listpoint read in the file
+              !      
               iiglo=coordtemp(jpt)%I          ! global coordinates of the point
               ijglo=coordtemp(jpt)%J          !  " 
 
-              IF( iiglo==jpidta .AND. nimpp==1 ) iiglo = 2
-
-              iiloc=iiglo-jpizoom+1-nimpp+1   ! local coordinates of the point
-              ijloc=ijglo-jpjzoom+1-njmpp+1   !  "
+              IF( iiglo==jpiglo .AND. nimpp==1 )   iiglo = 2         !!gm BUG: Hard coded periodicity !
+
+              iiloc=iiglo-nimpp+1   ! local coordinates of the point
+              ijloc=ijglo-njmpp+1   !  "
 
               !verify if the point is on the local domain:(1,nlei)*(1,nlej)
-              IF( iiloc .GE. 1 .AND. iiloc .LE. nlei .AND. &
-                  ijloc .GE. 1 .AND. ijloc .LE. nlej       )THEN
+              IF( iiloc >= 1 .AND. iiloc <= nlei .AND. &
+                  ijloc >= 1 .AND. ijloc <= nlej       )THEN
                  iptloc = iptloc + 1                                                 ! count local points
                  secs(jsec)%listPoint(iptloc) = POINT_SECTION(mi0(iiglo),mj0(ijglo)) ! store local coordinates
                  secs(jsec)%direction(iptloc) = directemp(jpt)                       ! store local direction
               ENDIF
-
-           ENDDO
+              !
+           END DO
      
            secs(jsec)%nb_point=iptloc !store number of section's points
@@ -444 +444 @@
               WRITE(numout,*)"      List of points selected by the proc:"
               DO jpt = 1,iptloc
-                 iiglo = secs(jsec)%listPoint(jpt)%I + jpizoom - 1 + nimpp - 1
-                 ijglo = secs(jsec)%listPoint(jpt)%J + jpjzoom - 1 + njmpp - 1
+                 iiglo = secs(jsec)%listPoint(jpt)%I + nimpp - 1
+                 ijglo = secs(jsec)%listPoint(jpt)%J + njmpp - 1
                  WRITE(numout,*)'         # I J : ',iiglo,ijglo
               ENDDO
@@ -452 +452 @@
               IF(jsec==nn_secdebug .AND. secs(jsec)%nb_point .NE. 0)THEN
               DO jpt = 1,iptloc
-                 iiglo = secs(jsec)%listPoint(jpt)%I + jpizoom - 1 + nimpp - 1
-                 ijglo = secs(jsec)%listPoint(jpt)%J + jpjzoom - 1 + njmpp - 1
+                 iiglo = secs(jsec)%listPoint(jpt)%I + nimpp - 1
+                 ijglo = secs(jsec)%listPoint(jpt)%J + njmpp - 1
               ENDDO
               ENDIF
@@ -468 +468 @@
            IF(jsec==nn_secdebug .AND. secs(jsec)%nb_point .NE. 0)THEN
               DO jpt = 1,secs(jsec)%nb_point
-                 iiglo = secs(jsec)%listPoint(jpt)%I + jpizoom - 1 + nimpp - 1
-                 ijglo = secs(jsec)%listPoint(jpt)%J + jpjzoom - 1 + njmpp - 1
+                 iiglo = secs(jsec)%listPoint(jpt)%I + nimpp - 1
+                 ijglo = secs(jsec)%listPoint(jpt)%J + njmpp - 1
               ENDDO
            ENDIF
@@ -479 +479 @@
               iptloc = secs(jsec)%nb_point
               DO jpt = 1,iptloc
-                 iiglo = secs(jsec)%listPoint(jpt)%I + jpizoom - 1 + nimpp - 1
-                 ijglo = secs(jsec)%listPoint(jpt)%J + jpjzoom - 1 + njmpp - 1
+                 iiglo = secs(jsec)%listPoint(jpt)%I + nimpp - 1
+                 ijglo = secs(jsec)%listPoint(jpt)%J + njmpp - 1
                  WRITE(numout,*)'         # I J : ',iiglo,ijglo
                  CALL FLUSH(numout)