Changeset 6717 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

Timestamp:

2016-06-17T12:00:46+02:00 (8 years ago)

Author:

gm

Message:

#1692 - branch SIMPLIF_2_usrdef: numerous improvement in the user defined interface

File:

• branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) (4 diffs)

branches/2016/dev_r6409_SIMPLIF_2_usrdef/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
+              IF( iiglo==jpiglo .AND. nimpp==1 )   iiglo = 2         !!gm BUG: Hard coded periodicity !
 
               iiloc=iiglo-nimpp+1   ! local coordinates of the point
@@ -428 +428 @@
 
               !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