Changeset 2780 in lmdz_wrf for trunk/tools

Timestamp:

Dec 6, 2019, 8:48:32 PM (5 years ago)

Author:

lfita

Message:

Fixing lambert projection

File:

• trunk/tools/drawing_tools.py (modified) (5 diffs)

trunk/tools/drawing_tools.py

@@ -3060 +3060 @@
         if len(projvals) != Nvals:
             expvals = ['llcrnrlon', 'llcrnrlat', 'urcrnrlon','urcrnrlat']
-            print errrormsg
+            print errormsg
             print '  ' + fname + ": projection '" + proj + "' reequires ", Nvals,    \
               "values, ", len(projvals), 'provided!!'
@@ -3070 +3070 @@
 
     elif proj == 'lcc':
-        Nvals = 6
+        Nvals = 8
         if len(projvals) != Nvals:
-            expvals = ['lat_0', 'lon_0', 'llcrnrlon', 'llcrnrlat', 'urcrnrlon',      \
-              'urcrnrlat']
-            print errrormsg
+            expvals = ['lat1', 'lat2', 'lat_0', 'lon_0', 'SWlon', 'SWlat', 'NElon',  \
+              'NElat']
+            print errormsg
             print '  ' + fname + ": projection '" + proj + "' reequires ", Nvals,    \
               "values, ", len(projvals), 'provided!!'
@@ -3080 +3080 @@
             print '    provided:', projvals
             quit(-1)
-        defmap = Basemap(projection=proj, lat_0=projvals[0], lon_0=projvals[1],      \
-          llcrnrlon=projvals[2], llcrnrlat=projvals[3], urcrnrlon=projvals[4],       \
-          urcrnrlat=projvals[5], resolution=res)
+        defmap = Basemap(projection=proj, lat_1=projvals[0], lat_2=projvals[1],      \
+          lat_0=projvals[2], lon_0=projvals[3], llcrnrlon=projvals[4],               \
+          llcrnrlat=projvals[5], urcrnrlon=projvals[6], urcrnrlat=projvals[7],       \
+          resolution=res)
 
     elif proj == 'npstere':
@@ -3088 +3089 @@
         if len(projvals) != Nvals:
             expvals = ['boundinglat', 'lon_0']
-            print errrormsg
+            print errormsg
             print '  ' + fname + ": projection '" + proj + "' reequires ", Nvals,    \
               "values, ", len(projvals), 'provided!!'
@@ -4439 +4440 @@
             m = DefineMap(map_proj, map_res, [nlon,nlat,xlon,xlat])
         elif map_proj == 'lcc':
-            m = DefineMap(map_proj, map_res, [lat2, lon2, nlon, nlat, xlon, xlat])
+            Nvals = len(mapv.split(','))
+            if Nvals > 2:
+                expected = ['lat1', 'lat2', 'lat_0', 'lon_0', 'llcrnrlo',            \
+                  'llcrnrlat', 'urcrnrlon', 'urcrnrlat']
+                Nexpected = len(expected)
+                if Nvals - 2 != Nexpected:
+                    print errormsg
+                    print '  ' + fname + ": additional values provided for '" +      \
+                      map_proj + "' but ", Nexpected, "where expected and", Nvals,   \
+                      "provided"
+                    print '    one epxect to additinoaly have:', ','.join(expected)
+                    quit(-1)
+                lat1 = np.float(mapv.split(',')[2])
+                lon2 = np.float(mapv.split(',')[3])
+                lat_0 = np.float(mapv.split(',')[4])
+                lon_0 = np.float(mapv.split(',')[5])
+                SWlon = np.float(mapv.split(',')[6])
+                SWlat = np.float(mapv.split(',')[7])
+                NElon = np.float(mapv.split(',')[8])
+                NElat = np.float(mapv.split(',')[9])
+                m = DefineMap(map_proj, map_res, [lat1, lat2, lat_0, lon_0, SWlon,   \
+                  SWlat, NElon, NElat])
+            else:
+                m = DefineMap(map_proj, map_res, [nlat, xlat, lat2, lon2])
         elif map_proj == 'npstere':
             m = DefineMap(map_proj, map_res, [lat2, lon2])