Changeset 2217 in lmdz_wrf for trunk/tools

Timestamp:

Nov 6, 2018, 9:12:03 PM (6 years ago)

Author:

lfita

Message:

Final, final version!

Location:

trunk/tools

Files:

• module_ForDiagnostics.f90 (modified) (1 diff)
• module_ForDiagnosticsVars.f90 (modified) (2 diffs)

trunk/tools/module_ForDiagnostics.f90

@@ -999 +999 @@
     IF (TRIM(face) == 'WE') THEN
       DO j=1, d2
-        PRINT *,'Lluis:', j-1, '***'
+        !PRINT *,'Lluis:', j-1, '***'
         CALL var_range_faces(d1, lon(:,j), lat(:,j), hgt(:,j), dist(:,j), dsfilt, dsnewrange, hvalrng,&
           hgtmax1, pthgtmax1, derivhgt(:,j), Npeaks, ipeaks1, Nvalleys, ivalleys1, origfaces(:,j),    &

trunk/tools/module_ForDiagnosticsVars.f90

@@ -1756 +1756 @@
       j1 = 2
       DO i=2, d
-        IF (i >= ipeaks(j) .AND. i < ipeaks(j+1) .AND. (ipeaks(j+1) < ranges(2,k))) THEN
-          IF (hgt(i) < peaks(j) .AND. hgt(i) < peaks(j+1)) faces0(i) = 0
+        IF (i >= ipeaks(j) .AND. i < ipeaks(j1)) THEN
+          IF (hgt(i) < peaks(j) .AND. hgt(i) < peaks(j1)) faces0(i) = 0
           IF (i == ipeaks(j) .AND. hgt(i) < rangeshgtmax(k)) faces0(i) = 0
-        ELSE IF (i == ipeaks(j+1)) THEN
+        ELSE IF (i == ipeaks(j1)) THEN
           j = j1
           j1 = j1 + 1
@@ -1765 +1765 @@
         END IF
       END DO
-      IF (ipeaks(j+1) > ranges(2,k)) k = k+1
+      IF (ipeaks(j1) > ranges(2,k)) k = k+1
     END IF