Changeset 2278 in lmdz_wrf for trunk/tools

Timestamp:

Dec 28, 2018, 5:41:36 PM (6 years ago)

Author:

lfita

Message:

Fixing `compute_cellbndsreg'

File:

• trunk/tools/module_ForDiagnostics.f90 (modified) (3 diffs)

trunk/tools/module_ForDiagnostics.f90

@@ -1176 +1176 @@
     INTEGER                                              :: ix,ex,iy,ey
     CHARACTER(len=2), DIMENSION(4)                       :: Svertex
-    INTEGER, DIMENSION(4,2,2,2)                          :: indices
-    REAL(r_k), DIMENSION(2)                              :: ptintsct
-    REAL(r_k), DIMENSION(2,2)                            :: merid, paral
-    LOGICAL                                              :: intsct
+    INTEGER, DIMENSION(4,2,2)                            :: indices
 
 !!!!!!! Variables
@@ -1192 +1189 @@
 
     ! SW
-    indices(1,1,1,1) = 0
-    indices(1,1,1,2) = 0
-    indices(1,1,2,1) = -1
-    indices(1,1,2,2) = 0
-    indices(1,2,1,1) = -1
-    indices(1,2,1,2) = 0
-    indices(1,2,2,1) = -1
-    indices(1,2,2,2) = -1
+    indices(1,1,1) = -1
+    indices(1,1,2) = 0
+    indices(1,2,1) = -1
+    indices(1,2,2) = 0
     ! NW
-    indices(2,1,1,1) = 0
-    indices(2,1,1,2) = 0
-    indices(2,1,2,1) = 0
-    indices(2,1,2,2) = 1
-    indices(2,2,1,1) = -1
-    indices(2,2,1,2) = 0
-    indices(2,2,2,1) = 1
-    indices(2,2,2,2) = 1
+    indices(2,1,1) = -1
+    indices(2,1,2) = 0
+    indices(2,2,1) = 0
+    indices(2,2,2) = 1
     ! NE
-    indices(3,1,1,1) = 1
-    indices(3,1,1,2) = 1
-    indices(3,1,2,1) = 0
-    indices(3,1,2,2) = 1
-    indices(3,2,1,1) = 0
-    indices(3,2,1,2) = 1
-    indices(3,2,2,1) = 1
-    indices(3,2,2,2) = 1
+    indices(3,1,1) = 0
+    indices(3,1,2) = 1
+    indices(3,2,1) = 0
+    indices(3,2,2) = 1
     ! SE
-    indices(4,1,1,1) = 1
-    indices(4,1,1,2) = 1
-    indices(4,1,2,1) = -1
-    indices(4,1,2,2) = 0
-    indices(4,2,1,1) = 0
-    indices(4,2,1,2) = 1
-    indices(4,2,2,1) = -1
-    indices(4,2,2,2) = -1
+    indices(4,1,1) = 0
+    indices(4,1,2) = 1
+    indices(4,2,1) = -1
+    indices(4,2,2) = 0
 
     DO i=1,dx
@@ -1232 +1213 @@
         DO iv=1,4
 
-          ix = MAX(i+indices(iv,1,1,1),1)
-          !ex = MIN(i+indices(iv,1,1,2),dx)
-          ex = i+indices(iv,1,1,2)
-          iy = MAX(j+indices(iv,1,2,1),1)
-          ey = MIN(j+indices(iv,1,2,2),dy)
- 
-          merid(1,1) = lon(ix,iy)
-          merid(1,2) = lat(ix,iy)
-          merid(2,1) = lon(ex,ey)
-          merid(2,2) = lat(ex,ey)
-
-          ix = MAX(i+indices(iv,2,1,1),1)
-          ex = MIN(i+indices(iv,2,1,2),dx)
-          iy = MAX(j+indices(iv,2,2,1),1)
-          !ey = MIN(i+indices(iv,2,2,2),dy)
-          ey = j+indices(iv,2,2,2)
-          paral(1,1) = lon(ix,iy)
-          paral(1,2) = lat(ix,iy)
-          paral(2,1) = lon(ex,ey)
-          paral(2,2) = lat(ex,ey)
-
-          CALL intersection_2Dlines(merid, paral, intsct, ptintsct)
-          IF (.NOT.intsct) THEN
-            msg = 'not interection found for ' // Svertex(iv) // ' vertex'
-            CALL ErrMsg(msg, fname, -1)
-          END IF
-          xbnds(i,j,iv) = ptintsct(1)
-          ybnds(i,j,iv) = ptintsct(2)
+          ix = MAX(i+indices(iv,1,1),1)
+          ix = MIN(ix,dx)
+          ex = MAX(i+indices(iv,1,2),1)
+          ex = MIN(ex,dx)
+          iy = MAX(j+indices(iv,2,1),1)
+          iy = MIN(iy,dy)
+          ey = MAX(j+indices(iv,2,2),1)
+          ey = MIN(ey,dy)
+
+          xbnds(i,j,iv) = 0.5*(lon(ix,iy) + lon(ex,ey))
+          ybnds(i,j,iv) = 0.5*(lat(ix,iy) + lat(ex,ey))
+
         END DO
       END DO