clean-up input files for omega and mpaso

Author: cbegeman

polaris/tasks/ocean/realistic_global/__init__.py

@@ -13,16 +13,17 @@ def add_realistic_global_tasks(component):
     component : polaris.tasks.ocean.Ocean
         The ocean component to which the tasks will be added.
     """
-    subdir = 'spherical/realistic_global'
-    config_filename = 'analysis_members.cfg'
-    for mesh in ['oQU240km']:
-        filepath = f'{subdir}/analysis_members/{config_filename}'
+    config_filename = 'realistic_global.cfg'
+    for mesh_name, mesh_id in [('QU240km', 151209), ('EC30to60E2r2', 200908)]:
+        subdir = f'spherical/realistic_global/{mesh_name}'
+        filepath = f'{subdir}/{config_filename}'
         config = PolarisConfigParser(filepath=filepath)
         component.add_task(
             AnalysisMembers(
                 component=component,
                 subdir=subdir,
-                mesh_name=mesh,
+                mesh_name=mesh_name,
+                mesh_id=mesh_id,
                 config=config,
                 config_filename=config_filename,
             )

polaris/tasks/ocean/realistic_global/analysis_members/__init__.py

@@ -19,6 +19,7 @@ def __init__(
         component,
         subdir,
         mesh_name,
+        mesh_id,
         config,
         config_filename,
     ):
@@ -56,10 +57,8 @@ def __init__(
             component=component,
             package=package,
             indir=subdir,
-            name=f'{mesh_name}_forward',
-            mesh_filename='ocean.QU.240km.151209.omega.teos10eos.nc',
-            init_filename='ocean.QU.240km.151209.omega.teos10eos.nc',
-            output_filename='output.nc',
+            mesh_name=mesh_name,
+            mesh_id=mesh_id,
             replacements=replacements,
             resolution_for_cell_count=240,
         )

polaris/tasks/ocean/realistic_global/forward.py

@@ -11,14 +11,13 @@ def __init__(
         self,
         component,
         package,
+        mesh_name,
+        mesh_id,
         name='forward',
         indir=None,
         subdir=None,
         update_eos=False,
         yaml_filename='forward.yaml',
-        mesh_filename='mesh.nc',
-        init_filename='init.nc',
-        graph_filename='culled_graph.info',
         output_filename='output.nc',
         ntasks=None,
         min_tasks=None,
@@ -52,18 +51,15 @@ def __init__(
             min_tasks=min_tasks,
             update_eos=update_eos,
             openmp_threads=1,
-            graph_target=graph_filename,
+            graph_target='graph.info',
         )
-        self.mesh_filename = mesh_filename
-        self.init_filename = init_filename
-        self.graph_filename = graph_filename
+        self.mesh_filename = f'{mesh_name}.{mesh_id}'
+        self.graph_filename = f'graph.info.{mesh_id}'
         self.resolution = resolution_for_cell_count
+
         # make sure output is double precision
         self.add_yaml_file('polaris.ocean.config', 'output.yaml')
 
-        # this is set in the yaml file
-        # self.add_yaml_file('polaris.ocean.eos', 'teos10.yaml')
-
         self.add_yaml_file(
             package,
             yaml_filename,
@@ -91,16 +87,20 @@ def setup(self):
         config = self.config
         model = config.get('ocean', 'model')
         # TODO: remove as soon as Omega no longer hard-codes this file
+        input_filename = f'ocean.{self.mesh_filename}'
         if model == 'omega':
+            # TODO eos_type = self.config.get('ocean', 'eos_type')
+            eos_type = 'teos10'
+            input_filename = f'{input_filename}.{eos_type}.nc'
             self.add_input_file(
-                target=self.mesh_filename,
+                target=input_filename,
                 filename='OmegaMesh.nc',
-                database='realistic_global',
+                database=f'realistic_global/{model}',
             )
             self.add_input_file(
-                target=self.init_filename,
+                target=input_filename,
                 filename='init.nc',
-                database='realistic_global',
+                database=f'realistic_global/{model}',
             )
             # TODO we need to add this file to input database if we want to
             # reconstruct zonal, meridional components before Omega has those
@@ -112,9 +112,9 @@ def setup(self):
             # )
         else:
             self.add_input_file(
-                target='culled_graph.info',
-                filename=self.graph_filename,
-                database='realistic_global',
+                target=self.graph_filename,
+                filename='graph.info',
+                database=f'realistic_global/{model}',
             )
 
     def compute_cell_count(self):

polaris/tasks/ocean/realistic_global/forward.yaml

@@ -7,6 +7,35 @@ ocean:
   forcing:
     config_use_bulk_wind_stress: true
 
+mpas-ocean:
+  streams:
+    mesh:
+      filename_template: init.nc
+    input:
+      filename_template: init.nc
+    forcing:
+      filename_template: init.nc
+      input_interval: initial_only
+      type: input
+      contents:
+      - windStressZonal
+      - windStressMeridional
+    restart:
+      output_interval: {{ run_duration }}
+    output:
+      type: output
+      filename_template: output.nc
+      output_interval: {{ output_interval }}
+      clobber_mode: truncate
+      reference_time: 0001-01-01_00:00:00
+      contents:
+      - tracers
+      - xtime
+      - normalVelocity
+      - layerThickness
+      - kineticEnergyCell
+      - relativeVorticityCell
+
 Omega:
   TimeIntegration:
     TimeStepper: RungeKutta4
@@ -22,7 +51,6 @@ Omega:
       Contents:
         - State
         - Tracers
-        - Tracers
         - WindStressZonal
         - WindStressMeridional
     History:
@@ -34,9 +62,10 @@ Omega:
       FileFreq: 9999
       FileFreqUnits: years
       Contents:
+        - State
+        - AuxiliaryState
         - Tracers
         - PseudoThickness
-        - NormalVelocity
         - SshCell
         - KineticEnergyCell
         - Eos

polaris/tasks/ocean/realistic_global/realistic_global.cfg

@@ -0,0 +1,9 @@
+[ocean]
+
+# Equation of state type
+eos_type = teos10
+
+[realistic_global]
+
+# Time step duration per kilometer [s]
+dt_per_km = 3.0