From 61d239931be8be074fd22046e43d58c7530a99bc Mon Sep 17 00:00:00 2001 From: Carolyn Begeman Date: Mon, 26 Jan 2026 16:31:06 -0600 Subject: [PATCH 1/4] Fixup omega suite --- polaris/suites/ocean/omega.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/polaris/suites/ocean/omega.txt b/polaris/suites/ocean/omega.txt index 7415a947c8..31bce57e29 100644 --- a/polaris/suites/ocean/omega.txt +++ b/polaris/suites/ocean/omega.txt @@ -2,9 +2,15 @@ ocean/planar/manufactured_solution/convergence_both/default ocean/planar/manufactured_solution/convergence_both/del2 ocean/planar/manufactured_solution/convergence_both/del4 ocean/planar/barotropic_gyre/munk/free-slip +ocean/spherical/qu/rotation_2d ocean/spherical/icos/rotation_2d -ocean/spherical/icos/nondivergent_2d -ocean/spherical/icos/divergent_2d -ocean/spherical/icos/correlated_tracers_2d ocean/spherical/icos/cosine_bell/decomp ocean/spherical/icos/cosine_bell/restart + +# Supported but fails +#ocean/planar/barotropic_channel/default + +# Supported but expected to fail until higher-order advection is available +#ocean/spherical/icos/nondivergent_2d +#ocean/spherical/icos/divergent_2d +#ocean/spherical/icos/correlated_tracers_2d From 0b62007fc41118877a329f53edfab5d6a62b8e80 Mon Sep 17 00:00:00 2001 From: Carolyn Begeman Date: Mon, 26 Jan 2026 16:31:46 -0600 Subject: [PATCH 2/4] Remove finest qu,icos meshes from convergence tests --- polaris/ocean/convergence/spherical/spherical.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/polaris/ocean/convergence/spherical/spherical.cfg b/polaris/ocean/convergence/spherical/spherical.cfg index cb4b8d4fdd..0c7f3a64d9 100644 --- a/polaris/ocean/convergence/spherical/spherical.cfg +++ b/polaris/ocean/convergence/spherical/spherical.cfg @@ -6,7 +6,7 @@ icos_base_resolution = 60. # The factors by which to scale space or time based on icos_base_resolution -icos_refinement_factors_space = 8., 4., 2., 1. +icos_refinement_factors_space = 8., 4., 2. icos_refinement_factors_time = 1., 0.5, 0.25 # The base resolution for the quasi-uniform mesh to which the refinement @@ -14,5 +14,5 @@ icos_refinement_factors_time = 1., 0.5, 0.25 qu_base_resolution = 120. # The factors by which to scale space or time based on qu_base_resolution -qu_refinement_factors_space = 2., 1.75, 1.5, 1.25, 1., 0.75, 0.5 +qu_refinement_factors_space = 2., 1.75, 1.5, 1.25, 1., 0.75 qu_refinement_factors_time = 1., 0.5, 0.25 From af161cb2f4dce63ae4b63e7ce6b94df994386de3 Mon Sep 17 00:00:00 2001 From: Carolyn Begeman Date: Tue, 27 Jan 2026 13:32:22 -0600 Subject: [PATCH 3/4] Revise rotation_2d convergence thresholds for qu mesh --- polaris/tasks/ocean/sphere_transport/rotation_2d.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/polaris/tasks/ocean/sphere_transport/rotation_2d.cfg b/polaris/tasks/ocean/sphere_transport/rotation_2d.cfg index d4b99a081c..f63cd5310b 100644 --- a/polaris/tasks/ocean/sphere_transport/rotation_2d.cfg +++ b/polaris/tasks/ocean/sphere_transport/rotation_2d.cfg @@ -10,6 +10,6 @@ convergence_thresh_tracer2_order3 = 2.0 convergence_thresh_tracer3_order3 = 0.4 # convergence threshold below which the test fails for order 2 -convergence_thresh_tracer1_order2 = 1.0 -convergence_thresh_tracer2_order2 = 1.6 +convergence_thresh_tracer1_order2 = 0.6 +convergence_thresh_tracer2_order2 = 1.4 convergence_thresh_tracer3_order2 = 0.3 From d7474830eff12a2596fe2a98a7d9a5a5c44bddbd Mon Sep 17 00:00:00 2001 From: Carolyn Begeman Date: Tue, 27 Jan 2026 15:15:36 -0600 Subject: [PATCH 4/4] Rename pr, nightly suites --- polaris/suites/ocean/{nightly.txt => mpaso_nightly.txt} | 0 polaris/suites/ocean/{pr.txt => mpaso_pr.txt} | 0 polaris/suites/ocean/{omega.txt => omega_nightly.txt} | 2 +- polaris/suites/ocean/omega_pr.txt | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) rename polaris/suites/ocean/{nightly.txt => mpaso_nightly.txt} (100%) rename polaris/suites/ocean/{pr.txt => mpaso_pr.txt} (100%) rename polaris/suites/ocean/{omega.txt => omega_nightly.txt} (100%) diff --git a/polaris/suites/ocean/nightly.txt b/polaris/suites/ocean/mpaso_nightly.txt similarity index 100% rename from polaris/suites/ocean/nightly.txt rename to polaris/suites/ocean/mpaso_nightly.txt diff --git a/polaris/suites/ocean/pr.txt b/polaris/suites/ocean/mpaso_pr.txt similarity index 100% rename from polaris/suites/ocean/pr.txt rename to polaris/suites/ocean/mpaso_pr.txt diff --git a/polaris/suites/ocean/omega.txt b/polaris/suites/ocean/omega_nightly.txt similarity index 100% rename from polaris/suites/ocean/omega.txt rename to polaris/suites/ocean/omega_nightly.txt index 31bce57e29..a405b07c26 100644 --- a/polaris/suites/ocean/omega.txt +++ b/polaris/suites/ocean/omega_nightly.txt @@ -1,7 +1,7 @@ +ocean/planar/barotropic_gyre/munk/free-slip ocean/planar/manufactured_solution/convergence_both/default ocean/planar/manufactured_solution/convergence_both/del2 ocean/planar/manufactured_solution/convergence_both/del4 -ocean/planar/barotropic_gyre/munk/free-slip ocean/spherical/qu/rotation_2d ocean/spherical/icos/rotation_2d ocean/spherical/icos/cosine_bell/decomp diff --git a/polaris/suites/ocean/omega_pr.txt b/polaris/suites/ocean/omega_pr.txt index 248c378bbf..53c12f0d0d 100644 --- a/polaris/suites/ocean/omega_pr.txt +++ b/polaris/suites/ocean/omega_pr.txt @@ -3,6 +3,7 @@ ocean/planar/barotropic_gyre/munk/free-slip ocean/planar/manufactured_solution/convergence_both/default ocean/planar/manufactured_solution/convergence_both/del2 ocean/planar/manufactured_solution/convergence_both/del4 +ocean/spherical/qu/rotation_2d ocean/spherical/icos/rotation_2d ocean/spherical/icos/cosine_bell/decomp ocean/spherical/icos/cosine_bell/restart