Merge pull request #890 from SCOREC/cws/gisCoarseTest

support running landice/greenland/mesh_gen test case on workstations

This PR passes the parallel_executable to a few functions that were hardcoded to use srun. With the right input files, this allows testing on workstations with limited memory and cores.

Author: matthewhoffman

compass/landice/mesh.py

@@ -1007,8 +1007,8 @@ def preprocess_ais_data(self, source_gridded_dataset,
     return preprocessed_gridded_dataset
 
 
-def interp_gridded2mali(self, source_file, mali_scrip, nProcs, dest_file, proj,
-                        variables="all"):
+def interp_gridded2mali(self, source_file, mali_scrip, parallel_executable,
+                        nProcs, dest_file, proj, variables="all"):
     """
     Interpolate gridded dataset (e.g. MEASURES, BedMachine) onto a MALI mesh
 
@@ -1020,6 +1020,9 @@ def interp_gridded2mali(self, source_file, mali_scrip, nProcs, dest_file, proj,
     mali_scrip : str
         name of scrip file corresponding to destination MALI mesh
 
+    parallel_executable : str
+        executable needed to launch a parallel job
+
     nProcs : int
         number of processors to use for generating remapping weights
 
@@ -1070,7 +1073,7 @@ def __guess_scrip_name(filename):
 
     # Generate remapping weights
     logger.info('generating gridded dataset -> MPAS weights')
-    args = ['srun', '-n', nProcs, 'ESMF_RegridWeightGen',
+    args = [parallel_executable, '-n', nProcs, 'ESMF_RegridWeightGen',
             '--source', source_scrip,
             '--destination', mali_scrip,
             '--weight', weights_filename,

compass/landice/tests/antarctica/mesh.py

@@ -63,6 +63,7 @@ def run(self):
 
         section_ais = config['antarctica']
 
+        parallel_executable = config.get('parallel', 'parallel_executable')
         nProcs = section_ais.get('nProcs')
         src_proj = section_ais.get("src_proj")
         data_path = section_ais.get('data_path')
@@ -138,14 +139,16 @@ def run(self):
 
         # Now perform bespoke interpolation of geometry and velocity data
         # from their respective sources
-        interp_gridded2mali(self, bedmachine_dataset, dst_scrip_file, nProcs,
+        interp_gridded2mali(self, bedmachine_dataset, dst_scrip_file,
+                            parallel_executable, nProcs,
                             self.mesh_filename, src_proj, variables="all")
 
         # only interpolate a subset of MEaSUREs variables onto the MALI mesh
         measures_vars = ['observedSurfaceVelocityX',
                          'observedSurfaceVelocityY',
                          'observedSurfaceVelocityUncertainty']
-        interp_gridded2mali(self, measures_dataset, dst_scrip_file, nProcs,
+        interp_gridded2mali(self, measures_dataset, dst_scrip_file,
+                            parallel_executable, nProcs,
                             self.mesh_filename, src_proj,
                             variables=measures_vars)
 

compass/landice/tests/greenland/mesh.py

@@ -65,6 +65,7 @@ def run(self):
 
         section_gis = config['greenland']
 
+        parallel_executable = config.get('parallel', 'parallel_executable')
         nProcs = section_gis.get('nProcs')
         src_proj = section_gis.get("src_proj")
         data_path = section_gis.get('data_path')
@@ -100,14 +101,16 @@ def run(self):
 
         # Now perform bespoke interpolation of geometry and velocity data
         # from their respective sources
-        interp_gridded2mali(self, bedmachine_dataset, dst_scrip_file, nProcs,
+        interp_gridded2mali(self, bedmachine_dataset, dst_scrip_file,
+                            parallel_executable, nProcs,
                             self.mesh_filename, src_proj, variables="all")
 
         # only interpolate a subset of MEaSUREs variables onto the MALI mesh
         measures_vars = ['observedSurfaceVelocityX',
                          'observedSurfaceVelocityY',
                          'observedSurfaceVelocityUncertainty']
-        interp_gridded2mali(self, measures_dataset, dst_scrip_file, nProcs,
+        interp_gridded2mali(self, measures_dataset, dst_scrip_file,
+                            parallel_executable, nProcs,
                             self.mesh_filename, src_proj,
                             variables=measures_vars)