From 5ba36a1935ba202ccd655cfdef62f548f1b3f107 Mon Sep 17 00:00:00 2001
From: R Sansom <eers@leeds.ac.uk>
Date: Fri, 11 Feb 2022 11:59:57 +0000
Subject: [PATCH] Paths updated to be environment variables

---
 config/cesm/machines/config_batch.xml     | 3 ++-
 config/cesm/machines/config_compilers.xml | 2 +-
 config/cesm/machines/config_machines.xml  | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/cesm/machines/config_batch.xml b/config/cesm/machines/config_batch.xml
index 79ef5a2c78f..63fb3f6c0f2 100644
--- a/config/cesm/machines/config_batch.xml
+++ b/config/cesm/machines/config_batch.xml
@@ -162,8 +162,8 @@
     <batch_mail_type_flag>-m</batch_mail_type_flag>
     <batch_mail_type>, bea, b, e, a, n, bes</batch_mail_type>
     <submit_args>
-      <arg flag="-P" name="$PROJECT"/>
       <arg flag="-q" name="$JOB_QUEUE"/>
+      <arg flag="-P" name="$PROJECT"/>
       <arg flag="-l h_rt=" name="$JOB_WALLCLOCK_TIME"/>
     </submit_args>
     <directives>
@@ -206,6 +206,7 @@
   <batch_system MACH="arc4" type="sge">
     <queues>
       <queue walltimemax="48:00:00" nodemin="1" nodemax="149" default="true" >40core-192G.q</queue>
+      <queue walltimemax="48:00:00" nodemax="1">planet.q</queue>
     </queues>
   </batch_system>
 
diff --git a/config/cesm/machines/config_compilers.xml b/config/cesm/machines/config_compilers.xml
index 70cbab45a86..178e229ff4b 100644
--- a/config/cesm/machines/config_compilers.xml
+++ b/config/cesm/machines/config_compilers.xml
@@ -490,7 +490,7 @@ using a fortran linker.
   <LDFLAGS>
     <append>-mkl </append>
   </LDFLAGS>
-  <ESMF_LIBDIR>/nobackup/CESM/esmf_8.2.0/lib/libO/Linux.intel.64.intelmpi.default/</ESMF_LIBDIR>
+  <ESMF_LIBDIR>$ENV{ESMF_LIBDIR}</ESMF_LIBDIR>
 </compiler>
 
 <compiler MACH="athena">
diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
index ea3ee84a6e8..315f36bc1fe 100644
--- a/config/cesm/machines/config_machines.xml
+++ b/config/cesm/machines/config_machines.xml
@@ -123,11 +123,11 @@ This allows using a different mpirun command to launch unit tests
     <COMPILERS>intel</COMPILERS>
     <MPILIBS>intelmpi,openmpi,mpich</MPILIBS>
     <CIME_OUTPUT_ROOT>/nobackup/$ENV{USER}/cesm_sims</CIME_OUTPUT_ROOT>
-    <DIN_LOC_ROOT>/nobackup/CESM/inputdata</DIN_LOC_ROOT>
-    <DIN_LOC_ROOT_CLMFORC>/nobackup/CESM/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
+    <DIN_LOC_ROOT>$ENV{ARC4_CESM2_ROOT}/inputdata</DIN_LOC_ROOT>
+    <DIN_LOC_ROOT_CLMFORC>$ENV{ARC4_CESM2_ROOT}/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>${CIME_OUTPUT_ROOT}/archive/$CASE</DOUT_S_ROOT>
     <BASELINE_ROOT>${CIME_OUTPUT_ROOT}/cesm_baselines</BASELINE_ROOT>
-    <CCSM_CPRNC>$ENV{CESM_HOME}/cime/tools/cprnc/cprnc</CCSM_CPRNC>
+    <CCSM_CPRNC>${CIMEROOT}/tools/cprnc</CCSM_CPRNC>
     <GMAKE>make</GMAKE>
     <GMAKE_J>16</GMAKE_J>
     <BATCH_SYSTEM>sge</BATCH_SYSTEM>