From 51890d3b39f93e2c01d6cd61e576002450a108aa Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 10 Jul 2020 13:55:52 -0600 Subject: [PATCH 1/6] Bump compass env to 0.1.8 --- 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 b632fe89c7..a0b8411223 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.6 -c conda-forge -c e3sm python=3.7 compass=0.1.6 +conda create -n compass_0.1.8 -c conda-forge -c e3sm python=3.7 compass=0.1.8 ``` Each time you want to work with COMPASS, you will need to run: ``` -conda activate compass_0.1.6 +conda activate compass_0.1.8 ``` 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 54043dc1f1..dc924a679e 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.6 +version=0.1.8 # The rest of the script should not need to be modified if [[ $HOSTNAME = "cori"* ]] || [[ $HOSTNAME = "dtn"* ]]; then From 1bb7495861043d93808fd71c3ebf2ff56e2a99b6 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 10 Jul 2020 13:57:15 -0600 Subject: [PATCH 2/6] Bump WC14 revision to 03 --- .../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 3ec9d23fea..d494523e50 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/584 e3sm_version = 2 -mesh_version = 02 +mesh_version = 03 creation_date = autodetect min_res = 14 max_res = 60 From f4423ffa0ffb0868bb2cf04e003e2cd95ebf26fb Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 10 Jul 2020 14:19:11 -0600 Subject: [PATCH 3/6] Add PR number to 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 d494523e50..0b75788501 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/584 + https://github.com/MPAS-Dev/MPAS-Model/pull/628 e3sm_version = 2 mesh_version = 03 creation_date = autodetect From 40fbc089ac6aed6749fbb63186d7a5936f0456d0 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 10 Jul 2020 14:24:04 -0600 Subject: [PATCH 4/6] Switch 60 layers to be the default vertical res --- .../WC14/init/config_initial_state.xml | 58 +++++++++++++++- .../init/config_initial_state_60_layers.xml | 1 - .../init/config_initial_state_64_layers.xml | 66 +++++++++++++++++++ 3 files changed, 123 insertions(+), 2 deletions(-) mode change 120000 => 100644 testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml delete mode 120000 testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state_60_layers.xml create mode 100644 testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state_64_layers.xml diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml deleted file mode 120000 index 5c7c5154d7..0000000000 --- a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml +++ /dev/null @@ -1 +0,0 @@ -../../config_files/config_initial_state.xml \ No newline at end of file diff --git a/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml new file mode 100644 index 0000000000..696fd50d5c --- /dev/null +++ b/testing_and_setup/compass/ocean/global_ocean/WC14/init/config_initial_state.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +