graph_target default is None

Author: cbegeman

polaris/ocean/convergence/forward.py

@@ -21,7 +21,7 @@ class ConvergenceForward(OceanModelStep):
 
     def __init__(self, component, name, subdir, resolution, mesh, init,
                  package, yaml_filename='forward.yaml', options=None,
-                 graph_target='graph.info', output_filename='output.nc',
+                 graph_target=None, output_filename='output.nc',
                  validate_vars=None):
         """
         Create a new step

polaris/ocean/ice_shelf/__init__.py

@@ -50,7 +50,7 @@ def __init__(self, component, min_resolution, name, subdir, sshdir=None):
         self.component = component
         self.min_resolution = min_resolution
 
-    def setup_ssh_adjustment_steps(self, mesh_filename, graph_filename,
+    def setup_ssh_adjustment_steps(self, mesh_filename, graph_target,
                                    init_filename, config, config_filename,
                                    ForwardStep, package=None,
                                    yaml_filename='ssh_forward.yaml',
@@ -67,7 +67,7 @@ def setup_ssh_adjustment_steps(self, mesh_filename, graph_filename,
         mesh_filename : str
             the mesh filename (relative to the base work directory)
 
-        graph_filename : str
+        graph_target: str
             the graph filename (relative to the base work directory)
 
         init_filename : str
@@ -114,7 +114,7 @@ def setup_ssh_adjustment_steps(self, mesh_filename, graph_filename,
             else:
                 ssh_forward = ForwardStep(
                     component=component, min_resolution=min_resolution,
-                    indir=indir, graph_target=graph_filename,
+                    indir=indir, graph_target=graph_target,
                     init_filename=current_init_filename, name=name,
                     package=package, yaml_filename=yaml_filename,
                     yaml_replacements=yaml_replacements)

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_target='graph.info'):
+                 mesh_filename=None, partition_graph=True, graph_target=None):
         """
         Make a step for running the model
 
@@ -84,9 +83,12 @@ def __init__(self, component, name, subdir=None, indir=None, ntasks=None,
             If so, the partitioning executable is taken from the ``partition``
             option of the ``[executables]`` config section.
 
-        graph_filename : str, optional
+        graph_target : str, optional
             The name of the graph file to partition
         """
+        if graph_target is None:
+            self.make_graph = True
+
         super().__init__(
             component=component, name=name, subdir=subdir, indir=indir,
             ntasks=ntasks, min_tasks=min_tasks, openmp_threads=openmp_threads,

polaris/ocean/tasks/ice_shelf_2d/default/__init__.py

@@ -73,7 +73,7 @@ def __init__(self, component, resolution, indir, init, config,
 
         last_adjust_step = self.setup_ssh_adjustment_steps(
             mesh_filename=f'{init.path}/culled_mesh.nc',
-            graph_filename=f'{init.path}/culled_graph.info',
+            graph_target=f'{init.path}/culled_graph.info',
             init_filename=f'{init.path}/output.nc',
             config=config, config_filename='ice_shelf_2d.cfg',
             ForwardStep=SshForward,

polaris/ocean/tasks/internal_wave/default/__init__.py

@@ -32,8 +32,8 @@ def __init__(self, component, indir, init, vadv_method='standard'):
         self.add_step(init, symlink='init')
 
         self.add_step(
-            Forward(component=component, indir=self.subdir, ntasks=None,
-                    min_tasks=None, openmp_threads=1,
+            Forward(component=component, init=init, indir=self.subdir,
+                    ntasks=None, min_tasks=None, openmp_threads=1,
                     run_time_steps=3, vadv_method=vadv_method))
 
         self.add_step(

polaris/ocean/tasks/internal_wave/forward.py

@@ -14,9 +14,9 @@ class Forward(OceanModelStep):
     run_time_steps : int or None
         Number of time steps to run for
     """
-    def __init__(self, component, name='forward', subdir=None, indir=None,
-                 ntasks=None, min_tasks=None, openmp_threads=1, nu=None,
-                 run_time_steps=None, vadv_method='standard'):
+    def __init__(self, component, init, name='forward', subdir=None,
+                 indir=None, ntasks=None, min_tasks=None, openmp_threads=1,
+                 nu=None, run_time_steps=None, vadv_method='standard'):
         """
         Create a new test case
 
@@ -28,9 +28,12 @@ def __init__(self, component, name='forward', subdir=None, indir=None,
         name : str
             the name of the task
 
+        init : polaris.Step
+            the initial state step
+
         subdir : str, optional
             the subdirectory for the step.  If neither this nor ``indir``
-             are provided, the directory is the ``name``
+            are provided, the directory is the ``name``
 
         indir : str, optional
             the directory the step is in, to which ``name`` will be appended
@@ -59,16 +62,14 @@ def __init__(self, component, name='forward', subdir=None, indir=None,
         self.run_time_steps = run_time_steps
         super().__init__(component=component, name=name, subdir=subdir,
                          indir=indir, ntasks=ntasks, min_tasks=min_tasks,
-                         openmp_threads=openmp_threads)
+                         openmp_threads=openmp_threads,
+                         graph_target=f'{init.path}/culled_graph.info')
 
         # make sure output is double precision
         self.add_yaml_file('polaris.ocean.config', 'output.yaml')
 
         self.add_input_file(filename='initial_state.nc',
-                            target='../../../init/initial_state.nc')
-
-        self.add_input_file(filename='graph.info',
-                            target='../../../init/culled_graph.info')
+                            target=f'{init.path}/initial_state.nc')
 
         self.add_yaml_file('polaris.ocean.tasks.internal_wave',
                            'forward.yaml')

polaris/ocean/tasks/internal_wave/rpe/__init__.py

@@ -44,6 +44,7 @@ def __init__(self, component, indir, init, config, vadv_method='standard'):
         # brings in to set up the steps
         self.set_shared_config(config, link='internal_wave.cfg')
         self.add_step(init, symlink='init')
+        self.init = init
         self._add_rpe_and_analysis_steps()
 
     def configure(self):
@@ -70,9 +71,9 @@ def _add_rpe_and_analysis_steps(self):
         for nu in nus:
             name = f'nu_{nu:g}'
             step = Forward(
-                component=component, name=name, indir=self.subdir,
-                ntasks=None, min_tasks=None, openmp_threads=1,
-                nu=nu, vadv_method=self.vadv_method)
+                component=component, name=name, init=self.init,
+                indir=self.subdir, ntasks=None, min_tasks=None,
+                openmp_threads=1, nu=nu, vadv_method=self.vadv_method)
 
             step.add_yaml_file(
                 'polaris.ocean.tasks.internal_wave.rpe',