Add Omega IOStreams to convergence and manufactured_solution

Author: xylar

polaris/ocean/convergence/forward.py

@@ -138,12 +138,16 @@ def dynamic_model_config(self, at_setup):
         output_interval_str = get_time_interval_string(
             seconds=output_interval * s_per_hour)
 
+        # For Omega, we want the output interval as a number of seconds
+        output_freq = int(output_interval * s_per_hour)
+
         replacements = dict(
             time_integrator=time_integrator,
             dt=dt_str,
             btr_dt=btr_dt_str,
             run_duration=run_duration_str,
             output_interval=output_interval_str,
+            output_freq=f'{output_freq}'
         )
 
         self.add_yaml_file(self.package, self.yaml_filename,

polaris/ocean/tasks/manufactured_solution/forward.py

@@ -44,17 +44,6 @@ def __init__(self, component, name, resolution, subdir, init):
                          output_filename='output.nc',
                          validate_vars=['layerThickness', 'normalVelocity'])
 
-    def setup(self):
-        """
-        TEMP: symlink initial condition to name hard-coded in Omega
-        """
-        super().setup()
-        config = self.config
-        model = config.get('ocean', 'model')
-        # TODO: remove as soon as Omega supports I/O streams
-        if model == 'omega':
-            self.add_input_file(filename='OmegaMesh.nc', target='init.nc')
-
     def compute_cell_count(self):
         """
         Compute the approximate number of cells in the mesh, used to constrain

polaris/ocean/tasks/manufactured_solution/forward.yaml

@@ -36,5 +36,25 @@ Omega:
   Tendencies:
     VelDiffTendencyEnable: false
     VelHyperDiffTendencyEnable: false
-  Dimension:
-    NVertLevels: 1
+  IOStreams:
+    InitialState:
+      UsePointerFile: false
+      Filename: init.nc
+      Mode: read
+      Precision: double
+      Freq: 1
+      FreqUnits: OnStartup
+      UseStartEnd: false
+      Contents:
+        - Restart
+    History:
+      UsePointerFile: false
+      Filename: output.nc
+      Mode: write
+      IfExists: replace
+      Precision: double
+      Freq: {{ output_freq }}
+      FreqUnits: Seconds
+      UseStartEnd: false
+      Contents:
+        - Tracers