From 89ae1fe5050d171ad48b07001f528df3b1514f6c Mon Sep 17 00:00:00 2001
From: yuanxue2870 <yuan.xue@noaa.gov>
Date: Fri, 16 Feb 2024 21:40:52 +0000
Subject: [PATCH] updated driver scripts and revert build and mpiexec back to
 develop version

---
 build_all.sh                              | 4 ++--
 cmake/mpiexec.hera                        | 2 +-
 reg_tests/global_cycle/driver.hera.sh     | 4 ++--
 reg_tests/global_cycle/driver.hercules.sh | 4 ++--
 reg_tests/global_cycle/driver.jet.sh      | 4 ++--
 reg_tests/global_cycle/driver.orion.sh    | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build_all.sh b/build_all.sh
index 4ab5b6333..3d4bb0805 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -49,7 +49,7 @@ if [[ ! -d "${DIR_ROOT}/ccpp-physics/physics" ]]; then
 fi
 
 # Collect BUILD Options
-CMAKE_FLAGS+=" -DENABLE_DOCS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Release}"
+CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Release}"
 
 # Install options; destination for built executables, libraries, CMake Package config
 CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX:-${DIR_ROOT}} -DCMAKE_INSTALL_BINDIR=${INSTALL_BINDIR:-exec}"
@@ -58,7 +58,7 @@ CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX:-${DIR_ROOT}} -DCMAKE_INS
 # The unit test data download is part of the build system. Not all machines can
 # access the EMC ftp site, so turn off the build (-DBUILD_TESTING=OFF) of the units tests accordingly.
 # Those with access to the EMC ftp site are: Orion and Hera.
-CMAKE_FLAGS+=" -DBUILD_TESTING=${BUILD_TESTING:-ON}"
+CMAKE_FLAGS+=" -DBUILD_TESTING=${BUILD_TESTING:-OFF}"
 
 # Allow users of this script to provide CMake options e.g. -DGFS=ON|OFF to build GFS specific utilities only
 CMAKE_OPTS=${CMAKE_OPTS:-}
diff --git a/cmake/mpiexec.hera b/cmake/mpiexec.hera
index e07596c63..23bec1047 100755
--- a/cmake/mpiexec.hera
+++ b/cmake/mpiexec.hera
@@ -6,7 +6,7 @@
 #   $2+ - Executable and its arguments
 #
 
-ACCOUNT=da-cpu
+ACCOUNT=fv3-cpu
 QOS=debug
 
 NP=$1
diff --git a/reg_tests/global_cycle/driver.hera.sh b/reg_tests/global_cycle/driver.hera.sh
index 7b1128e37..60c81eafe 100755
--- a/reg_tests/global_cycle/driver.hera.sh
+++ b/reg_tests/global_cycle/driver.hera.sh
@@ -82,13 +82,13 @@ TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log05
 export DATA="${DATA_DIR}/test5"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
      -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log
 sbatch --nodes=1 -t 0:01:00 -A $PROJECT_CODE -J chgres_summary -o $LOG_FILE -e $LOG_FILE \
       --open-mode=append -q $QUEUE -d\
-      afterok:$TEST1:$TEST2:$TEST3:$TEST4 << EOF
+      afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}*  > summary.log
 EOF
diff --git a/reg_tests/global_cycle/driver.hercules.sh b/reg_tests/global_cycle/driver.hercules.sh
index 385c3580c..db1cf8431 100755
--- a/reg_tests/global_cycle/driver.hercules.sh
+++ b/reg_tests/global_cycle/driver.hercules.sh
@@ -82,13 +82,13 @@ TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log05
 export DATA="${DATA_DIR}/test5"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
      -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log
 sbatch --nodes=1 -t 0:01:00 -A $PROJECT_CODE -J chgres_summary -o $LOG_FILE -e $LOG_FILE \
       --open-mode=append -q $QUEUE -d\
-      afterok:$TEST1:$TEST2:$TEST3:$TEST4 << EOF
+      afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}*  > summary.log
 EOF
diff --git a/reg_tests/global_cycle/driver.jet.sh b/reg_tests/global_cycle/driver.jet.sh
index fd4f972f9..e88d8b21b 100755
--- a/reg_tests/global_cycle/driver.jet.sh
+++ b/reg_tests/global_cycle/driver.jet.sh
@@ -80,13 +80,13 @@ TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log05
 export DATA="${DATA_DIR}/test5"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
      -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log
 sbatch --partition=xjet --nodes=1  -t 0:01:00 -A $PROJECT_CODE -J summary -o $LOG_FILE -e $LOG_FILE \
        --open-mode=append -q $QUEUE -d\
-       afterok:$TEST1:$TEST2:$TEST3:$TEST4 << EOF
+       afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}* > ./summary.log
 EOF
diff --git a/reg_tests/global_cycle/driver.orion.sh b/reg_tests/global_cycle/driver.orion.sh
index 09e05b47e..472608dcf 100755
--- a/reg_tests/global_cycle/driver.orion.sh
+++ b/reg_tests/global_cycle/driver.orion.sh
@@ -80,13 +80,13 @@ TEST4=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_C
 LOG_FILE=consistency.log05
 export DATA="${DATA_DIR}/test5"
 export COMOUT=$DATA
-TEST2=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
+TEST5=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.jedi_lndincsoilnoahmp \
      -o $LOG_FILE -e $LOG_FILE ./C192.jedi_lndincsoilnoahmp.sh)
 
 LOG_FILE=consistency.log
 sbatch --nodes=1 -t 0:01:00 -A $PROJECT_CODE -J chgres_summary -o $LOG_FILE -e $LOG_FILE \
       --open-mode=append -q $QUEUE -d\
-      afterok:$TEST1:$TEST2:$TEST3:$TEST4 << EOF
+      afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5 << EOF
 #!/bin/bash
 grep -a '<<<' ${LOG_FILE}*  > summary.log
 EOF