diff --git a/cime_config/machines/cmake_macros/tuo_crayamd-mphipcc.cmake b/cime_config/machines/cmake_macros/tuo_crayamd-mphipcc.cmake
index 0fe97c35cefc..77d1be0648d1 100644
--- a/cime_config/machines/cmake_macros/tuo_crayamd-mphipcc.cmake
+++ b/cime_config/machines/cmake_macros/tuo_crayamd-mphipcc.cmake
@@ -10,12 +10,19 @@ set(SCC  "${MPICC}")
 set(SCXX "${MPICXX}")
 set(SFC  "${MPIFC}")
 
+if (compile_threaded)
+  string(APPEND CMAKE_C_FLAGS " -fopenmp")
+  string(APPEND CMAKE_Fortran_FLAGS " -fopenmp")
+  string(APPEND CMAKE_CXX_FLAGS " -fopenmp")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp")
+endif()
+
 if (COMP_NAME STREQUAL gptl)
 	string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
 endif()
 
 # required to resolve bshr_infnan_mod.F90 compile issue
-string(APPEND CPPDEFS " -DCPRCRAY")
+string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRCRAY")
 
 set(USE_HIP "TRUE")
 
diff --git a/cime_config/machines/config_batch.xml b/cime_config/machines/config_batch.xml
index f884ca88450a..cd1923668765 100644
--- a/cime_config/machines/config_batch.xml
+++ b/cime_config/machines/config_batch.xml
@@ -239,9 +239,9 @@
     <depend_separator>:</depend_separator>
     <walltime_format>%Mm</walltime_format>
     <submit_args>
-      <arg flag="--time" name="60m"/>
-      <arg flag="--queue" name="$JOB_QUEUE"/>
-      <arg flag="--bank" name="$PROJECT"/>
+      <arg flag="--time-limit" name="$JOB_WALLCLOCK_TIME"/>
+      <arg flag="-q" name="$JOB_QUEUE"/>
+      <arg flag="-B" name="$PROJECT"/>
     </submit_args>
     <directives>
       <directive> --job-name={{ job_id }}</directive>