diff --git a/cime_config/config_archive.xml b/cime_config/config_archive.xml
new file mode 100644
index 00000000..0a6a139e
--- /dev/null
+++ b/cime_config/config_archive.xml
@@ -0,0 +1,27 @@
+
+
+
+ r
+ rh\d*
+ rs
+ h\d*.*\.nc$
+ i\..*\.nc$
+ e
+ nhfil
+
+ rpointer.atm$NINST_STRING
+ $CASE.cam$NINST_STRING.r.$DATENAME.nc
+
+
+ rpointer.atm
+ rpointer.atm_9999
+ casename.cam.r.1976-01-01-00000.nc
+ casename.cam.rh4.1976-01-01-00000.nc
+ casename.cam.h0.1976-01-01-00000.nc
+ casename.cam.h0.1976-01-01-00000.nc.base
+ casename.cam_0002.e.postassim.1976-01-01-00000.nc
+ casename.cam_0002.e.preassim.1976-01-01-00000.nc
+ casename.cam.i.1976-01-01-00000.nc
+
+
+
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index c93a9de8..201186b8 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -8,6 +8,7 @@
CAM
===============
-->
+ CAM cam7 physics:
CAM cam6 physics:
CAM cam5 physics:
CAM cam4 physics:
@@ -120,6 +121,7 @@
+ --physics-suites cam7 --analytic_ic
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 972c0cd4..6a3df181 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -104,6 +104,11 @@
+
+ FCAM7
+ 2000_CAM70_SLND_SICE_SOCN_SROF_SGLC_SWAV
+
+
F2010climo
2010_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV
diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index bde96b4e..6d7bafe5 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -72,6 +72,43 @@
+
+
+
+ none
+
+ 24
+ 24
+ 24
+ 24
+ 24
+ 24
+ 24
+ 24
+
+
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+
+
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
diff --git a/cime_config/namelist_definition_cam.xml b/cime_config/namelist_definition_cam.xml
index ba8fbe40..26929186 100644
--- a/cime_config/namelist_definition_cam.xml
+++ b/cime_config/namelist_definition_cam.xml
@@ -104,6 +104,15 @@
${DIN_LOC_ROOT}/atm/cam/inic/gaus/cami_0000-01-01_8x16_L26_c030228.nc
${DIN_LOC_ROOT}/atm/cam/inic/gaus/cami_0000-09-01_8x16_L26_c030918.nc
${DIN_LOC_ROOT}/atm/cam/inic/gaus/cami_0000-01-01_8x16_L30_c090102.nc
+ ${DIN_LOC_ROOT}/atm/cam/inic/se/FCts4MTHIST_ne3pg3_spinup02.cam.i.1980-01-01_c240702.nc
+ ${DIN_LOC_ROOT}/atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L32_01-01-31_c221214.nc
+ ${DIN_LOC_ROOT}/atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-09-01-00000.nc
+ ${DIN_LOC_ROOT}/atm/cam/inic/se/cami_0000-01-01_ne3np4_L30_c120315.nc
+ ${DIN_LOC_ROOT}/atm/cam/inic/se/cami_0000-01-01_ne3np4_L30_c120315.nc
+ ${DIN_LOC_ROOT}/atm/cam/inic/se/cami_0000-01-01_ne3np4_L26_c120525.nc
+ ${DIN_LOC_ROOT}/atm/cam/inic/se/cami_0000-01-01_ne3np4_L26_c120525.nc
+ ${DIN_LOC_ROOT}/atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L58_01-01-31_c221214.nc
+ ${DIN_LOC_ROOT}/atm/cam/inic/se/cam6_FMTHIST_ne3pg3_mg37_L93_79-02-01_c240517.nc
${DIN_LOC_ROOT}/atm/cam/inic/homme/cami-mam3_0000-01_ne5np4_L30.140707.nc
${DIN_LOC_ROOT}/atm/cam/inic/se/ape_topo_cam4_ne16np4_L26_c171020.nc
${DIN_LOC_ROOT}/atm/cam/inic/se/ape_topo_cam4_ne16np4_L30_c171020.nc
@@ -208,6 +217,7 @@
${DIN_LOC_ROOT}/atm/cam/topo/USGS-gtopo30_2.5x3.33_remap_c100204.nc
${DIN_LOC_ROOT}/atm/cam/topo/USGS-gtopo30_4x5_remap_c050520.nc
${DIN_LOC_ROOT}/atm/cam/topo/fv_10x15_nc0540_Nsw042_Nrs008_Co060_Fi001_20171220.nc
+ ${DIN_LOC_ROOT}/atm/cam/topo/se/ne3np4_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230717.nc
${DIN_LOC_ROOT}/atm/cam/topo/se/ne5np4_nc3000_Co360_Fi001_MulG_PF_nullRR_Nsw064_20170515.nc
${DIN_LOC_ROOT}/atm/cam/topo/se/ne16np4_nc3000_Co120_Fi001_PF_nullRR_Nsw084_20171012.nc
${DIN_LOC_ROOT}/atm/cam/topo/se/ne30np4_nc3000_Co060_Fi001_PF_nullRR_Nsw042_20171020.nc
@@ -219,6 +229,7 @@
${DIN_LOC_ROOT}/atm/cam/topo/se/ne60pg2_nc3000_Co030_Fi001_PF_nullRR_Nsw021_20171014.nc
${DIN_LOC_ROOT}/atm/cam/topo/se/ne120pg2_nc3000_Co015_Fi001_PF_nullRR_Nsw010_20171012.nc
${DIN_LOC_ROOT}/atm/cam/topo/se/ne240pg2_nc3000_Co008_Fi001_PF_nullRR_Nsw005_20171014.nc
+ ${DIN_LOC_ROOT}/atm/cam/topo/se/ne3pg3_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230209.nc
${DIN_LOC_ROOT}/atm/cam/topo/se/ne5pg3_nc3000_Co360_Fi001_MulG_PF_nullRR_Nsw064_20170516.nc
${DIN_LOC_ROOT}/atm/cam/topo/se/ne16pg3_nc3000_Co120_Fi001_PF_nullRR_Nsw084_20171012.nc
${DIN_LOC_ROOT}/atm/cam/topo/se/ne30pg3_nc3000_Co060_Fi001_PF_nullRR_Nsw042_20171014.nc
diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
index 3da26bdd..434e13bf 100644
--- a/cime_config/testdefs/testlist_cam.xml
+++ b/cime_config/testdefs/testlist_cam.xml
@@ -7,56 +7,88 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho_nooutput/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho/shell_commands
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho_nooutput/shell_commands
rename to cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho_nooutput/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho/user_nl_cam
similarity index 50%
rename from cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho_nooutput/user_nl_cam
rename to cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho/user_nl_cam
index f24f3126..1d6de9f8 100644
--- a/cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho_nooutput/user_nl_cam
+++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_derecho/user_nl_cam
@@ -1,4 +1,7 @@
-ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_before.nc
-ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_after.nc
+ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_cam_before_c20240412.nc
+ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_held_suarez_snapshot_derecho_gnu_cam_after_c20240412.nc
debug_output=0
pver=30
+hist_add_inst_fields;h2: Q, T
+hist_output_frequency;h2: 2*nsteps
+hist_write_nstep0;h2: .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho_nooutput/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/shell_commands
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho_nooutput/shell_commands
rename to cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho_nooutput/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/user_nl_cam
similarity index 68%
rename from cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho_nooutput/user_nl_cam
rename to cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/user_nl_cam
index 4d8d7750..79cb32e9 100644
--- a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho_nooutput/user_nl_cam
+++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/user_nl_cam
@@ -1,4 +1,7 @@
-ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_before.nc
-ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_after.nc
+ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_before_c20240412.nc
+ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_kessler_snapshot_derecho_gnu_after_c20240412.nc
debug_output=0
pver=30
+hist_add_inst_fields;h2: Q, T
+hist_output_frequency;h2: 2*nsteps
+hist_write_nstep0;h2: .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho_nooutput/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho/shell_commands
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho_nooutput/shell_commands
rename to cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho/user_nl_cam
new file mode 100644
index 00000000..f9453545
--- /dev/null
+++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho/user_nl_cam
@@ -0,0 +1,4 @@
+debug_output=0
+hist_add_inst_fields;h2: Q, T
+hist_output_frequency;h2: 2*nsteps
+hist_write_nstep0;h2: .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho_nooutput/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho_nooutput/user_nl_cam
deleted file mode 100644
index b9bb156a..00000000
--- a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_mpas_derecho_nooutput/user_nl_cam
+++ /dev/null
@@ -1 +0,0 @@
-debug_output=0
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/user_nl_cam
deleted file mode 100644
index b9bb156a..00000000
--- a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/user_nl_cam
+++ /dev/null
@@ -1 +0,0 @@
-debug_output=0
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam/shell_commands
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/shell_commands
rename to cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam/user_nl_cam
new file mode 100644
index 00000000..0b32e3fb
--- /dev/null
+++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam/user_nl_cam
@@ -0,0 +1,3 @@
+hist_add_inst_fields;h1: T, Q, PS
+hist_output_frequency;h1: 1*nsteps
+hist_write_nstep0;h1: .true.
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho/shell_commands
similarity index 100%
rename from cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/shell_commands
rename to cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho/user_nl_cam
similarity index 76%
rename from cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/user_nl_cam
rename to cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho/user_nl_cam
index 28c39fd6..69caae3e 100644
--- a/cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/user_nl_cam
+++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho/user_nl_cam
@@ -2,3 +2,6 @@ ncdata=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshot
ncdata_check=/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_tj2016_precip_tend_ne3pg3mg37_derecho_gnu_after.nc
debug_output=0
pver=30
+hist_add_inst_fields;h2: Q, T
+hist_output_frequency;h2: 2*nsteps
+hist_write_nstep0;h2: .true.
diff --git a/src/dynamics/tests/namelist_definition_analy_ic.xml b/src/dynamics/tests/namelist_definition_analy_ic.xml
index f71490bc..48c3d3fb 100644
--- a/src/dynamics/tests/namelist_definition_analy_ic.xml
+++ b/src/dynamics/tests/namelist_definition_analy_ic.xml
@@ -19,7 +19,7 @@
dry_baroclinic_wave_jw2006: Dry baroclinic wave as specified in Jablonowski and Williamson (2006)
- none
+ held_suarez_1994
held_suarez_1994
held_suarez_1994
moist_baroclinic_wave_dcmip2016
diff --git a/test/existing-test-failures.txt b/test/existing-test-failures.txt
index 92c15920..975b8681 100644
--- a/test/existing-test-failures.txt
+++ b/test/existing-test-failures.txt
@@ -1 +1,3 @@
-No test failures
+SMS_Ln2.mpasa480_mpasa480.FKESSLER.derecho_intel.cam-outfrq_kessler_mpas_derecho (Overall: FAIL)
+SMS_Ln2.mpasa480_mpasa480.FKESSLER.derecho_gnu.cam-outfrq_kessler_mpas_derecho (Overall: FAIL)
+ - will fail until MPAS is fully integrated
diff --git a/test/system/archive_baseline.sh b/test/system/archive_baseline.sh
index e72814ad..e9bb9518 100755
--- a/test/system/archive_baseline.sh
+++ b/test/system/archive_baseline.sh
@@ -1,13 +1,6 @@
#!/bin/sh -f
-echo
-
-if [ $# -ne 1 ]; then
- echo "Invoke archive_baseline.sh -help for usage."
- exit 1
-fi
-
-if [ $1 == "-help" ] || [ $1 == "--help" ]; then
+show_help() {
cat << EOF1
NAME
@@ -17,14 +10,14 @@ NAME
SYNOPSIS
- archive_baseline.sh TAGNAME
- [-help]
+ archive_baseline.sh TAGNAME [--no-symlink]
+ [--help]
ENVIROMENT VARIABLES
CESM_TESTDIR - Directory that contains the CESM finished results you wish to archive.
- CAM_FC - Compiler used, used on izumi and derecho (GNU,NAG), where the compiler
+ CAM_FC - Compiler used, used on izumi and derecho (GNU,NAG,INTEL,NVHPC), where the compiler
name is appended to the archive directory.
@@ -35,10 +28,11 @@ BASELINE ARCHIVED LOCATION
derecho: /glade/campaign/cesm/community/amwg/sima_baselines/TAGNAME
-
-HOW TO USE ARCHIVE BASELINES
-
- Set BL_TESTDIR to the archived baseline you wish to load.
+SYMLINK
+ By default, this script will create a symlink between the new baseline directory and
+ $baseline_dir/latest_${CAM_FC} so that future tests can be run against these baselines
+ until thenext baselines are established. If you'd like to not create the symlink (e.g.
+ you are archiving old baselines), use the "--no-symlink" argument.
WORK FLOW
@@ -46,20 +40,11 @@ WORK FLOW
This is an example for izumi.
Modify your sandbox with the changes you want.
- setenv CAM_FC GNU
- setenv CAM_TESTDIR /scratch/cluster/fischer/cam5_2_06
- Run the cam test suite.
+ Run the sima test suite.
Make your trunk tag
- archive_baseline.sh cam5_2_06
-
- Create a new sandbox.
setenv CAM_FC GNU
- setenv CAM_TESTDIR /scratch/cluster/fischer/cam5_2_07
- setenv BL_TESTDIR /fs/cgd/csm/models/atm/sima/pretag_bl/cam5_2_06_gnu
- Run the cam test suite.
- Make your trunk tag
- archive_baseline.sh cam5_2_07
-
+ setenv CESM_TESTDIR /scratch/cluster/fischer/aux_sima_gnu_20241113133750
+ ./archive_baseline.sh sima0_00_001
WARNING
@@ -67,10 +52,40 @@ WARNING
if you are getting unexpected baseline failures.
EOF1
-exit
-fi
+}
+symlink=true
hostname=`hostname`
+
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+ case "$1" in
+ --no-symlink)
+ symlink=false
+ shift
+ ;;
+ -h|--help)
+ show_help
+ exit 0
+ ;;
+ -*)
+ echo "Unknown option: $1"
+ show_help
+ exit 1
+ ;;
+ *)
+ # Assume the first non-flag argument is the tag
+ if [ -z "$cam_tag" ]; then
+ cam_tag="$1"
+ else
+ echo "Unexpected argument: $1"
+ show_help
+ exit 1
+ fi
+ shift
+ esac
+done
+
case $hostname in
iz*)
@@ -78,9 +93,9 @@ case $hostname in
if [ -z "$CAM_FC" ]; then
CAM_FC="GNU"
fi
- test_file_list="tests_pretag_izumi_${CAM_FC,,}"
- cam_tag=$1_${CAM_FC,,}
+ cam_tag=${cam_tag}_${CAM_FC,,}
baselinedir="/fs/cgd/csm/models/atm/sima/pretag_bl/$cam_tag"
+ chmod_cmd="chmod -R a+r ${baselinedir}"
;;
de*)
@@ -88,9 +103,9 @@ case $hostname in
if [ -z "$CAM_FC" ]; then
CAM_FC="INTEL"
fi
- test_file_list="tests_pretag_derecho"
- cam_tag=$1
+ cam_tag=${cam_tag}_${CAM_FC,,}
baselinedir="/glade/campaign/cesm/community/amwg/sima_baselines/$cam_tag"
+ chmod_cmd=""
;;
* ) echo "ERROR: machine $hostname not currently supported"; exit 1 ;;
@@ -110,6 +125,12 @@ if [ -n "$CESM_TESTDIR" ]; then
if [ -d $CESM_TESTDIR/baselines ]; then
echo "Using cp to archive baselines."
cp -r $CESM_TESTDIR/baselines/. $root_baselinedir/$cam_tag
+ eval ${chmod_cmd}
+ if [ "${symlink}" = true ]; then
+ echo "Establishing symlink from '$root_baselinedir/latest_${CAM_FC,,}' to '$root_baselinedir/$cam_tag'"
+ rm -rf $root_baselinedir/latest_${CAM_FC,,}
+ ln -s $root_baselinedir/$cam_tag $root_baselinedir/latest_${CAM_FC,,}
+ fi
else
echo "Using bless_test_results to archive baselines."
../../cime/CIME/Tools/bless_test_results -p -t '' -c '' -r $CESM_TESTDIR --baseline-root $root_baselinedir -b $cam_tag -f -s
diff --git a/test/system/test_driver.sh b/test/system/test_driver.sh
index c0dc78ae..59df243a 100755
--- a/test/system/test_driver.sh
+++ b/test/system/test_driver.sh
@@ -26,6 +26,7 @@ help () {
echo "${hprefix} [ -j ] (number of jobs for gmake)"
echo "${hprefix} [ --baseline-dir ] (directory for saving baselines of cime tests)"
echo "${hprefix} [ --no-baseline] (baselines of cime tests are not saved)"
+ echo "${hprefix} [ --no-bl-compare] (turns off default baseline path)"
echo "${hprefix} [ --xml-driver ] (mct or nuopc)"
echo "${hprefix} [ --cesm ] (default aux_sima)"
echo "${hprefix} [ --rerun-cesm ] (rerun the cesm tests with the --use-existing-flag)"
@@ -36,7 +37,7 @@ help () {
echo "${hprefix} 'env var1=setting var2=setting '"
echo ""
echo "Supported ENVIRONMENT variables"
- echo "BL_TESTDIR: Default = none (used to set baseline compare dir)"
+ echo "BL_TESTDIR: Default = latest_[CAM_FC] (used to set baseline compare dir)"
echo "CAM_ACCOUNT: Default = none"
echo "CAM_BATCHQ: Default = machine dependent"
echo "CAM_FC: Default = machine dependent"
@@ -80,6 +81,7 @@ interactive=false
use_existing=''
namelists_only=false
batch=false
+baseline_default=true
# Understand where we are and where the CAM root and CIME reside
if [ -n "${CAM_ROOT}" ]; then
@@ -132,6 +134,9 @@ while [ "${1:0:1}" == "-" ]; do
--no-baseline ) no_baseline=false
;;
+ --no-bl-compare ) baseline_default=false
+ ;;
+
-b ) export CAM_BASEBACK="YES"
;;
@@ -253,12 +258,17 @@ case $hostname in
CAM_RESTART_THREADS=1
mach_workspace="/glade/derecho/scratch"
+ default_bl_dir="/glade/campaign/cesm/community/amwg/sima_baselines/latest_${CAM_FC,,}"
-#### # 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 3
-#### fi
+ # Check for CESM baseline directory
+ if [ -z "${BL_TESTDIR}" ] && [ "${baseline_default}" = true ]; then
+ echo "using default BL_TESTDIR of ${default_bl_dir}"
+ BL_TESTDIR=$default_bl_dir
+ fi
+ if [ -n "${BL_TESTDIR}" ] && [ ! -d "${BL_TESTDIR}" ]; then
+ echo "CESM_BASELINE ${BL_TESTDIR} not found. Check BL_TESTDIR for correct tag name."
+ exit 3
+ fi
#-------------------------------------------
@@ -306,11 +316,11 @@ EOF
mach_workspace="/scratch/cluster"
-#### # 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
+ # 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
#-------------------------------------------
@@ -362,12 +372,19 @@ EOF
fi
mach_workspace="/scratch/cluster"
+ default_bl_dir="/fs/cgd/csm/models/atm/sima/pretag_bl/latest_${CAM_FC,,}"
-#### # 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
+ # Check for CESM baseline directory
+ if [ -z "${BL_TESTDIR}" ] && [ "${baseline_default}" = true ]; then
+ echo "using default BL_TESTDIR of ${default_bl_dir}"
+ BL_TESTDIR=$default_bl_dir
+ fi
+
+ # 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
#-------------------------------------------
@@ -421,11 +438,11 @@ EOF
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
+ # 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
#-------------------------------------------
@@ -475,7 +492,7 @@ if [ "${cesm_test_suite}" != "none" -a -n "${cesm_test_mach}" ]; then
for cesm_test in ${cesm_test_suite}; do
- testargs="--xml-category ${cesm_test} --xml-machine ${cesm_test_mach} --retry 2 --no-run"
+ testargs="--xml-category ${cesm_test} --xml-machine ${cesm_test_mach} --retry 2"
if [ -n "${use_existing}" ]; then
test_id="${use_existing}"