Updating scripts and documentation to reflect NCAR's move from Cheyen…

…ne to Derecho clusters

scm/doc/TechGuide/chap_cases.rst

@@ -146,7 +146,7 @@ are included in ``ccpp-scm/scm/data/processed_case_input/fv3_model_point_noah[mp
 .. literalinclude:: arm_case_header.txt
     :name: lst_case_input_netcdf_header_arm
     :caption: example NetCDF file (CCPP-SCM format) header for case initialization and forcing data
- 
+
 Case input data file (DEPHY format)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -505,10 +505,10 @@ Optional arguments:
 Examples to run from within the ``scm/etc/scripts`` directory to create SCM cases starting
 with the output from a UFS Weather Model regression test(s):
 
-On the supported platforms Cheyenne (NCAR) and Hera (NOAA), there are
+On the supported platforms Derecho (NCAR) and Hera (NOAA), there are
 staged UWM RTs located at:
 
--  Cheyenne ``/glade/scratch/epicufsrt/GMTB/CCPP-SCM/UFS_RTs``
+-  Derecho ``/glade/scratch/epicufsrt/GMTB/CCPP-SCM/UFS_RTs``
 -  Hera ``/scratch1/BMC/gmtb/CCPP-SCM/UFS_RTs``
 
 .. _`example1`:
@@ -578,7 +578,7 @@ for more details.
 
 For the purposes of this example the ``control_p8`` test has already been rerun, but if
 starting from your own UWM RTs, you can rerun the UWM regression test,
-on Cheyenne for example, by running the following command in the RT
+on Derecho for example, by running the following command in the RT
 directory: ``qsub job_card``
 
 Now the cases can be generated with the following command:

scm/etc/scm_qsub_example.py

@@ -3,10 +3,15 @@
 -----------------------------------------------------------------------
  Description:  Example script to submit a job through the HPC batch system
 
- Assumptions: For use on Cheyenne. This script must be copied to the bin directory.
+ Assumptions: For use on Derecho. This script must be copied to the bin directory.
               The user should edit the JOB_NAME, ACCOUNT, etc.
-              ./scm/etc/Cheyenne_setup_intel.sh or
-              ./scm/etc/Cheyenne_setup_gnu.sh must be run before submitting this script
+              Before running this script the environment must be setup.
+              The following are instructions for that:
+              $ module purge
+              $ module use scm/etc/modules
+              $ module load derecho_gnu
+                or
+              $ module load derecho_intel
 
  Command line arguments: none
 

test/README.md

@@ -7,11 +7,11 @@ and suites.  It consists of the following scripts:
 
 * ``rt.sh`` - Driver for the regresion test that builds, runs and calls the summarize.sh script
 * ``rt_test_cases.py``- list of all supported cases and suites
-* ``summarize.sh`` - Called by ``rt.sh`` to parse the output of each test to determine pass/fail		
+* ``summarize.sh`` - Called by ``rt.sh`` to parse the output of each test to determine pass/fail
 
 Currently, the following configurations are supported:
 
-Machine     | Cheyenne       | Hera           | Desktop        |
+Machine     | Derecho        | Hera           | Desktop        |
 ------------| ---------------|----------------|----------------|
 Compiler(s) | Intel, GNU     | Intel          | gfortran       |
 Build Types | Release, Debug | Release, Debug | Release, Debug |
@@ -39,11 +39,11 @@ The debug tests use a reduced runtime for faster turnaround and to conserve comp
 
 # To run the tests (no baseline generation or comparison):
 
-On Cheyenne:
+On Derecho:
 
 ```
 cd test
-./rt.sh cheyenne >& test.out &
+./rt.sh derecho >& test.out &
 ```
 
 On Hera:
@@ -76,4 +76,3 @@ A useful workflow might consist of the following steps:
 2. Run ``rt.sh ${machine} -g <dir>`` to generate a baseline and verify build/run
 3. Make changes to your working copy
 4. Run ``rt.sh ${machine} -c <dir>`` to verify your changes
-

test/rt.sh

@@ -8,7 +8,7 @@
 #
 # Assumptions:
 #
-# Command line arguments: machine name (hera or cheyenne)
+# Command line arguments: machine name (hera or derecho)
 #                         -g <dir> run tests, generate baseline in <dir>
 #                         -c <dir> run tests, compare to baseline in <dir>
 #                         -h display usage
@@ -35,7 +35,7 @@ function usage() {
 }
 
 function wait_for_criteria() {
- 
+
 # Function that iteratively checks the return code of a given Unix command
 # and returns 0 when the command is successful or 1 if not
 
@@ -67,7 +67,7 @@ function wait_for_criteria() {
   fi
 }
 
-machines=( hera cheyenne desktop )
+machines=( hera derecho desktop )
 executable_name=scm
 
 [[ $# -eq 0 ]] && usage                     # Display usage if no command-line arguments
@@ -138,7 +138,7 @@ run_it=0                                           # Set to 1 to skip run (for t
 
 build_types=( Release Debug )                      # Set all instances of CMAKE_BUILD_TYPE
 
-if [ "${machine}" == "Cheyenne" ] ; then
+if [ "${machine}" == "Derecho" ] ; then
   users=( $USER@ucar.edu )
   compilers=( intel gnu )
   use_batch_system=true
@@ -298,13 +298,13 @@ done   # End compiler loop
 n_tests=0
 for compiler in "${compilers[@]}"; do
   for build_type in "${build_types[@]}"; do
-  
+
     echo "-------------------------------------------------------" >> ${TEST_OUTPUT}
     echo "Monitoring ${compiler} ${build_type} run..." >> ${TEST_OUTPUT}
     echo "-------------------------------------------------------" >> ${TEST_OUTPUT}
 
     build_type_lc=$(echo "${build_type}" | tr '[A-Z]' '[a-z]')  # Make build_type all lower case
-    RUN_DIR=$TOP_DIR/scm/run_${compiler}_${build_type_lc}      
+    RUN_DIR=$TOP_DIR/scm/run_${compiler}_${build_type_lc}
     batch_out=${job_prefix}_${compiler}_${build_type_lc}.o*           # Without PID extension
 
 #-----------------------------------------------------------------------