Fixup rebase with convergence changes

Author: cbegeman

polaris/ocean/convergence/forward.py

@@ -88,7 +88,7 @@ def __init__(self, component, name, subdir, refinement_factor, mesh, init,
                                               config_model=config_model)
 
         self.add_input_file(
-            filename=init_filename,
+            filename='init.nc',
             work_dir_target=f'{init.path}/initial_state.nc')
 
         if forcing:

polaris/ocean/tasks/drying_slope/convergence/__init__.py

@@ -4,6 +4,7 @@
 
 from polaris import Step, Task
 from polaris.config import PolarisConfigParser
+from polaris.ocean.convergence import get_resolution_for_task
 from polaris.ocean.resolution import resolution_to_subdir
 from polaris.ocean.tasks.drying_slope.convergence.analysis import Analysis
 from polaris.ocean.tasks.drying_slope.convergence.forward import Forward
@@ -57,12 +58,13 @@ def __init__(self, component, subdir, group_dir, config,
         super().__init__(component=component, name=name, subdir=subdir)
 
         self.damping_coeffs = []
-        self.resolutions = config.getlist('drying_slope_convergence',
-                                          'resolutions', dtype=float)
-
         analysis_dependencies: Dict[str, Dict[float, Step]] = (
             dict(mesh=dict(), init=dict(), forward=dict()))
-        for resolution in self.resolutions:
+        refinement_factors = config.getlist(
+            'convergence', 'refinement_factors_space', dtype=float)
+        for refinement_factor in refinement_factors:
+            resolution = get_resolution_for_task(
+                config, refinement_factor, refinement='both')
             mesh_name = resolution_to_subdir(resolution)
             init_dir = f'{group_dir}/barotropic/{mesh_name}/init'
             if init_dir in component.steps:
@@ -85,7 +87,7 @@ def __init__(self, component, subdir, group_dir, config,
             else:
                 forward_step = Forward(component=component,
                                        name=f'{step_name}_{mesh_name}',
-                                       resolution=resolution,
+                                       refinement_factor=refinement_factor,
                                        subdir=forward_dir,
                                        init=init_step,
                                        damping_coeff=damping_coeff,
@@ -98,7 +100,6 @@ def __init__(self, component, subdir, group_dir, config,
 
         self.add_step(Analysis(
             component=component,
-            resolutions=self.resolutions,
             subdir=f'{subdir}/analysis',
             damping_coeff=damping_coeff,
             dependencies=analysis_dependencies))

polaris/ocean/tasks/drying_slope/convergence/analysis.py

@@ -3,7 +3,7 @@
 import xarray as xr
 from scipy.interpolate import interp1d
 
-from polaris.ocean.convergence import ConvergenceAnalysis
+from polaris.ocean.convergence.analysis import ConvergenceAnalysis
 
 
 class Analysis(ConvergenceAnalysis):
@@ -16,7 +16,7 @@ class Analysis(ConvergenceAnalysis):
     damping_coeff : float
         The Rayleigh damping coefficient used for the forward runs
     """
-    def __init__(self, component, resolutions, subdir, dependencies,
+    def __init__(self, component, subdir, dependencies,
                  damping_coeff):
         """
         Create the step
@@ -26,9 +26,6 @@ def __init__(self, component, resolutions, subdir, dependencies,
         component : polaris.Component
             The component the step belongs to
 
-        resolutions : list of float
-            The resolutions of the meshes that have been run
-
         subdir : str
             The subdirectory that the step resides in
 
@@ -43,7 +40,6 @@ def __init__(self, component, resolutions, subdir, dependencies,
                              'title': 'SSH',
                              'zidx': None}]
         super().__init__(component=component, subdir=subdir,
-                         resolutions=resolutions,
                          dependencies=dependencies,
                          convergence_vars=convergence_vars)
 

polaris/ocean/tasks/drying_slope/convergence/forward.py

@@ -1,7 +1,8 @@
 import time
 
 from polaris.mesh.planar import compute_planar_hex_nx_ny
-from polaris.ocean.convergence import ConvergenceForward
+from polaris.ocean.convergence import get_resolution_for_task
+from polaris.ocean.convergence.forward import ConvergenceForward
 
 
 class Forward(ConvergenceForward):
@@ -14,8 +15,8 @@ class Forward(ConvergenceForward):
     resolution : float
         The resolution of the test case in km
     """
-    def __init__(self, component, name, resolution, subdir, init,
-                 damping_coeff, coord_type, method,
+    def __init__(self, component, name, refinement_factor, subdir, init,
+                 damping_coeff, coord_type, method, refinement='both',
                  drag_type='constant_and_rayleigh'):
         """
         Create a new test case
@@ -25,9 +26,6 @@ def __init__(self, component, name, resolution, subdir, init,
         component : polaris.Component
             The component the step belongs to
 
-        resolution : km
-            The resolution of the test case in km
-
         subdir : str
             The subdirectory that the step belongs to
 
@@ -67,14 +65,16 @@ def __init__(self, component, name, resolution, subdir, init,
         options['config_tidal_forcing_model'] = 'monochromatic'
         super().__init__(component=component,
                          name=name, subdir=subdir,
-                         resolution=resolution, mesh=init, init=init,
+                         refinement_factor=refinement_factor,
+                         mesh=init, init=init,
                          package='polaris.ocean.tasks.drying_slope',
                          yaml_filename='forward.yaml',
-                         init_filename='initial_state.nc',
-                         graph_filename='culled_graph.info',
+                         graph_target=f'{init.path}/culled_graph.info',
                          output_filename='output.nc',
                          forcing=True, options=options,
                          validate_vars=['layerThickness', 'normalVelocity'])
+        self.resolution = get_resolution_for_task(
+            self.config, self.refinement_factor, refinement=self.refinement)
 
     def compute_cell_count(self):
         """

polaris/ocean/tasks/drying_slope/drying_slope.cfg

@@ -110,12 +110,6 @@ manning_coefficient = 5.0e-2
 # thickness
 min_column_thickness = 0.05
 
-# config options for drying slope convergence task
-[drying_slope_convergence]
-
-# horizontal resolutions in km
-resolutions = 0.25, 0.5, 1, 2
-
 [convergence]
 
 # Evaluation time for convergence analysis (in hours)
@@ -127,6 +121,13 @@ convergence_thresh = -0.527
 # Type of error to compute
 error_type = l2
 
+# the base mesh resolution (km) to which refinement_factors
+# are applied if refinement is 'space' or 'both' on a planar mesh
+base_resolution = 0.5
+
+# refinement factors for a planar mesh applied to either space or time
+refinement_factors_space = 4., 2., 1., 0.5
+
 # config options for convergence forward steps
 [convergence_forward]