Merge branch 'develop' into feature/lowres-b

guillaumevernieres · Feb 4, 2025 · a392f42 · a392f42
2 parents 46e2637 + 4cc4d43
commit a392f42
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/ci/platforms/config.gaea → ci/platforms/config.gaeac5 b/ci/platforms/config.gaea → ci/platforms/config.gaeac5
@@ -2,7 +2,6 @@
 
 export GFS_CI_ROOT=/gpfs/f5/epic/proj-shared/global/GFS_CI_ROOT
 export ICSDIR_ROOT=/gpfs/f5/epic/proj-shared/global/glopara/data/ICSDIR
-export STMP="/gpfs/f5/epic/scratch/${USER}"
 export HPC_ACCOUNT=ufs-ard
 export max_concurrent_cases=5
 export max_concurrent_pr=4
diff --git a/ci/platforms/config.gaeac6 b/ci/platforms/config.gaeac6
@@ -0,0 +1,7 @@
+#!/usr/bin/bash
+
+export GFS_CI_ROOT=/gpfs/f6/drsa-precip3/scratch/${USER}/GFS_CI_ROOT
+export ICSDIR_ROOT=/gpfs/f6/bil-fire8/world-shared/global/glopara/data/ICSDIR
+export HPC_ACCOUNT=drsa-precip3
+export max_concurrent_cases=5
+export max_concurrent_pr=4
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
@@ -728,7 +728,7 @@ CMEPS_predet(){
       CMEPS_RESTART_FH=("${FHMAX}")
     fi
   else
-    if [[ "${DOIAU:-NO}" == "YES" ]]; then
+    if [[ "${DOIAU:-NO}" == "YES" ]] && [[ "${warm_start}" == ".true." ]] ; then
       local restart_interval_start=$(( cmeps_restart_interval + half_window ))
       local restart_interval_end=$(( FHMAX + half_window ))
     else

diff --git a/workflow/generate_workflows.sh b/workflow/generate_workflows.sh
@@ -353,7 +353,15 @@ rm -f stdout
 [[ "${_debug}" == "true" ]] && set -x
 set -u
 machine=${MACHINE_ID}
-. "${HOMEgfs}/ci/platforms/config.${machine}"
+platform_config="${HOMEgfs}/ci/platforms/config.${machine}"
+if [[ -f "${platform_config}" ]]; then
+    . "${HOMEgfs}/ci/platforms/config.${machine}"
+else
+   if [[ "${_set_account}" == "false" ]] ; then
+      echo "ERROR Unknown HPC account!  Please use the -A option to specify."
+      exit 11
+   fi
+fi
 
 # If _yaml_dir is not set, set it to $HOMEgfs/ci/cases/pr
 if [[ -z ${_yaml_dir} ]]; then
@@ -446,8 +454,12 @@ EOM
 done
 
 # Update the account if specified
-[[ "${_set_account}" == true ]] && export HPC_ACCOUNT=${_hpc_account} && \
-   [[ "${_verbose}" == true ]] && printf "Setting HPC account to %s\n\n" "${HPC_ACCOUNT}"
+if [[ "${_set_account}" == true ]] ; then
+   export HPC_ACCOUNT=${_hpc_account}
+   if [[ "${_verbose}" == true ]]; then
+      printf "Setting HPC account to %s\n\n" "${HPC_ACCOUNT}"
+   fi
+fi
 
 # Create the experiments
 rm -f "tests.cron" "${_verbose_flag}"
@@ -470,7 +482,7 @@ for _case in "${_yaml_list[@]}"; do
          fi
          echo "${_message}"
          rm -f stdout stderr
-         exit 11
+         exit 12
       fi
       rm -f stdout stderr
    fi