Changeset 3570 for branches/2012/dev_r3327_MERCATOR1_BDY/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90

Timestamp:

2012-11-16T10:58:11+01:00 (11 years ago)

Author:

cbricaud

Message:

merge branche dev_r3327_MERCATOR1_BDY with trunk: rev3327 to rev3555

File:

• branches/2012/dev_r3327_MERCATOR1_BDY/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90 (modified) (2 diffs)

branches/2012/dev_r3327_MERCATOR1_BDY/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90

@@ -370 +370 @@
         DO WHILE ( (  sec%listPoint(jseg)%I .NE.  endingPoint%I    &
                  .OR. sec%listPoint(jseg)%J .NE. endingPoint%J   ) &
-                 .AND. jseg .LT. nb_inmesh + 1 .AND. sec%listPoint(jseg)%I .GT. 0  )         
+                 .AND. jseg .LT. nb_inmesh + 10 .AND. sec%listPoint(jseg)%I .GT. 0  )         
    
            ! a. find the 4 adjacent points (North, South, East, West)
@@ -429 +429 @@
            !--------------------
            IF(      SouthPoint%I==endingPoint%I .AND. SouthPoint%J==endingPoint%J )THEN 
-               jseg = jseg+1 ; sec%listPoint(jseg) = SouthPoint
+               sec%direction(jseg)=2 ; jseg = jseg+1 ; sec%listPoint(jseg) = SouthPoint
            ELSE IF( NorthPoint%I==endingPoint%I .AND. NorthPoint%J==endingPoint%J )THEN
-               jseg = jseg+1 ; sec%listPoint(jseg) = NorthPoint
+               sec%direction(jseg)=3 ; jseg = jseg+1 ; sec%listPoint(jseg) = NorthPoint
            ELSE IF(  WestPoint%I==endingPoint%I .AND.  WestPoint%J==endingPoint%J )THEN
-               jseg = jseg+1 ; sec%listPoint(jseg) = WestPoint
+               sec%direction(jseg)=0 ; jseg = jseg+1 ; sec%listPoint(jseg) = WestPoint
            ELSE IF(   EstPoint%I==endingPoint%I .AND.   EstPoint%J==endingPoint%J )THEN
-               jseg = jseg+1 ; sec%listPoint(jseg) = EstPoint
+               sec%direction(jseg)=1 ; jseg = jseg+1 ; sec%listPoint(jseg) = EstPoint
 
            ELSE