From c5e32fff37797885aef9aaaa7b760ee2190e0d72 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 10 Jan 2024 05:50:20 -0800 Subject: [PATCH 1/2] Add env vars for compiler and MPI lib --- deploy/bootstrap.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/bootstrap.py b/deploy/bootstrap.py index a223bb1ed..dd4300c95 100755 --- a/deploy/bootstrap.py +++ b/deploy/bootstrap.py @@ -355,8 +355,11 @@ def get_env_vars(machine, compiler, mpilib): if machine is None: machine = 'None' - # convert env vars from mache to a list - env_vars = 'export MPAS_EXTERNAL_LIBS=""\n' + env_vars = f'export POLARIS_COMPILER={compiler}\n' \ + f'export POLARIS_MPI={mpilib}\n' + + env_vars = f'{env_vars}' \ + f'export MPAS_EXTERNAL_LIBS=""\n' if 'intel' in compiler and machine == 'anvil': env_vars = f'{env_vars}' \ From 5ea72fcdcccc79bdcf5a661c612b7fe7c05dfe84 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 10 Jan 2024 03:40:50 -0800 Subject: [PATCH 2/2] Update Omega submodule to latest develop --- e3sm_submodules/Omega | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e3sm_submodules/Omega b/e3sm_submodules/Omega index 0a642b74e..3f7369496 160000 --- a/e3sm_submodules/Omega +++ b/e3sm_submodules/Omega @@ -1 +1 @@ -Subproject commit 0a642b74e230da58bc3abe9412f9aa3b8832dab6 +Subproject commit 3f7369496150cca1162365cfac0eebbd55a41cd9