Add Omega forcing to initial state, uodate namelist and streams

Author: cbegeman

polaris/ocean/model/mpaso_to_omega.yaml

@@ -67,6 +67,21 @@ config:
     config_use_mom_del4: VelHyperDiffTendencyEnable
     config_mom_del4: ViscDel4
 
+- section:
+    forcing: Tendencies
+  options:
+    config_use_bulk_wind_stress: WindForcingTendencyEnable
+
+- section:
+    debug: Tendencies
+  options:
+    config_disable_vel_explicit_bottom_drag: BottomDragTendencyEnable
+
+- section:
+    bottom_drag: Tendencies
+  options:
+    config_explicit_bottom_drag_coeff: BottomDragCoeff
+
 - section:
     manufactured_solution: ManufacturedSolution
   options:

polaris/tasks/ocean/barotropic_gyre/forward.py

@@ -88,7 +88,6 @@ def __init__(
         self.add_yaml_file('polaris.ocean.config', 'output.yaml')
 
         self.add_input_file(filename='init.nc', target='../init/init.nc')
-        self.add_input_file(filename='forcing.nc', target='../init/forcing.nc')
 
         self.add_output_file(
             filename='output.nc',
@@ -150,6 +149,7 @@ def dynamic_model_config(self, at_setup):
 
         if self.run_time_steps is not None:
             output_frequency_units = 'seconds'
+            output_frequency = '12'
             run_duration = ceil(self.run_time_steps * dt)
             stop_time_str = time.strftime(
                 '0001-01-01_%H:%M:%S', time.gmtime(run_duration)
@@ -170,9 +170,11 @@ def dynamic_model_config(self, at_setup):
             if time_integrator in time_integrator_map.keys():
                 time_integrator = time_integrator_map[time_integrator]
             else:
-                print('Warning: mapping from time integrator '
-                      f'{time_integrator} to omega not found, '
-                      'retaining name given in config')
+                print(
+                    'Warning: mapping from time integrator '
+                    f'{time_integrator} to omega not found, '
+                    'retaining name given in config'
+                )
 
         replacements = dict(
             dt=dt_str,

polaris/tasks/ocean/barotropic_gyre/forward.yaml

@@ -12,16 +12,21 @@ ocean:
     config_mom_del2: {{ nu }}
   hmix_del4:
     config_use_mom_del4: false
+  forcing:
+    config_use_bulk_wind_stress: true
+  bottom_drag:
+    config_explicit_bottom_drag_coeff: 0.001
+  debug:
+    config_disable_vel_explicit_bottom_drag: false
 
 mpas-ocean:
   run_modes:
     config_ocean_run_mode: forward
   decomposition:
     config_block_decomp_file_prefix: graph.info.part.
   bottom_drag:
+    config_bottom_drag_mode: explicit
     config_implicit_constant_bottom_drag_coeff: 0.
-  forcing:
-    config_use_bulk_wind_stress: true
   debug:
     config_disable_vel_hadv: true
     config_disable_vel_hmix: false
@@ -33,7 +38,7 @@ mpas-ocean:
     input:
       filename_template: init.nc
     forcing:
-      filename_template: forcing.nc
+      filename_template: init.nc
       input_interval: initial_only
       type: input
       contents:
@@ -62,19 +67,27 @@ Omega:
     NVertLevels: 1
   IOStreams:
     InitialState:
+      UsePointerFile: false
       Filename: init.nc
+      Mode: read
+      Precision: double
+      Freq: 1
+      FreqUnits: OnStartup
+      UseStartEnd: false
       Contents:
-        - LayerThickness
-        - NormalVelocity
+        - State
+        - WindStressZonal
+        - WindStressMeridional
     History:
+      UsePointerFile: false
       Filename: output.nc
       Freq: {{ output_frequency }}
       FreqUnits: {{ output_frequency_units }}
-      IfExists: append
+      IfExists: replace
       # effectively never
       FileFreq: 9999
       FileFreqUnits: years
+      UseStartEnd: false
       Contents:
-        - LayerThickness
-        - NormalVelocity
-        - SshCellDefault
+        - State
+        - SshCell

polaris/tasks/ocean/barotropic_gyre/init.py

@@ -37,7 +37,6 @@ def __init__(self, component, subdir):
             'base_mesh.nc',
             'culled_mesh.nc',
             'culled_graph.info',
-            'forcing.nc',
         ]:
             self.add_output_file(file)
         self.add_output_file('init.nc', validate_vars=['layerThickness'])
@@ -135,30 +134,27 @@ def run(self):
         normal_velocity = normal_velocity.expand_dims(dim='Time', axis=0)
         ds['normalVelocity'] = normal_velocity
 
-        # write the initial condition file
-        write_netcdf(ds, 'init.nc')
-
         # set the wind stress forcing
-        ds_forcing = xr.Dataset()
         # Convert from km to m
         ly = ly * 1e3
         wind_stress_zonal = -tau_0 * np.cos(
             np.pi * (ds.yCell - ds.yCell.min()) / ly
         )
         wind_stress_meridional = xr.zeros_like(ds.xCell)
-        ds_forcing['windStressZonal'] = wind_stress_zonal.expand_dims(
+        ds['windStressZonal'] = wind_stress_zonal.expand_dims(
             dim='Time', axis=0
         )
-        ds_forcing['windStressMeridional'] = (
-            wind_stress_meridional.expand_dims(dim='Time', axis=0)
+        ds['windStressMeridional'] = wind_stress_meridional.expand_dims(
+            dim='Time', axis=0
         )
-        write_netcdf(ds_forcing, 'forcing.nc')
+        # write the initial condition file
+        write_netcdf(ds, 'init.nc')
 
         cell_mask = ds.maxLevelCell >= 1
 
         plot_horiz_field(
             ds_mesh,
-            ds_forcing['windStressZonal'],
+            ds['windStressZonal'],
             'forcing_wind_stress_zonal.png',
             cmap='cmo.balance',
             show_patch_edges=True,