Skip to content

Fix test suite for e3sm-unified #1144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xylar merged 1 commit into from
Apr 10, 2026
+12 −17
Merged

Fix test suite for e3sm-unified #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions suite/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ def main():
account, partition, configuration, qos = \
machine_info.get_account_defaults()

use_e3sm_unified = 'E3SMU_SCRIPT' in os.environ
use_e3sm_unified = 'E3SM_UNIFIED_LOAD_SCRIPT' in os.environ
if use_e3sm_unified:
e3sm_unified_script = os.environ['E3SMU_SCRIPT']
e3sm_unified_script = os.environ['E3SM_UNIFIED_LOAD_SCRIPT']
args.branch = \
os.path.splitext(os.path.basename(e3sm_unified_script))[0]
else:
Expand Down
25 changes: 10 additions & 15 deletions suite/templates/job_script.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,33 @@

set -e

{% if use_e3sm_unified %}
{% if use_e3sm_unified -%}
source {{ e3sm_unified_script }}

echo E3SM-Unified: {{ e3sm_unified_script }}
{% elif pixi_env %}
{% elif pixi_env -%}
export HDF5_USE_FILE_LOCKING=FALSE
export E3SMU_MACHINE={{ machine }}

run_mpas_analysis() {
pixi run --manifest-path ../../pixi.toml -e {{ pixi_env }} mpas_analysis "$@"
}
eval "$(pixi shell-hook --manifest-path ../../pixi.toml -e {{ pixi_env }})"

echo pixi env: {{ pixi_env }}
{% else %}
{% else -%}
source {{ conda_base }}/etc/profile.d/conda.sh
conda activate {{ conda_env }}
export HDF5_USE_FILE_LOCKING=FALSE
export E3SMU_MACHINE={{ machine }}

run_mpas_analysis() {
mpas_analysis "$@"
}

echo env: {{ conda_env }}
{% endif %}
{% endif -%}
echo configs: {{ flags }} {{ config }}

run_mpas_analysis --list
run_mpas_analysis --plot_colormaps
run_mpas_analysis --setup_only {{ flags }} {{ config }}
run_mpas_analysis --purge {{ flags }} {{ config }} --verbose
run_mpas_analysis --html_only {{ flags }} {{ config }}
mpas_analysis --list
mpas_analysis --plot_colormaps
mpas_analysis --setup_only {{ flags }} {{ config }}
mpas_analysis --purge {{ flags }} {{ config }} --verbose
mpas_analysis --html_only {{ flags }} {{ config }}

chmod ugo+rx {{ html_base }}/{{ out_common_dir }}
chmod -R ugo+rX {{ html_base }}/{{ out_subdir }}
Loading