diff --git a/cime_config/SystemTests/sct.py b/cime_config/SystemTests/sct.py index 8ae90a48a7..eb414ae6e5 100644 --- a/cime_config/SystemTests/sct.py +++ b/cime_config/SystemTests/sct.py @@ -66,12 +66,12 @@ def _component_compare_test(self, suffix1, suffix2, ignore_fieldlist_diffs=False): with self._test_status: stat,netcdf_filename,err=run_cmd('ls ./run/case2run/*h1*8400.nc ') - stat,DIFFs,err=run_cmd('ncdump -ff -p 9,17 -v QDIFF,TDIFF '+netcdf_filename+' | egrep //\.\*DIFF | sed s/^\ \*// | sed s/\[,\;\].\*// | sed s/^0/0.0/ | uniq') + stat,DIFFs,err=run_cmd('ncdump -ff -p 9,17 -v QDIFF,TDIFF '+netcdf_filename+' | egrep //\.\*DIFF | sed s/^\ \*// | sed s/^0,/0.0,/ | sed s/^0\;/0.0\;/ | sed s/\[,\;\].\*// | uniq') array_of_DIFFs=DIFFs.split("\n") answer=max([abs(float(x)) for x in array_of_DIFFs]) comments="Checking QDIFF,TDIFF in SCAM run." append_testlog(comments, self._orig_caseroot) - # Test for greater that round off changes. + # Test for greater than round off changes. if answer < 1e-10: self._test_status.set_status("{}_{}_{}".format(COMPARE_PHASE, self._run_one_suffix, self._run_two_suffix), TEST_PASS_STATUS) comments="QDIFF,TDIFF: PASS" diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 281be40423..cf2135cafb 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -1401,16 +1401,49 @@ - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/shell_commands new file mode 100644 index 0000000000..89516e5375 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/shell_commands @@ -0,0 +1,7 @@ +./xmlchange NTASKS=36 +./xmlchange NTHRDS=1 +./xmlchange ROOTPE='0' +./xmlchange ROF_NCPL=`./xmlquery --value ATM_NCPL` +./xmlchange GLC_NCPL=`./xmlquery --value ATM_NCPL` +./xmlchange TIMER_DETAIL='6' +./xmlchange TIMER_LEVEL='999' diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/user_nl_cam similarity index 100% rename from cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/user_nl_cam rename to cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/user_nl_cam diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/user_nl_clm similarity index 99% rename from cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/user_nl_clm rename to cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/user_nl_clm index 0d83b5367b..12d5a36d2b 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/user_nl_clm @@ -24,4 +24,3 @@ hist_nhtfrq = 9 hist_mfilt = 1 hist_ndens = 1 - diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3/shell_commands index d611a3bc78..dec26a5365 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3/shell_commands +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3/shell_commands @@ -2,5 +2,5 @@ ./xmlchange GLC_NCPL=\$ATM_NCPL ./xmlchange CAM_CONFIG_OPTS=' -microphys mg3' --append if [ "`./xmlquery ATM_GRID --value`" == "C96" ]; then - ./xmlchange NTASKS=-1 + ./xmlchange NTASKS=-2 fi diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/shell_commands deleted file mode 100644 index 1e3a8c645c..0000000000 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/shell_commands +++ /dev/null @@ -1,30 +0,0 @@ -./xmlchange NTASKS_ATM=36 -./xmlchange NTHRDS_ATM=1 -./xmlchange ROOTPE_ATM='0' -./xmlchange NTASKS_LND=36 -./xmlchange NTHRDS_LND=1 -./xmlchange ROOTPE_LND='0' -./xmlchange NTASKS_ROF=36 -./xmlchange NTHRDS_ROF=1 -./xmlchange ROOTPE_ROF='0' -./xmlchange NTASKS_ICE=36 -./xmlchange NTHRDS_ICE=1 -./xmlchange ROOTPE_ICE='0' -./xmlchange NTASKS_OCN=36 -./xmlchange NTHRDS_OCN=1 -./xmlchange ROOTPE_OCN='0' -./xmlchange NTASKS_GLC=36 -./xmlchange NTHRDS_GLC=1 -./xmlchange ROOTPE_GLC='0' -./xmlchange NTASKS_WAV=36 -./xmlchange NTHRDS_WAV=1 -./xmlchange ROOTPE_WAV='0' -./xmlchange NTASKS_CPL=36 -./xmlchange NTHRDS_CPL=1 -./xmlchange ROOTPE_CPL='0' -./xmlchange ROF_NCPL=\$ATM_NCPL -./xmlchange GLC_NCPL=\$ATM_NCPL -./xmlchange CAM_CONFIG_OPTS=' -microphys mg3' --append -./xmlchange TIMER_DETAIL='6' -./xmlchange TIMER_LEVEL='999' -./xmlchange JOB_WALLCLOCK_TIME='00:30:00' diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands new file mode 100644 index 0000000000..9fdcee8bfd --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands @@ -0,0 +1,8 @@ +./xmlchange NTASKS=36 +./xmlchange NTHRDS=1 +./xmlchange ROOTPE='0' +./xmlchange ROF_NCPL=`./xmlquery --value ATM_NCPL` +./xmlchange GLC_NCPL=`./xmlquery --value ATM_NCPL` +./xmlchange CAM_CONFIG_OPTS=' -microphys mg3' --append +./xmlchange TIMER_DETAIL='6' +./xmlchange TIMER_LEVEL='999' diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/user_nl_cam new file mode 100644 index 0000000000..8482082dce --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/user_nl_cam @@ -0,0 +1,4 @@ +mfilt=1,1,1,1,1,1 +ndens=1,1,1,1,1,1 +nhtfrq=9,9,9,9,9,9 +inithist='ENDOFRUN' diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/user_nl_clm new file mode 100644 index 0000000000..12d5a36d2b --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/user_nl_clm @@ -0,0 +1,26 @@ +!---------------------------------------------------------------------------------- +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! +! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options +! are set in the CLM_NAMELIST_OPTS env variable. +! +! EXCEPTIONS: +! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting +! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting +! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting +! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting +! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting +! Set irrigate by the CLM_BLDNML_OPTS -irrig setting +! Set dtime with L_NCPL option +! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options +! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases +! (includes $inst_string for multi-ensemble cases) +! Set glc_grid with CISM_GRID option +! Set glc_smb with GLC_SMB option +! Set maxpatch_glcmec with GLC_NEC option +! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable +!---------------------------------------------------------------------------------- +hist_nhtfrq = 9 +hist_mfilt = 1 +hist_ndens = 1 diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/shell_commands new file mode 100644 index 0000000000..9fdcee8bfd --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/shell_commands @@ -0,0 +1,8 @@ +./xmlchange NTASKS=36 +./xmlchange NTHRDS=1 +./xmlchange ROOTPE='0' +./xmlchange ROF_NCPL=`./xmlquery --value ATM_NCPL` +./xmlchange GLC_NCPL=`./xmlquery --value ATM_NCPL` +./xmlchange CAM_CONFIG_OPTS=' -microphys mg3' --append +./xmlchange TIMER_DETAIL='6' +./xmlchange TIMER_LEVEL='999' diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_cam new file mode 100644 index 0000000000..8bb09f9ffc --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_cam @@ -0,0 +1,24 @@ +mfilt=1,1,1,1,1,1 +ndens=1,1,1,1,1,1 +nhtfrq=9,9,9,9,9,9 +inithist='ENDOFRUN' +micro_mg_do_graupel=.false. +micro_mg_do_hail=.true. +micro_do_sb_physics=.true. +micro_do_massless_droplet_destroyer=.true. +microp_uniform=.true. +micro_mg_nccons=.true. +micro_mg_nicons=.true. +micro_mg_ngcons=.true. +micro_mg_nrcons=.true. +micro_mg_nscons=.true. +micro_mg_evap_sed_off=.true. +micro_mg_icenuc_rh_off=.true. +micro_mg_icenuc_use_meyers=.true. +micro_mg_evap_scl_ifs=.true. +micro_mg_evap_rhthrsh_ifs=.true. +micro_mg_rainfreeze_ifs=.true. +micro_mg_ifs_sed=.true. +micro_mg_precip_fall_corr=.true. +micro_mg_implicit_fall=.false. +micro_mg_accre_sees_auto=.true. diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_clm new file mode 100644 index 0000000000..12d5a36d2b --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_clm @@ -0,0 +1,26 @@ +!---------------------------------------------------------------------------------- +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! +! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options +! are set in the CLM_NAMELIST_OPTS env variable. +! +! EXCEPTIONS: +! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting +! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting +! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting +! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting +! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting +! Set irrigate by the CLM_BLDNML_OPTS -irrig setting +! Set dtime with L_NCPL option +! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options +! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases +! (includes $inst_string for multi-ensemble cases) +! Set glc_grid with CISM_GRID option +! Set glc_smb with GLC_SMB option +! Set maxpatch_glcmec with GLC_NEC option +! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable +!---------------------------------------------------------------------------------- +hist_nhtfrq = 9 +hist_mfilt = 1 +hist_ndens = 1 diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/shell_commands new file mode 100644 index 0000000000..d6e6750eb4 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/shell_commands @@ -0,0 +1,8 @@ +./xmlchange NTASKS=36 +./xmlchange NTHRDS=1 +./xmlchange ROOTPE='0' +./xmlchange ROF_NCPL=`./xmlquery --value ATM_NCPL` +./xmlchange GLC_NCPL=`./xmlquery --value ATM_NCPL` +./xmlchange CAM_CONFIG_OPTS=' -microphys mg3 -pcols 1536' --append +./xmlchange TIMER_DETAIL='6' +./xmlchange TIMER_LEVEL='999' diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_cam new file mode 100644 index 0000000000..8482082dce --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_cam @@ -0,0 +1,4 @@ +mfilt=1,1,1,1,1,1 +ndens=1,1,1,1,1,1 +nhtfrq=9,9,9,9,9,9 +inithist='ENDOFRUN' diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_clm new file mode 100644 index 0000000000..12d5a36d2b --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_clm @@ -0,0 +1,26 @@ +!---------------------------------------------------------------------------------- +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! +! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options +! are set in the CLM_NAMELIST_OPTS env variable. +! +! EXCEPTIONS: +! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting +! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting +! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting +! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting +! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting +! Set irrigate by the CLM_BLDNML_OPTS -irrig setting +! Set dtime with L_NCPL option +! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options +! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases +! (includes $inst_string for multi-ensemble cases) +! Set glc_grid with CISM_GRID option +! Set glc_smb with GLC_SMB option +! Set maxpatch_glcmec with GLC_NEC option +! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable +!---------------------------------------------------------------------------------- +hist_nhtfrq = 9 +hist_mfilt = 1 +hist_ndens = 1 diff --git a/doc/ChangeLog b/doc/ChangeLog index 1d6906d761..354e22fa5d 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -10,6 +10,9 @@ Purpose of changes (include the issue number and title text for each relevant Gi - Update to cesm2_3_alpha09a externals (https://github.com/ESCOMP/CAM/issues/565) - CIME update needed for running the pumas codes on GPU and introduce a GPU regression test suite (https://github.com/ESCOMP/CAM/issues/512) +- F2000climo using C96 grid crashes intermittently (https://github.com/ESCOMP/CAM/issues/573) +- Failing SCT test (https://github.com/ESCOMP/CAM/issues/566) +- PUMAS GPU regression test suite (https://github.com/ESCOMP/CAM/issues/577) Describe any changes made to build system: N/A @@ -21,9 +24,26 @@ Describe any substantial timing or memory changes: N/A Code reviewed by: goldy, cacraig, nusbaume -List all files eliminated: N/A +List all files eliminated: +D cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/shell_commands +D cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/user_nl_cam +D cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/user_nl_clm + - remove testmods for unused test -List all files added and what they do: N/A +List all files added and what they do: +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/shell_commands +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/user_nl_cam +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/user_nl_clm +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/user_nl_cam +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/user_nl_clm +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/shell_commands +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_cam +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_clm +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/shell_commands +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_cam +A cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_clm + - add testmods for new tests List all existing files that have been modified, and describe the changes: M Externals.cfg @@ -38,6 +58,13 @@ M cime_config/testdefs/testlist_cam.xml - FSCAM -> 2000_CAM60%SCAM_CLM50%SP_CICE5%PRES_DOCN%DOM_SROF_SGLC_SWAV - FW1850 -> 1850_CAM60%WCTS_CLM50%SP_CICE5%PRES_DOCN%DOM_MOSART_SGLC_SWAV - FWHIST -> HIST_CAM60%WCTS_CLM50%SP_CICE5%PRES_DOCN%DOM_MOSART_SGLC_SWAV + - add GPU tests for PUMAS on casper +M cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3/shell_commands + - increase NTASKS for C96 grid that is crashing intermittently +M cime_config/SystemTests/sct.py + - fix failing SCT test +M test/system/test_driver.sh + - add casper-specific testing If there were any failures reported from running test_driver.sh on any test platform, and checkin with these failures has been OK'd by the gatekeeper, then copy the lines from the td.*.status files for the failed tests to the diff --git a/test/system/test_driver.sh b/test/system/test_driver.sh index 13d69eb5d3..964f647793 100755 --- a/test/system/test_driver.sh +++ b/test/system/test_driver.sh @@ -251,7 +251,7 @@ case $hostname in mach_workspace="/glade/scratch" # Check for CESM baseline directory - if [ -n "{$BL_TESTDIR}" ] && [ ! -d "${BL_TESTDIR}" ]; then + if [ -n "${BL_TESTDIR}" ] && [ ! -d "${BL_TESTDIR}" ]; then echo "CESM_BASELINE ${BL_TESTDIR} not found. Check BL_TESTDIR for correct tag name." exit fi @@ -387,6 +387,58 @@ EOF ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ writing to batch script ^^^^^^^^^^^^^^^^^^^ ;; + ##casper + casper* | crhtc* ) + submit_script_cime="`pwd -P`/test_driver_casper_cime_${cur_time}.sh" + + if [ -z "$CAM_ACCOUNT" ]; then + echo "ERROR: Must set the environment variable CAM_ACCOUNT" + exit 2 + fi + + if [ -z "$CAM_BATCHQ" ]; then + export CAM_BATCHQ="casper" + fi + + # wallclock for run job + wallclock_limit="00:59:00" + + if [ $gmake_j = 0 ]; then + gmake_j=36 + fi + + # run tests on 1 nodes using 18 tasks/node, 2 threads/task + CAM_TASKS=18 + CAM_THREADS=2 + + # change parallel configuration on 1 nodes using 32 tasks, 1 threads/task + CAM_RESTART_TASKS=32 + CAM_RESTART_THREADS=1 + + mach_workspace="/glade/scratch" + + # Check for CESM baseline directory + if [ -n "${BL_TESTDIR}" ] && [ ! -d "${BL_TESTDIR}" ]; then + echo "CESM_BASELINE ${BL_TESTDIR} not found. Check BL_TESTDIR for correct tag name." + exit + fi + +#------------------------------------------- + +cat > ${submit_script_cime} << EOF +#!/bin/bash +# +#PBS -N cime-tests +#PBS -q $CAM_BATCHQ +#PBS -A $CAM_ACCOUNT +#PBS -l walltime=2:00:00 +#PBS -l select=1:ncpus=36:mpiprocs=36:mem=300GB +#PBS -j oe +#PBS -V +EOF + +##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ writing to batch script ^^^^^^^^^^^^^^^^^^^ + ;; * ) echo "ERROR: machine $hostname not currently supported"; exit 1 ;; esac @@ -405,6 +457,9 @@ fi if [ "${hostname:0:5}" == "izumi" ]; then cesm_test_mach="izumi" fi +if [ "${hostname:0:6}" == "casper" ] || [ "${hostname:0:5}" == "crhtc" ]; then + cesm_test_mach="casper" +fi if [ -n "${CAM_FC}" ]; then comp="_${CAM_FC,,}" fi @@ -465,7 +520,12 @@ if [ "${cesm_test_suite}" != "none" -a -n "${cesm_test_mach}" ]; then fi ## Setup CESM work directory - cesm_testdir=$mach_workspace/$LOGNAME/$test_id + if [ "${hostname:0:6}" == "casper" ] || [ "${hostname:0:5}" == "crhtc" ]; then + ## Would fail to compile on Casper with long folder name + cesm_testdir=$mach_workspace/$LOGNAME/$cesm_test + else + cesm_testdir=$mach_workspace/$LOGNAME/$test_id + fi if [ -e ${cesm_testdir} ]; then if [ -n "${use_existing}" ]; then @@ -491,6 +551,10 @@ if [ "${cesm_test_suite}" != "none" -a -n "${cesm_test_mach}" ]; then chey* | r* ) testargs="${testargs} --queue ${CAM_BATCHQ} --test-root ${cesm_testdir} --output-root ${cesm_testdir}" ;; + # casper + casper* | crhtc* ) + testargs="${testargs} --queue ${CAM_BATCHQ} --test-root ${cesm_testdir} --output-root ${cesm_testdir}" + ;; *) if $batch; then testargs="${testargs} --queue ${CAM_BATCHQ} --test-root ${cesm_testdir} --output-root ${cesm_testdir}" @@ -585,6 +649,14 @@ if [ "${cesm_test_suite}" != "none" -a -n "${cesm_test_mach}" ]; then fi fi + if [ "${hostname:0:6}" == "casper" ] || [ "${hostname:0:5}" == "crhtc" ]; then + echo "cd ${script_dir}" >> ${submit_script_cime} + echo "module load python" >> ${submit_script_cime} + echo './create_test' ${testargs} >> ${submit_script_cime} + chmod u+x ${submit_script_cime} + qsub ${submit_script_cime} + fi + done fi