Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: E3SM-Project/zppy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ae399775e80cd554a396a955be5cf90ce88c185a
Choose a base ref
..
head repository: E3SM-Project/zppy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9f1f918cf5da87aee8b4cf9b871762c473a57f88
Choose a head ref
Showing with 9 additions and 1 deletion.
  1. +8 −0 tests/test_sections.py
  2. +1 −1 zppy/templates/slurm_header.sh
8 changes: 8 additions & 0 deletions tests/test_sections.py
View file
Original file line number Diff line number Diff line change
@@ -84,6 +84,7 @@ def test_sections(self):
"parallel": "",
"partition": "SHORT",
"plugins": [],
"reservation": "",
"qos": "regular",
"templateDir": "zppy/templates",
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U",
@@ -141,6 +142,7 @@ def test_sections(self):
"partition": "SHORT",
"plugins": [],
"qos": "regular",
"reservation": "",
"subsection": None,
"templateDir": "zppy/templates",
"tpd": 1,
@@ -194,6 +196,7 @@ def test_sections(self):
"partition": "SHORT",
"plugins": [],
"qos": "regular",
"reservation": "",
"subsection": None,
"templateDir": "zppy/templates",
"vars": "",
@@ -245,6 +248,7 @@ def test_subsections(self):
"partition": "SHORT",
"plugins": [],
"qos": "regular",
"reservation": "",
"templateDir": "zppy/templates",
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U",
"walltime": "02:00:00",
@@ -321,6 +325,7 @@ def test_subsections(self):
"partition": "SHORT",
"plugins": [],
"qos": "regular",
"reservation": "",
"subsection": "ts_grid1",
"templateDir": "zppy/templates",
"tpd": 1,
@@ -360,6 +365,7 @@ def test_subsections(self):
"partition": "SHORT",
"plugins": [],
"qos": "regular",
"reservation": "",
"subsection": "ts_grid2",
"templateDir": "zppy/templates",
"tpd": 1,
@@ -429,6 +435,7 @@ def test_subsections(self):
"partition": "SHORT",
"plugins": [],
"qos": "regular",
"reservation": "",
"subsection": "climo_grid1",
"templateDir": "zppy/templates",
"vars": "",
@@ -462,6 +469,7 @@ def test_subsections(self):
"parallel": "mpi",
"partition": "LONG",
"plugins": [],
"reservation": "",
"qos": "regular",
"subsection": "climo_grid2",
"templateDir": "zppy/templates",
2 changes: 1 addition & 1 deletion zppy/templates/slurm_header.sh
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
#SBATCH --output={{ scriptDir }}/{{ prefix }}.o%j
#SBATCH --exclusive
#SBATCH --time={{ walltime }}
{% if reservation != "" %}
{% if reservation %}
#SBATCH --reservation={{ reservation }}
{% endif %}
{% if machine in ['anvil', 'chrysalis'] %}