Merge pull request #1059 from xylar/remove-qu480-test

Remove the QU480 test from the test suite
MPAS-Dev · Feb 12, 2025 · d674d23 · d674d23
2 parents 24058d9 + 4e32f1f
commit d674d23
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 24 deletions.
diff --git a/suite/run_dev_suite.bash b/suite/run_dev_suite.bash
@@ -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
@@ -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}

diff --git a/suite/run_e3sm_unified_suite.bash b/suite/run_e3sm_unified_suite.bash
@@ -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
diff --git a/suite/run_suite.bash b/suite/run_suite.bash
@@ -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}

diff --git a/suite/setup.py b/suite/setup.py
@@ -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'
@@ -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'