Remove: move argument to setup

Author: cbegeman

polaris/ocean/convergence/forward.py

@@ -58,7 +58,7 @@ def __init__(self, component, name, subdir, resolution, mesh, init,
             A list of variables to validate against a baseline if requested
         """
         super().__init__(component=component, name=name, subdir=subdir,
-                         openmp_threads=1, graph_filename=graph_filename)
+                         openmp_threads=1)
 
         self.resolution = resolution
         self.package = package
@@ -79,6 +79,9 @@ def __init__(self, component, name, subdir, resolution, mesh, init,
         self.add_output_file(filename=output_filename,
                              validate_vars=validate_vars)
 
+    def setup(self, graph_target='graph.info'):
+        super().setup(graph_target=graph_target)
+
     def compute_cell_count(self):
         """
         Compute the approximate number of cells in the mesh, used to constrain

polaris/ocean/model/ocean_model_step.py

@@ -24,8 +24,7 @@ class OceanModelStep(ModelStep):
     def __init__(self, component, name, subdir=None, indir=None, ntasks=None,
                  min_tasks=None, openmp_threads=None, max_memory=None,
                  cached=False, yaml=None, update_pio=True, make_graph=False,
-                 mesh_filename=None, partition_graph=True,
-                 graph_filename='graph.info'):
+                 mesh_filename=None, partition_graph=True):
         """
         Make a step for running the model
 
@@ -95,12 +94,11 @@ def __init__(self, component, name, subdir=None, indir=None, ntasks=None,
             mesh_filename=mesh_filename, partition_graph=partition_graph,
             graph_filename='graph.info')
 
-        self.graph_target = graph_filename
         self.dynamic_ntasks = (ntasks is None and min_tasks is None)
 
         self.map: Union[None, List[Dict[str, Dict[str, str]]]] = None
 
-    def setup(self):
+    def setup(self, graph_target='graph.info'):
         """
         Determine if we will make yaml files or namelists and streams files,
         then, determine the number of MPI tasks to use based on the estimated

polaris/ocean/tasks/inertial_gravity_wave/forward.py

@@ -37,10 +37,12 @@ def __init__(self, component, name, resolution, subdir, init):
                          resolution=resolution, mesh=init, init=init,
                          package='polaris.ocean.tasks.inertial_gravity_wave',
                          yaml_filename='forward.yaml',
-                         graph_filename='culled_graph.info',
                          output_filename='output.nc',
                          validate_vars=['layerThickness', 'normalVelocity'])
 
+    def setup(self):
+        super().setup(graph_target='culled_graph.info')
+
     def compute_cell_count(self):
         """
         Compute the approximate number of cells in the mesh, used to constrain

polaris/ocean/tasks/manufactured_solution/forward.py

@@ -35,20 +35,20 @@ def __init__(self, component, name, resolution, subdir, init):
         init : polaris.Step
             The step which generates the mesh and initial condition
         """
+        self.init = init
         super().__init__(component=component,
                          name=name, subdir=subdir,
                          resolution=resolution, mesh=init, init=init,
                          package='polaris.ocean.tasks.manufactured_solution',
                          yaml_filename='forward.yaml',
-                         graph_target=f'{init.path}/culled_graph.info',
                          output_filename='output.nc',
                          validate_vars=['layerThickness', 'normalVelocity'])
 
     def setup(self):
         """
         TEMP: symlink initial condition to name hard-coded in Omega
         """
-        super().setup()
+        super().setup(graph_target=f'{self.init.path}/culled_graph.info')
         config = self.config
         model = config.get('ocean', 'model')
         # TODO: remove as soon as Omega supports I/O streams