Fix depricated pyproj.transform calls

MPAS-Dev · May 19, 2020 · 76bd7f7 · 76bd7f7
1 parent 97975b7
commit 76bd7f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/examples/make_mpas_to_lat_lon_mapping.py b/examples/make_mpas_to_lat_lon_mapping.py
@@ -42,7 +42,7 @@
 
 remapper = Remapper(inDescriptor, outDescriptor, mappingFileName)
 
-remapper.build_mapping_file(method='bilinear', mpiTasks=4)
+remapper.build_mapping_file(method='bilinear', mpiTasks=1)
 
 outFileName = 'temp_{}.nc'.format(outGridName)
 ds = xarray.open_dataset(inGridFileName)

diff --git a/pyremap/descriptor.py b/pyremap/descriptor.py
@@ -753,8 +753,9 @@ def project_to_lat_lon(self, X, Y):  # {{{
         # -------
         # Xylar Asay-Davis
 
-        Lon, Lat = pyproj.transform(self.projection, self.latLonProjection,
-                                    X, Y)
+        transformer = pyproj.Transformer.from_proj(self.projection,
+                                                   self.latLonProjection)
+        Lon, Lat = transformer.transform(X, Y)
 
         return (Lat, Lon)  # }}}
 

diff --git a/pyremap/polar.py b/pyremap/polar.py
@@ -125,8 +125,8 @@ def to_polar(points):
     projection = get_antarctic_stereographic_projection()
     latLonProjection = pyproj.Proj(proj='latlong', datum='WGS84')
 
-    x, y = pyproj.transform(latLonProjection, projection, points[:, 0],
-                            points[:, 1], radians=False)
+    transformer = pyproj.Transformer.from_proj(latLonProjection, projection)
+    x, y = transformer.transform(points[:, 0], points[:, 1], radians=False)
     points[:, 0] = x
     points[:, 1] = y
     return points
@@ -137,8 +137,8 @@ def from_polar(points):
     projection = get_antarctic_stereographic_projection()
     latLonProjection = pyproj.Proj(proj='latlong', datum='WGS84')
 
-    lon, lat = pyproj.transform(projection, latLonProjection, points[:, 0],
-                                points[:, 1], radians=False)
+    transformer = pyproj.Transformer.from_proj(projection, latLonProjection)
+    lon, lat = transformer.transform(points[:, 0], points[:, 1], radians=False)
     points[:, 0] = lon
     points[:, 1] = lat
     return points