Merge pull request #384 from xylar/fix-omega-manufatured-solution

xylar · web-flow · commit bcd1660ac620 · 2025-11-07T18:01:10.000+01:00
Fix `omega_pr` test suite
diff --git a/docs/developers_guide/quick_start.md b/docs/developers_guide/quick_start.md
@@ -493,8 +493,13 @@ Otherwise, to build Omega,
 source ./load_<env_name>_<machine>_<compiler>_<mpi>.sh
 git submodule update --init e3sm_submodules/Omega
 cd e3sm_submodules/Omega
-git submodule update --init --recursive externals/YAKL externals/ekat \
-    externals/scorpio cime
+git submodule update --init --recursive \
+    externals/YAKL \
+    externals/ekat \
+    externals/scorpio \
+    externals/cpptrace \
+    components/omega/external \
+    cime
 cd components/omega
 mkdir build
 cd build
diff --git a/e3sm_submodules/Omega b/e3sm_submodules/Omega
@@ -1 +1 @@
-Subproject commit e6424413d12838df273b4befded8edceff228ce7
+Subproject commit 209776a6294ce90a5c87d0c0026f7a9965797e1d
diff --git a/polaris/ocean/model/mpaso_to_omega.yaml b/polaris/ocean/model/mpaso_to_omega.yaml
@@ -3,14 +3,26 @@ dimensions:
   nCells: NCells
   nEdges: NEdges
   nVertices: NVertices
+  nTracers: NTracers
   maxEdges: MaxEdges
   maxEdges2: MaxEdges2
   TWO: MaxCellsOnEdge
   vertexDegree: VertexDegree
-  nVertLevels: NVertLevels
-  nVertLevelsP1: NVertLevelsP1
+  # Don't map nVertLevels yet -- needs Omega fix
+  # nVertLevels: NVertLayers
+  # nVertLevelsP1: NVertLayersP1
 
 variables:
+  # mesh
+  cellsOnCell: CellsOnCell
+  edgesOnCell: EdgesOnCell
+  verticesOnCell: VerticesOnCell
+  cellsOnEdge: CellsOnEdge
+  edgesOnEdge: EdgesOnEdge
+  verticesOnEdge: VerticesOnEdge
+  cellsOnVertex: CellsOnVertex
+  edgesOnVertex: EdgesOnVertex
+
   # tracers
   temperature: Temperature
   salinity: Salinity
@@ -23,7 +35,10 @@ variables:
   normalVelocity: NormalVelocity
 
   # auxiliary state
-  ssh: SshCellDefault
+  ssh: SshCell
+  windStressZonal: WindStressZonal
+  windStressMeridional: WindStressMeridional
+  relativeVorticity: RelVortVertex
 
 config:
 - section:
@@ -67,6 +82,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:
diff --git a/polaris/suites/ocean/omega_pr.txt b/polaris/suites/ocean/omega_pr.txt
@@ -1,4 +1,6 @@
 ocean/planar/manufactured_solution/convergence_both/default
+ocean/planar/manufactured_solution/convergence_both/del2
+ocean/planar/manufactured_solution/convergence_both/del4
 ocean/spherical/icos/rotation_2d
 ocean/spherical/icos/cosine_bell/decomp
 ocean/spherical/icos/cosine_bell/restart
diff --git a/polaris/tasks/ocean/barotropic_gyre/forward.yaml b/polaris/tasks/ocean/barotropic_gyre/forward.yaml
@@ -48,5 +48,3 @@ Omega:
   Tendencies:
     VelDiffTendencyEnable: true
     VelHyperDiffTendencyEnable: false
-  Dimension:
-    NVertLevels: 1
diff --git a/polaris/tasks/ocean/cosine_bell/forward.yaml b/polaris/tasks/ocean/cosine_bell/forward.yaml
@@ -79,9 +79,9 @@ Omega:
     TracerHorzAdvTendencyEnable : true
     TracerDiffTendencyEnable : false
     TracerHyperDiffTendencyEnable : false
-  Dimension:
-    NVertLevels: 1
   IOStreams:
+    InitialVertCoord:
+      Filename: init.nc
     InitialState:
       Filename: init.nc
       Contents:
diff --git a/polaris/tasks/ocean/cosine_bell/restart/forward.yaml b/polaris/tasks/ocean/cosine_bell/restart/forward.yaml
@@ -19,6 +19,8 @@ mpas-ocean:
 
 Omega:
   IOStreams:
+    InitialVertCoord:
+      Filename: init.nc
     InitialState:
       FreqUnits: {{ init_freq_units }}
     RestartRead:
diff --git a/polaris/tasks/ocean/manufactured_solution/forward.yaml b/polaris/tasks/ocean/manufactured_solution/forward.yaml
@@ -5,16 +5,16 @@ ocean:
   time_integration:
     config_dt: {{ dt }}
     config_time_integrator: {{ time_integrator }}
+  hmix_del2:
+    config_mom_del2: 1.5e6
+  hmix_del4:
+    config_mom_del4: 5.e13
 
 mpas-ocean:
   bottom_drag:
     config_bottom_drag_mode: implicit
     config_implicit_bottom_drag_type: constant
     config_implicit_constant_bottom_drag_coeff: 0.0
-  hmix_del2:
-    config_mom_del2: 1.5e6
-  hmix_del4:
-    config_mom_del4: 5.e13
   manufactured_solution:
      config_use_manufactured_solution: true
   debug:
@@ -44,9 +44,9 @@ Omega:
     VelHyperDiffTendencyEnable: false
     UseCustomTendency: true
     ManufacturedSolutionTendency: true
-  Dimension:
-    NVertLevels: 1
   IOStreams:
+    InitialVertCoord:
+      Filename: init.nc
     InitialState:
       UsePointerFile: false
       Filename: init.nc
@@ -64,4 +64,4 @@ Omega:
       Contents:
       - NormalVelocity
       - LayerThickness
-      - SshCellDefault
+      - SshCell
diff --git a/polaris/tasks/ocean/sphere_transport/forward.yaml b/polaris/tasks/ocean/sphere_transport/forward.yaml
@@ -71,9 +71,9 @@ Omega:
     TracerHorzAdvTendencyEnable : true
     TracerDiffTendencyEnable : false
     TracerHyperDiffTendencyEnable : false
-  Dimension:
-    NVertLevels: 1
   IOStreams:
+    InitialVertCoord:
+      Filename: init.nc
     InitialState:
       Filename: init.nc
       Contents:
