Skip to content
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

Update water cycle defaults in test suite #1060

Merged
merged 2 commits into from
Feb 12, 2025
Merged

Update water cycle defaults in test suite #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e32f1f
Remove the QU480 test from the test suite
xylar Feb 12, 2025
8660296
Update water cycle defaults in test suite
xylar Feb 12, 2025
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
3 changes: 1 addition & 2 deletions suite/run_dev_suite.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ py=3.11
./suite/setup.py -p ${py} -r main_vs_ctrl -b ${branch} -e ${env_name}
./suite/setup.py -p ${py} -r no_polar_regions -b ${branch} --no_polar_regions -e ${env_name}
./suite/setup.py -p ${py} -r mesh_rename -b ${branch} -e ${env_name}
./suite/setup.py -p ${py} -r QU480 -b ${branch} -e ${env_name}

# submit the jobs
cd ${machine}_test_suite
Expand All @@ -47,7 +46,7 @@ sbatch --dependency=afterok:${RES##* } --kill-on-invalid-dep=yes job_script.bash
cd ..

for run in wc_defaults moc_am no_ncclimo no_polar_regions \
mesh_rename QU480
mesh_rename
do
cd ${run}
echo ${run}
Expand Down
10 changes: 0 additions & 10 deletions suite/run_e3sm_unified_suite.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,3 @@ do
done

cd ..

# only LCRC machines have a separate QU480 run
if [[ "$machine" == "anvil" || "$machine" == "chrysalis" ]]
then
./suite/setup.py -p ${py} -r QU480 -b ${branch}
cd ${machine}_test_suite/QU480
echo QU480
sbatch job_script.bash
cd ../..
fi
2 changes: 1 addition & 1 deletion suite/run_suite.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ sbatch --dependency=afterok:${RES##* } --kill-on-invalid-dep=yes job_script.bash
cd ..

for run in main_py${alt_py} wc_defaults moc_am no_ncclimo no_polar_regions \
mesh_rename xarray_main QU480
mesh_rename xarray_main
do
cd ${run}
echo ${run}
Expand Down
14 changes: 3 additions & 11 deletions suite/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,8 @@ def main():
web_section = machine_info.config['web_portal']
web_base = os.path.join(web_section['base_path'], web_section['username'])
html_base = f'{web_base}/analysis_testing'
if args.run == 'QU480':
simulation = '20200305.A_WCYCL1850.ne4_oQU480.anvil'
mesh = 'QU480'
else:
simulation = '20240718.GMPAS-IAF-PISMF.T62_oQU240wLI.chrysalis'
mesh = 'oQU240wLI'
simulation = '20240718.GMPAS-IAF-PISMF.T62_oQU240wLI.chrysalis'
mesh = 'oQU240wLI'
if machine in ['anvil', 'chrysalis']:
input_base = '/lcrc/group/e3sm/public_html/diagnostics/mpas_analysis/example_simulations'
output_base = f'/lcrc/group/e3sm/{username}/analysis_testing'
Expand Down Expand Up @@ -94,11 +90,7 @@ def main():
pass
shutil.copytree(os.path.join('docs', '_build', 'html'), docs_path)

if mesh == 'QU480':
generate = "['all', 'no_BGC', 'no_icebergs', 'no_index', 'no_eke',\n" \
" 'no_landIceCavities', 'no_waves']"
end_year = '5'
elif mesh == 'oQU240wLI':
if mesh == 'oQU240wLI':
generate = "['all', 'no_BGC', 'no_icebergs', 'no_index', 'no_eke', " \
"'no_waves']"
end_year = '10'
Expand Down
5 changes: 3 additions & 2 deletions suite/wc_defaults.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

# a list of analyses to generate.
generate = ['all', 'no_landIceCavities', 'no_BGC', 'no_icebergs', 'no_min',
'no_max', 'no_sose', 'no_climatologyMapSchmidtko',
'no_max', 'no_sose', 'no_waves', 'no_eke',
'no_climatologyMapAntarcticMelt', 'no_regionalTSDiagrams',
'no_timeSeriesAntarcticMelt', 'no_timeSeriesOceanRegions',
'no_climatologyMapSose', 'no_woceTransects', 'no_soseTransects',
'no_geojsonTransects', 'no_oceanRegionalProfiles', 'no_waves']
'no_geojsonTransects', 'no_oceanRegionalProfiles',
'no_hovmollerOceanRegions', 'no_oceanConservation']
Loading