From 1a974c6964ff7aeda697c6eeed8b876dc0b35748 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Sun, 9 Aug 2020 02:45:43 -0600 Subject: [PATCH 1/3] Bump compass version to 0.1.9 This version has geometric features changes from https://github.com/MPAS-Dev/geometric_features/pull/147 that improve the representation of England, Scotland, Italy and Hawaii --- testing_and_setup/compass/README_ocean.md | 4 ++-- testing_and_setup/compass/load_compass_env.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testing_and_setup/compass/README_ocean.md b/testing_and_setup/compass/README_ocean.md index a0b8411223..52107c1ccc 100644 --- a/testing_and_setup/compass/README_ocean.md +++ b/testing_and_setup/compass/README_ocean.md @@ -6,11 +6,11 @@ To set up and run ocean test cases from COMPASS, you will need a conda environment. First, install Miniconda3 (if miniconda is not already installed), then create a new conda environment as follows: ``` bash -conda create -n compass_0.1.8 -c conda-forge -c e3sm python=3.7 compass=0.1.8 +conda create -n compass_0.1.9 -c conda-forge -c e3sm python=3.7 compass=0.1.9 ``` Each time you want to work with COMPASS, you will need to run: ``` -conda activate compass_0.1.8 +conda activate compass_0.1.9 ``` An appropriate conda environment is already available on Los Alamos National diff --git a/testing_and_setup/compass/load_compass_env.sh b/testing_and_setup/compass/load_compass_env.sh index dc924a679e..765bc805ca 100644 --- a/testing_and_setup/compass/load_compass_env.sh +++ b/testing_and_setup/compass/load_compass_env.sh @@ -1,4 +1,4 @@ -version=0.1.8 +version=0.1.9 # The rest of the script should not need to be modified if [[ $HOSTNAME = "cori"* ]] || [[ $HOSTNAME = "dtn"* ]]; then From 6089b3d946e8c5dcbec01198b6fc48ba97fa6eab Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Sun, 9 Aug 2020 02:47:37 -0600 Subject: [PATCH 2/3] Update mesh revision number to r04 --- .../ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini index d175d597b0..af72a33242 100644 --- a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini +++ b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini @@ -16,7 +16,7 @@ description = MPAS North America and Arctic Focused Water Cycle mesh for E3SM ve around North America and ${levels} vertical levels as documented at https://github.com/MPAS-Dev/MPAS-Model/pull/628 e3sm_version = 2 -mesh_version = 03 +mesh_version = 04 creation_date = autodetect min_res = 14 max_res = 60 From b0bb445eb4bf1f0f8b269c8fac9118cb4565080b Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Sun, 9 Aug 2020 02:56:07 -0600 Subject: [PATCH 3/3] Update pull request number in metadata --- .../ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini index af72a33242..99f1704282 100644 --- a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini +++ b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_E3SM_coupling_files.ini @@ -14,7 +14,7 @@ prefix = WC description = MPAS North America and Arctic Focused Water Cycle mesh for E3SM version ${e3sm_version}, with a focused ${min_res}-km resolution around North America and ${levels} vertical levels as documented at - https://github.com/MPAS-Dev/MPAS-Model/pull/628 + https://github.com/MPAS-Dev/MPAS-Model/pull/650 e3sm_version = 2 mesh_version = 04 creation_date = autodetect