Changeset 2260 in lmdz_wrf

Timestamp:

Dec 17, 2018, 2:31:30 PM (6 years ago)

Author:

lfita

Message:

Fixing in `rangefaces' to make use of the right distance:

• dx for WE
• dy for SN
• ds for theoretical WE-SN

Location:

trunk/tools

Files:

• diag_tools.py (modified) (3 diffs)
• diagnostics.py (modified) (1 diff)
• module_ForDiagnostics.f90 (modified) (5 diffs)

trunk/tools/diag_tools.py

@@ -1370 +1370 @@
     return var1, var2, vardims, varvdims
 
-def Forcompute_range_faces(lon, lat, hgt, ds, face, dsfilt, dsnewrng, hvalleyrng,    \
-  dimns, dimvns):
+def Forcompute_range_faces(lon, lat, hgt, dsx, dsy, ds, face, dsfilt, dsnewrng,      \
+  hvalleyrng, dimns, dimvns):
     """ Function to compute faces [uphill, valley, downhill] of sections of a mountain
       rage, along a given face
@@ -1378 +1378 @@
       [lat]= latitude values (assuming [y,x]) [degrees north]
       [hgt]= height values (assuming [y,x]) [m]
+      [dsx]= distance between grid points along x-axis (assuming [y,x]) [m]
+      [dsy]= distance between grid points along y-axis (assuming [y,x]) [m]
       [ds]= distance between grid points (assuming [y,x]) [m]
       face= which face (axis along which produce slices) to use to compute the 
@@ -1403 +1405 @@
           rnghgtmaxt, ptrnghgtmaxt =                                                 \
           fdin.module_fordiagnostics.compute_range_faces(lon=lon[:].transpose(),     \
-          lat=lat[:].transpose(), hgt=hgt[:].transpose(), dist=ds[:].transpose(),    \
-          face=face, dsfilt=dsfilt, dsnewrange=dsnewrng, hvalrng=hvalleyrng, d1=dx,  \
-          d2=dy)
+          lat=lat[:].transpose(), hgt=hgt[:].transpose(), xdist=ds[:].transpose(),   \
+          ydist=ds[:].transpose(), dist=ds[:].transpose(), face=face, dsfilt=dsfilt, \
+          dsnewrange=dsnewrng, hvalrng=hvalleyrng, d1=dx, d2=dy)
         print 'Finished!'
         hgtmax = hgtmaxt.transpose()

trunk/tools/diagnostics.py

@@ -817 +817 @@
         orogmax, ptorogmax, dhgt, peaks, valleys, origfaces, diagout, diagoutd,      \
           diagoutvd, rng, rngorogmax, ptrngorogmax= diag.Forcompute_range_faces(lon, \
-           lat, hgt, WRFds, face, dsfilt, dsnewrange, hvalleyrange, dnamesvar,       \
-           dvnamesvar)
+           lat, hgt, WRFdx, WRFdy, WRFds, face, dsfilt, dsnewrange, hvalleyrange,    \
+           dnamesvar, dvnamesvar)
 
         # Removing the nonChecking variable-dimensions from the initial list

trunk/tools/module_ForDiagnostics.f90

@@ -949 +949 @@
   END SUBROUTINE compute_fog_FRAML50
 
-  SUBROUTINE compute_range_faces(d1, d2, lon, lat, hgt, dist, face, dsfilt, dsnewrange, hvalrng,      &
-    hgtmax, pthgtmax, derivhgt, peaks, valleys, origfaces, filtfaces, ranges, rangeshgtmax,           &
+  SUBROUTINE compute_range_faces(d1, d2, lon, lat, hgt, xdist, ydist, dist, face, dsfilt, dsnewrange, &
+    hvalrng, hgtmax, pthgtmax, derivhgt, peaks, valleys, origfaces, filtfaces, ranges, rangeshgtmax,  &
     ptrangeshgtmax)
 ! Subroutine to compute faces [uphill, valleys, downhill] of a mountain range along a given face
@@ -958 +958 @@
     INTEGER, INTENT(in)                                  :: d1, d2
     REAL(r_k), INTENT(in)                                :: dsfilt, dsnewrange, hvalrng
-    REAL(r_k), DIMENSION(d1,d2), INTENT(in)              :: lon, lat, hgt, dist
+    REAL(r_k), DIMENSION(d1,d2), INTENT(in)              :: lon, lat, hgt, xdist, ydist, dist
     CHARACTER(len=*)                                     :: face
     REAL(r_k), DIMENSION(d1,d2), INTENT(out)             :: derivhgt, hgtmax, rangeshgtmax
@@ -1002 +1002 @@
       DO j=1, d2
         !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),    &
-          filtfaces(:,j), Nranges, ranges1, rangeshgtmax1, irangeshgtmax1)
+        CALL var_range_faces(d1, lon(:,j), lat(:,j), hgt(:,j), xdist(:,j), dsfilt,   &
+          dsnewrange, hvalrng, hgtmax1, pthgtmax1, derivhgt(:,j), Npeaks, ipeaks1,   &
+          Nvalleys, ivalleys1, origfaces(:,j), filtfaces(:,j), Nranges, ranges1,     &
+          rangeshgtmax1, irangeshgtmax1)
         hgtmax(:,j) = hgtmax1
         pthgtmax(pthgtmax1,j) = 1
@@ -1021 +1022 @@
     ELSE IF (TRIM(face) == 'SN') THEN
       DO i=1, d1
-        CALL var_range_faces(d2, lon(i,:), lat(i,:), hgt(i,:), dist(i,:), dsfilt, dsnewrange, hvalrng,&
-          hgtmax1, pthgtmax1, derivhgt(i,:), Npeaks, ipeaks2, Nvalleys, ivalleys2, origfaces(i,:),    &
-          filtfaces(i,:), Nranges, ranges2, rangeshgtmax2, irangeshgtmax2)
+        CALL var_range_faces(d2, lon(i,:), lat(i,:), hgt(i,:), ydist(i,:), dsfilt,   &
+          dsnewrange, hvalrng, hgtmax1, pthgtmax1, derivhgt(i,:), Npeaks, ipeaks2,   &
+          Nvalleys, ivalleys2, origfaces(i,:), filtfaces(i,:), Nranges, ranges2,     &
+          rangeshgtmax2, irangeshgtmax2)
         hgtmax(i,:) = hgtmax1
         pthgtmax(i,pthgtmax1) = 1
@@ -1049 +1051 @@
   END SUBROUTINE compute_range_faces
 
+  SUBROUTINE compute_Koeppen_Geiger_climates(dx, dy, dt, pr, tas, climatesI, climatesS, climlegend)
+  ! Subroutine to compute the Koeppen-Geiger climates after:
+  !     Kottek et al., Meteorologische Zeitschrift, Vol. 15, No. 3, 259-263
+
+    IMPLICIT NONE
+
+    INTEGER, INTENT(in)                                  :: dx, dy, dt
+    REAL(r_k), DIMENSION(dx, dy, dt), INTENT(in)         :: pr, tas
+    INTEGER, DIMENSION(dy, dt), INTENT(out)              :: climatesI
+    CHARACTER(LEN=3), DIMENSION(dy, dt), INTENT(out)     :: climatesS
+    CHARACTER(LEN=1000), INTENT(out)                     :: climlegend
+
+! Local
+    INTEGER                                              :: i,j
+
+
+
+
+  END SUBROUTINE compute_Koeppen_Geiger_climates
+
 END MODULE module_ForDiagnostics