Merge pull request #122 from xylar/clean-up

A clean-up PR

Author: xylar

pyremap/descriptor/mpas_cell_mesh_descriptor.py

@@ -127,7 +127,12 @@ def to_scrip(self, scrip_filename, expand_dist=None, expand_factor=None):
 
         ds_out = xr.Dataset()
 
-        ds_out['grid_area'] = (('grid_size',), area_cell / (sphere_radius**2))
+        if sphere_radius > 0:
+            ds_out['grid_area'] = (
+                ('grid_size',),
+                area_cell / (sphere_radius**2),
+            )
+            ds_out.grid_area.attrs['units'] = 'radians^2'
 
         ds_out['grid_center_lat'] = (('grid_size',), lat_cell)
         ds_out['grid_center_lon'] = (('grid_size',), lon_cell)
@@ -165,7 +170,6 @@ def to_scrip(self, scrip_filename, expand_dist=None, expand_factor=None):
         ds_out.grid_corner_lat.attrs['units'] = 'radians'
         ds_out.grid_corner_lon.attrs['units'] = 'radians'
         ds_out.grid_imask.attrs['units'] = 'unitless'
-        ds_out.grid_area.attrs['units'] = 'radians^2'
 
         if expand_dist is not None or expand_factor is not None:
             expand_scrip(ds_out, expand_dist, expand_factor)

pyremap/descriptor/mpas_edge_mesh_descriptor.py

@@ -142,10 +142,16 @@ def to_scrip(self, scrip_filename, expand_dist=None, expand_factor=None):
             mask = cells_on_edge[:, i_cell] >= 0
             valid_cells_on_edge[mask] = valid_cells_on_edge[mask] + 1
 
-        ds_out['grid_area'] = (
-            ('grid_size',),
-            0.5 * valid_cells_on_edge * dc_edge * dv_edge / (sphere_radius**2),
-        )
+        if sphere_radius > 0:
+            ds_out['grid_area'] = (
+                ('grid_size',),
+                0.5
+                * valid_cells_on_edge
+                * dc_edge
+                * dv_edge
+                / (sphere_radius**2),
+            )
+            ds_out.grid_area.attrs['units'] = 'radians^2'
 
         ds_out['grid_center_lat'] = (('grid_size',), lat_edge)
         ds_out['grid_center_lon'] = (('grid_size',), lon_edge)
@@ -198,7 +204,6 @@ def to_scrip(self, scrip_filename, expand_dist=None, expand_factor=None):
         ds_out.grid_corner_lat.attrs['units'] = 'radians'
         ds_out.grid_corner_lon.attrs['units'] = 'radians'
         ds_out.grid_imask.attrs['units'] = 'unitless'
-        ds_out.grid_area.attrs['units'] = 'radians^2'
 
         if expand_dist is not None or expand_factor is not None:
             expand_scrip(ds_out, expand_dist, expand_factor)

pyremap/descriptor/mpas_vertex_mesh_descriptor.py

@@ -136,10 +136,12 @@ def to_scrip(self, scrip_filename, expand_dist=None, expand_factor=None):
                 vertex_area[mask] + kite_areas_on_vertex[mask, icell]
             )
 
-        ds_out['grid_area'] = (
-            ('grid_size',),
-            vertex_area / (sphere_radius**2),
-        )
+        if sphere_radius > 0:
+            ds_out['grid_area'] = (
+                ('grid_size',),
+                vertex_area / (sphere_radius**2),
+            )
+            ds_out.grid_area.attrs['units'] = 'radians^2'
 
         ds_out['grid_center_lat'] = (('grid_size',), lat_vertex)
         ds_out['grid_center_lon'] = (('grid_size',), lon_vertex)
@@ -191,7 +193,6 @@ def to_scrip(self, scrip_filename, expand_dist=None, expand_factor=None):
         ds_out.grid_corner_lat.attrs['units'] = 'radians'
         ds_out.grid_corner_lon.attrs['units'] = 'radians'
         ds_out.grid_imask.attrs['units'] = 'unitless'
-        ds_out.grid_area.attrs['units'] = 'radians^2'
 
         if expand_dist is not None or expand_factor is not None:
             expand_scrip(ds_out, expand_dist, expand_factor)

pyremap/remapper/remapper.py

@@ -1,5 +1,3 @@
-import os
-
 from pyremap.remapper.build_map import _build_map
 from pyremap.remapper.ncremap import _ncremap
 from pyremap.remapper.remap_numpy import _remap_numpy
@@ -468,8 +466,6 @@ def ncremap(
             needed).
         """
         _setup_remapper(self)
-        if not os.path.exists(self.map_filename):
-            _build_map(self)
 
         _ncremap(
             self,