Update preprocessing for pyremap 2.0.0

Author: xylar

preprocess_observations/preprocess_SOSE_data.py

@@ -32,8 +32,7 @@
 import gsw
 
 from mpas_analysis.shared.io.download import download_files
-from mpas_analysis.shared.interpolation import Remapper
-from mpas_analysis.shared.grid import LatLonGridDescriptor
+from pyremap import LatLonGridDescriptor, Remapper
 from mpas_analysis.shared.climatology.comparison_descriptors \
     import get_comparison_descriptor
 from mpas_analysis.configuration \
@@ -486,24 +485,27 @@ def remap(ds, outDescriptor, mappingFileName, inDir, outFileName):
     ds.close()
 
     inDescriptor = LatLonGridDescriptor.read(tempFileName1,
-                                             latVarName='lat',
-                                             lonVarName='lon')
+                                             lat_var_name='lat',
+                                             lon_var_name='lon')
 
-    remapper = Remapper(inDescriptor, outDescriptor, mappingFileName)
+    remapper = Remapper(map_filename=mappingFileName, method='bilinear')
+    remapper.src_descriptor = inDescriptor
+    remapper.dst_descriptor = outDescriptor
+    remapper.build_map()
 
-    remapper.build_mapping_file(method='bilinear')
-
-    remapper.remap_file(inFileName=tempFileName1,
-                        outFileName=tempFileName2,
-                        overwrite=True,
-                        renormalize=0.01)
+    remapper.ncremap(
+        in_filename=tempFileName1,
+        out_filename=tempFileName2,
+        overwrite=True,
+        renormalize=0.01
+    )
 
     ds = xarray.open_dataset(tempFileName2)
     if 'z' in ds:
         print('  transposing back...')
         ds = ds.chunk({'Time': 4})
         ds = ds.transpose('Time', 'x', 'y', 'z', 'nvertices')
-    ds.attrs['meshName'] = outDescriptor.meshName
+    ds.attrs['meshName'] = outDescriptor.mesh_name
 
     for coord in ['x', 'y']:
         ds.coords[coord] = xarray.DataArray.from_dict(
@@ -765,7 +767,7 @@ def main():
                '{}'.format(antarcticStereoWidth))
 
     outDescriptor = get_comparison_descriptor(config, 'antarctic')
-    outGridName = '{}_{}'.format(outDescriptor.meshName, date)
+    outGridName = '{}_{}'.format(outDescriptor.mesh_name, date)
 
     inPrefixes = [inTPrefix, inSPrefix, inMLDPrefix, inUPrefix, inVPrefix,
                   inGammaNPrefix]

preprocess_observations/preprocess_Schmidtko_data.py

@@ -31,8 +31,7 @@
 
 from mpas_analysis.shared.io.download import download_files
 
-from mpas_analysis.shared.interpolation import Remapper
-from mpas_analysis.shared.grid import LatLonGridDescriptor
+from pyremap import LatLonGridDescriptor, Remapper
 from mpas_analysis.shared.climatology.comparison_descriptors \
     import get_comparison_descriptor
 from mpas_analysis.configuration \
@@ -150,26 +149,27 @@ def remap(inDir, outDir):
     inDescriptor = LatLonGridDescriptor()
 
     inDescriptor = LatLonGridDescriptor.read(inFileName,
-                                             latVarName='lat',
-                                             lonVarName='lon')
+                                             lat_var_name='lat',
+                                             lon_var_name='lon')
 
     outDescriptor = get_comparison_descriptor(config, 'antarctic')
-    outGridName = outDescriptor.meshName
+    outGridName = outDescriptor.mesh_name
 
     outFileName = '{}/Schmidtko_et_al_2014_bottom_PT_S_PD_{}.nc'.format(
         outDir, outGridName)
 
     mappingFileName = '{}/map_{}_to_{}.nc'.format(inDir, inGridName,
                                                   outGridName)
 
-    remapper = Remapper(inDescriptor, outDescriptor, mappingFileName)
-
-    remapper.build_mapping_file(method='bilinear')
+    remapper = Remapper(map_filename=mappingFileName, method='bilinear')
+    remapper.src_descriptor = inDescriptor
+    remapper.dst_descriptor = outDescriptor
+    remapper.build_map()
 
     if not os.path.exists(outFileName):
         print('Remapping...')
         with xarray.open_dataset(inFileName) as dsIn:
-            with remapper.remap(dsIn, renormalizationThreshold=0.01) \
+            with remapper.remap_numpy(dsIn, renormalizationThreshold=0.01) \
                     as remappedMLD:
                 print('Done.')
                 remappedMLD.attrs['history'] = ' '.join(sys.argv)

preprocess_observations/preprocess_adusumilli_melt.py

@@ -163,13 +163,16 @@ def remap_adusumilli(in_filename, out_prefix, date, task_count=512):
 
         map_filename = f'map_{in_grid_name}_to_{out_grid_name}_{method}.nc'
 
-        remapper = Remapper(in_descriptor, out_descriptor, map_filename)
+        remapper = Remapper(
+            ntasks=task_count, map_filename=map_filename, method=method)
+        remapper.src_descriptor = in_descriptor
+        remapper.dst_descriptor = out_descriptor
+        remapper.parallel_exec = 'srun'
 
         if not os.path.exists(map_filename):
-            remapper.build_mapping_file(method=method, mpiTasks=task_count,
-                                        esmf_parallel_exec='srun')
+            remapper.build_map()
 
-        ds_out = remapper.remap(ds)
+        ds_out = remapper.remap_numpy(ds)
         mask = ds_out.meltMask > 0.
         ds_out['meltRate'] = ds_out.meltRate.where(mask)
         ds_out.meltRate.attrs = melt_attrs

preprocess_observations/preprocess_paolo_melt.py

@@ -158,13 +158,16 @@ def remap_paolo(in_filename, out_prefix, date, task_count=128):
 
         map_filename = f'map_{in_grid_name}_to_{out_grid_name}_{method}.nc'
 
-        remapper = Remapper(in_descriptor, out_descriptor, map_filename)
+        remapper = Remapper(
+            ntasks=task_count, map_filename=map_filename, method=method)
+        remapper.src_descriptor = in_descriptor
+        remapper.dst_descriptor = out_descriptor
+        remapper.parallel_exec = 'srun'
 
         if not os.path.exists(map_filename):
-            remapper.build_mapping_file(method=method, mpiTasks=task_count,
-                                        esmf_parallel_exec='srun')
+            remapper.build_map()
 
-        ds_out = remapper.remap(ds)
+        ds_out = remapper.remap_numpy(ds)
         mask = ds_out.meltMask > 0.
         ds_out['meltRate'] = ds_out.meltRate.where(mask)
         ds_out.meltRate.attrs = melt_attrs

preprocess_observations/remap_rignot.py

@@ -15,8 +15,7 @@
 import pyproj
 import sys
 
-from mpas_analysis.shared.interpolation import Remapper
-from mpas_analysis.shared.grid import ProjectionGridDescriptor
+from pyremap import ProjectionGridDescriptor, Remapper
 from mpas_analysis.shared.mpas_xarray.mpas_xarray import subset_variables
 from mpas_analysis.shared.climatology \
     import get_Antarctic_stereographic_comparison_descriptor
@@ -50,21 +49,22 @@
 
 inDescriptor = ProjectionGridDescriptor(projection)
 
-inDescriptor.read(inFileName, xVarName='xaxis', yVarName='yaxis',
-                  meshName=inGridName)
+inDescriptor.read(inFileName, x_var_name='xaxis', y_var_name='yaxis',
+                  mesh_name=inGridName)
 
 outDescriptor = get_Antarctic_stereographic_comparison_descriptor(config)
-outGridName = outDescriptor.meshName
+outGridName = outDescriptor.mesh_name
 
 outFileName = 'Rignot_2013_melt_rates_{}.nc'.format(outGridName)
 
 mappingFileName = 'map_{}_to_{}.nc'.format(inGridName, outGridName)
 
-remapper = Remapper(inDescriptor, outDescriptor, mappingFileName)
+remapper = Remapper(map_filename=mappingFileName, method='bilinear')
+remapper.src_descriptor = inDescriptor
+remapper.dst_descriptor = outDescriptor
+remapper.build_map()
 
-remapper.build_mapping_file(method='bilinear')
-
-remappedDataset = remapper.remap(ds, renormalizationThreshold=0.01)
+remappedDataset = remapper.remap_numpy(ds, renormalizationThreshold=0.01)
 
 remappedDataset.attrs['history'] = ' '.join(sys.argv)
 remappedDataset.to_netcdf(outFileName)