From 68cb107963abd8f5df6d67ac664c2e81c91ff87c Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Tue, 3 Sep 2024 08:52:15 -0500
Subject: [PATCH] Update manufactured solution for config models

---
 .../tasks/manufactured_solution/forward.py    |  2 +-
 .../tasks/manufactured_solution/forward.yaml  | 25 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/polaris/ocean/tasks/manufactured_solution/forward.py b/polaris/ocean/tasks/manufactured_solution/forward.py
index a82d5a375..9392a9951 100644
--- a/polaris/ocean/tasks/manufactured_solution/forward.py
+++ b/polaris/ocean/tasks/manufactured_solution/forward.py
@@ -81,4 +81,4 @@ def dynamic_model_config(self, at_setup):
                    float(exact_solution.lambda_x),
                    'config_manufactured_solution_wavelength_y':
                    float(exact_solution.lambda_y)}
-        self.add_model_config_options(options)
+        self.add_model_config_options(options, config_model='mpas-ocean')
diff --git a/polaris/ocean/tasks/manufactured_solution/forward.yaml b/polaris/ocean/tasks/manufactured_solution/forward.yaml
index aa40ed4b1..6cbfe3886 100644
--- a/polaris/ocean/tasks/manufactured_solution/forward.yaml
+++ b/polaris/ocean/tasks/manufactured_solution/forward.yaml
@@ -1,17 +1,9 @@
-omega:
+ocean:
   time_management:
     config_run_duration: {{ run_duration }}
   time_integration:
     config_dt: {{ dt }}
     config_time_integrator: {{ time_integrator }}
-  bottom_drag:
-    config_bottom_drag_mode: implicit
-    config_implicit_bottom_drag_type: constant
-    config_implicit_constant_bottom_drag_coeff: 0.0
-  manufactured_solution:
-     config_use_manufactured_solution: true
-  debug:
-    config_disable_vel_hmix: true
   streams:
     mesh:
       filename_template: init.nc
@@ -28,3 +20,18 @@ omega:
       - normalVelocity
       - layerThickness
       - ssh
+
+mpas-ocean:
+  bottom_drag:
+    config_bottom_drag_mode: implicit
+    config_implicit_bottom_drag_type: constant
+    config_implicit_constant_bottom_drag_coeff: 0.0
+  manufactured_solution:
+     config_use_manufactured_solution: true
+  debug:
+    config_disable_vel_hmix: true
+
+omega:
+  Tendencies:
+    VelDiffTendencyEnable: false
+    VelHyperDiffTendencyEnable: false