From 8c312a04bfc349a70cc0d78d30df46657c712192 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 17 Oct 2023 08:41:00 +0200 Subject: [PATCH 1/3] Remove `-s` flag from `polaris suite` in docs --- docs/developers_guide/deploying_spack.md | 6 +++--- docs/users_guide/quick_start.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/developers_guide/deploying_spack.md b/docs/developers_guide/deploying_spack.md index de0b83a06..7308a6dbb 100644 --- a/docs/developers_guide/deploying_spack.md +++ b/docs/developers_guide/deploying_spack.md @@ -293,7 +293,7 @@ git submodule update --init --recursive cd E3SM-Project/components/mpas-ocean # this will build with PIO and OpenMP make ifort -polaris suite -s -c ocean -t pr -p . \ +polaris suite -c ocean -t pr -p . \ -w /lcrc/group/e3sm/ac.xylar/polaris/test_20230202/ocean_pr_chrys_intel_openmpi cd /lcrc/group/e3sm/ac.xylar/polaris/test_20230202/ocean_pr_chrys_intel_openmpi sbatch job_script.pr.bash @@ -311,7 +311,7 @@ cd ../e3sm_chrys_gnu_openmpi git submodule update --init --recursive cd components/mpas-ocean make gfortran -polaris suite -s -c ocean -t pr -p . \ +polaris suite -c ocean -t pr -p . \ -w /lcrc/group/e3sm/ac.xylar/polaris/test_20230202/ocean_pr_chrys_gnu_openmpi cd /lcrc/group/e3sm/ac.xylar/polaris/test_20230202/ocean_pr_chrys_gnu_openmpi sbatch job_script.pr.bash @@ -334,7 +334,7 @@ git submodule update --init --recursive cd MALI-Dev/components/mpas-albany-landice # you need to tell it to build with Albany make ALBANY=true gfortran -polaris suite -s -c landice -t full_integration -p . \ +polaris suite -c landice -t full_integration -p . \ -w /lcrc/group/e3sm/ac.xylar/polaris/test_20230202/landice_full_chrys_gnu_openmpi cd /lcrc/group/e3sm/ac.xylar/polaris/test_20230202/landice_full_chrys_gnu_openmpi sbatch job_script.full_integration.bash diff --git a/docs/users_guide/quick_start.md b/docs/users_guide/quick_start.md index e1acda028..f0111f354 100644 --- a/docs/users_guide/quick_start.md +++ b/docs/users_guide/quick_start.md @@ -432,7 +432,7 @@ Suites: You can set up a suite as follows: ```bash -polaris suite -s -c ocean -t nightly -w -p +polaris suite -c ocean -t nightly -w -p ``` where the details are similar to setting up a case. You can use the same From 5cbb35d60d82306d8ea230f812fe7713a6c70f43 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 17 Oct 2023 08:44:50 +0200 Subject: [PATCH 2/3] Fix Geostrophic API --- docs/developers_guide/ocean/api.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/developers_guide/ocean/api.md b/docs/developers_guide/ocean/api.md index 675973bf7..b4483d1dc 100644 --- a/docs/developers_guide/ocean/api.md +++ b/docs/developers_guide/ocean/api.md @@ -132,8 +132,8 @@ forward.Forward analysis.Analysis - analysis.Analysis.run - analysis.Analysis.compute_rmse + analysis.Analysis.exact_solution + analysis.Analysis.get_output_field viz.VizMap viz.VizMap.run From 4755f3747c46bc5fa88109024bd5f9abfb9bff54 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 17 Oct 2023 08:51:41 +0200 Subject: [PATCH 3/3] Fix incomplete analysis description for geostrophic --- docs/developers_guide/ocean/tasks/geostrophic.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/developers_guide/ocean/tasks/geostrophic.md b/docs/developers_guide/ocean/tasks/geostrophic.md index a1ea5f6cc..c0ee793bf 100644 --- a/docs/developers_guide/ocean/tasks/geostrophic.md +++ b/docs/developers_guide/ocean/tasks/geostrophic.md @@ -43,7 +43,12 @@ section. Other model config options are taken from `forward.yaml`. ### analysis The class {py:class}`polaris.ocean.tasks.geostrophic.analysis.Analysis` -defines a step for +descends from +{py:class}`polaris.ocean.convergence.ConvergenceAnalysis`, +and defines a step for computing the error norm (L2) for the water-column +thickness and normal velocity at each resolution, saving them in +`convergence_h.csv` and `convergence_normalVelocity.csv`, and plotting them +in `convergence_h.png` and `convergence_normalVelocity.png`. ### viz