Changeset 1701 in lmdz_wrf

Timestamp:

Dec 8, 2017, 6:01:22 PM (7 years ago)

Author:

lfita

Message:

Adding more general generation of 2D X,Y variables

File:

• trunk/tools/get_stations.py (modified) (1 diff)

trunk/tools/get_stations.py

@@ -388 +388 @@
 
 # Looking for 2D 'lon', 'lat' related variables
-Xvarvals = dimvarvalues[dimvariables['lon']]
-Yvarvals = dimvarvalues[dimvariables['lat']]
-if len(Xvarvals.shape) == 1:
-    newXvarvals, newYvarvals = np.meshgrid(Xvarvals, Yvarvals) 
-    dimvarvalues[dimvariables['lon']] = newXvarvals
-    dimvarvalues[dimvariables['lat']] = newYvarvals
-    dx = newXvarvals.shape[1]
-    dy = newXvarvals.shape[0]
-
-# Looking for 4D 'plev' variable for calculation of diagnostics
-Zvarvals = dimvarvalues[dimvariables['plev']]
-Tvarvals = dimvarvalues[dimvariables['time']]
-if len(Zvarvals.shape) == 1:
-    dz = Zvarvals.shape[0]
-    dt = Tvarvals.shape[0]
-    newZvarvals = np.zeros((dt, dz, dy, dx), dtype=np.float)
-    for it in range(dt):
-        for iy in range(dy):
-            for ix in range(dx):
-                newZvarvals[it,:,iy,ix] = Zvarvals
-    dimvarvalues[dimvariables['plev']] = newZvarvals
+for xn in axesvars['X']:
+    Xvarvals = dimvarvalues[dimvariables[xn]]
+    Yvarvals = dimvarvalues[CFdims['lat']]
+    if len(Xvarvals.shape) == 1:
+        newXvarvals, newYvarvals = np.meshgrid(Xvarvals, Yvarvals) 
+        dimvarvalues[dimvariables[dimvariables[xn]] = newXvarvals
+for yn in axesvars['Y']:
+    Xvarvals = dimvarvalues[CFdims['lon']]
+    Yvarvals = dimvarvalues[dimvariables[yn]]
+    if len(Yvarvals.shape) == 1:
+        newXvarvals, newYvarvals = np.meshgrid(Xvarvals, Yvarvals) 
+        dimvarvalues[dimvariables[dimvariables[yn]] = newYvarvals
 
 # Retrieving surface data