Merge pull request #905 from xylar/fix-remapping-tidal-mixing

Fix remapping of tidal mixing fields

Author: xylar

compass/ocean/tests/global_ocean/files_for_e3sm/remap_tidal_mixing.py

@@ -163,8 +163,11 @@ def remap_tidal(
         logger.info('Remapping...')
         name, ext = os.path.splitext(out_filename)
         remap_filename = f'{name}_after_remap{ext}'
-        remapper.remap_file(inFileName=in_filename, outFileName=remap_filename,
-                            logger=logger)
+        remapper.ncremap(
+            in_filename=in_filename,
+            out_filename=remap_filename,
+            logger=logger
+        )
 
         ds_mask = xr.open_dataset(land_ice_mask_filename)
         land_ice_mask = ds_mask.landIceMask
@@ -177,8 +180,6 @@ def remap_tidal(
 
         with xr.open_dataset(remap_filename) as ds_remap:
             logger.info('Renaming dimensions and variables...')
-            rename = dict(ncol='nCells')
-            ds_remap = ds_remap.rename(rename)
             ds_remap = ds_remap.drop_vars(['x', 'y'])
 
             # renormalize