Changeset 2184 in lmdz_wrf for trunk

Timestamp:

Oct 12, 2018, 8:18:25 PM (7 years ago)

Author:

lfita

Message:

Moving mindist' from 'nc_var_tools' to 'generic_tools'

Location:

trunk/tools

Files:

• generic_tools.py (modified) (2 diffs)
• nc_var_tools.py (modified) (3 diffs)

trunk/tools/generic_tools.py

@@ -139 +139 @@
 # maxNcounts: Function to provide a value according to the maximum number of repeated values along a given axis
 # minNcounts: Function to provide a value according to the minimum number of repeated values along a given axis
+# mindist: Function to provide the minimum distance toa pair of lon,lat
 # minmax_range: Function to provide a range for a given pair of minimum and maximum
 # multi_index_mat: Function to provide the multiple coordinates of a given value inside a matrix
@@ -14593 +14594 @@
     return cftimes, timeu
 
+def mindist(lonv,latv,lonvalue,latvalue):
+    """ Function to proivde the minimum distance toa pair of lon,lat
+     lonv: matrix with longitudes
+     latv: matrix with longitudes
+     lonvalue: longitude to look for
+     latvalue: latitude to look for
+    """
+    fname = 'mindist'
+
+    if len(lonv.shape) == 1:
+        distlon = np.abs(lonv - lonvalue)
+        distlat = np.abs(latv - latvalue)
+
+        mindifflon = np.min(distlon)
+        mindifflat = np.min(distlat)
+        ix = gen.index_vec(distlon, mindistlon)
+        iy = gen.index_vec(distlat, mindistlat)
+    else:
+        dist = np.sqrt((lonv - lonvalue)**2 + (latv - latvalue)**2)
+        mindist = np.min(dist)
+        [iy, ix] = gen.index_mat(dist, mindist)
+
+    return [ix, iy], mindist
+
+
 #quit()
 

trunk/tools/nc_var_tools.py

@@ -113 +113 @@
 # maskvar: Function to mask a variable using a mask. It is assumed that mask[...,dimM,dimJ,dimK] and var[...,dimM,dimJ,dimK] share the last dimensions
 # merge_files: Function to merge variables from two files
-# mindist: Function to provide the minimum distance toa pair of lon,lat
 # ModelChar: Class object to determine major characterisitcs of a given model output
 # model_characteristics: Functino to provide major characterisitcs of a given model output
@@ -24543 +24542 @@
 #itime('WRFtime', '../PY/wrfout_d01_1995-01-01_00:00:00', 'Times')
 
-def mindist(lonv,latv,lonvalue,latvalue):
-    """ Function to proivde the minimum distance toa pair of lon,lat
-     lonv: matrix with longitudes
-     latv: matrix with longitudes
-     lonvalue: longitude to look for
-     latvalue: latitude to look for
-    """
-    fname = 'mindist'
-
-    if len(lonv.shape) == 1:
-        distlon = np.abs(lonv - lonvalue)
-        distlat = np.abs(latv - latvalue)
-
-        mindifflon = np.min(distlon)
-        mindifflat = np.min(distlat)
-        ix = gen.index_vec(distlon, mindistlon)
-        iy = gen.index_vec(distlat, mindistlat)
-    else:
-        dist = np.sqrt((lonv - lonvalue)**2 + (latv - latvalue)**2)
-        mindist = np.min(dist)
-        [iy, ix] = gen.index_mat(dist, mindist)
-
-    return [ix, iy], mindist
-
 def get_point(values, ncfile, variable):
     """ Function to provide the closest grid point to a given lat,lon
@@ -24634 +24609 @@
     onc.close()
     # looking for minimum distance
-    gridpoint, ndist = mindist(lonv,latv,lonvalue,latvalue)
+    gridpoint, ndist = gen.mindist(lonv,latv,lonvalue,latvalue)
 
     print str(gridpoint[0])+','+str(gridpoint[1]), ndist