From 4b14fda6a3646f8e1b4934649034ca4d9435b899 Mon Sep 17 00:00:00 2001
From: Jim Edwards <jedwards@ucar.edu>
Date: Fri, 8 Mar 2024 08:51:09 -0700
Subject: [PATCH 1/2] remove -V option due to issue #4594

---
 machines/Depends.cray     | 2 +-
 machines/config_batch.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/machines/Depends.cray b/machines/Depends.cray
index 68679f02..362847c1 100644
--- a/machines/Depends.cray
+++ b/machines/Depends.cray
@@ -1,4 +1,4 @@
-NOOPTOBJS= ice_boundary.o dyn_comp.o unicon.o
+NOOPTOBJS= ice_boundary.o dyn_comp.o unicon.o SnowHydrologyMod.o
 
 # RRTMGP contains openmp directives for running on GPUs.  These directives need to be
 # disabled to allow building CAM with threading on CPUs enabled.
diff --git a/machines/config_batch.xml b/machines/config_batch.xml
index 290ca327..02e5b82e 100644
--- a/machines/config_batch.xml
+++ b/machines/config_batch.xml
@@ -156,7 +156,7 @@
       <directive default="n"> -r {{ rerunnable }} </directive>
       <!-- <directive> -j oe {{ job_id }} </directive> -->
       <directive> -j oe </directive>
-      <directive> -V </directive>
+      <!--      <directive> -V </directive> -->
     </directives>
   </batch_system>
 

From bd805a28a821dfea13a4d52847800cec10ba1153 Mon Sep 17 00:00:00 2001
From: Jim Edwards <jedwards@ucar.edu>
Date: Fri, 8 Mar 2024 09:10:46 -0700
Subject: [PATCH 2/2] add -V to all non-ncar PBS, remove retired systems

---
 machines/config_batch.xml | 125 ++++----------------------------------
 1 file changed, 11 insertions(+), 114 deletions(-)

diff --git a/machines/config_batch.xml b/machines/config_batch.xml
index 02e5b82e..837d9e88 100644
--- a/machines/config_batch.xml
+++ b/machines/config_batch.xml
@@ -156,7 +156,6 @@
       <directive default="n"> -r {{ rerunnable }} </directive>
       <!-- <directive> -j oe {{ job_id }} </directive> -->
       <directive> -j oe </directive>
-      <!--      <directive> -V </directive> -->
     </directives>
   </batch_system>
 
@@ -185,6 +184,8 @@
     <directives>
       <directive>-l nodes={{ num_nodes }}</directive>
       <directive>-q iccp</directive>
+      <directive> -V </directive> 
+
     </directives>
     <queues>
       <queue walltimemax="24:00:00" default="true" >iccp</queue>
@@ -210,19 +211,6 @@
     </queues>
   </batch_system>
 
-  <!-- bluewaters is PBS -->
-  <batch_system MACH="bluewaters" type="pbs" >
-    <jobid_pattern>(\d+.bw)$</jobid_pattern>
-    <directives>
-      <directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}:xe</directive>
-      <directive default="/bin/bash" > -S {{ shell }} </directive>
-    </directives>
-    <queues>
-      <queue walltimemax="24:00:00">normal</queue>
-      <queue walltimemax="00:30:00" nodemin="1" nodemax="16" default="true">debug</queue>
-    </queues>
-  </batch_system>
-
   <!-- casper pbs -->
   <batch_system MACH="casper" type="pbs">
     <batch_submit>qsub</batch_submit>
@@ -237,47 +225,13 @@
       <directive default="/bin/bash" > -S {{ shell }} </directive>
       <directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:mem=300GB:ngpus={{ ngpus_per_node }} </directive>
     </directives>
-
     <!-- Unknown queues use the batch directives for the regular queue -->
     <unknown_queue_directives>casper</unknown_queue_directives>
-
     <queues>
       <queue walltimemax="12:00:00" nodemin="1" nodemax="10">casper</queue>
     </queues>
   </batch_system>
 
-  <batch_system MACH="cheyenne" type="pbs">
-    <directives queue="regular">
-      <directive default="/bin/bash" > -S {{ shell }}  </directive>
-      <directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}</directive>
-    </directives>
-
-    <directives queue="premium">
-      <directive default="/bin/bash" > -S {{ shell }}  </directive>
-      <directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}</directive>
-    </directives>
-
-    <directives queue="economy">
-      <directive default="/bin/bash" > -S {{ shell }}  </directive>
-      <directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}</directive>
-    </directives>
-
-    <directives queue="share">
-      <directive default="/bin/bash" > -S {{ shell }}  </directive>
-      <directive> -l select=1:mpiprocs={{ total_tasks }}:ompthreads={{ thread_count }}</directive>
-    </directives>
-
-    <!-- Unknown queues use the batch directives for the regular queue -->
-    <unknown_queue_directives>regular</unknown_queue_directives>
-
-    <queues>
-      <queue walltimemax="12:00:00" nodemin="1" nodemax="4032">regular</queue>
-      <queue walltimemax="12:00:00" nodemin="1" nodemax="4032">premium</queue>
-      <queue default="true" walltimemax="06:00:00" jobmin="1" jobmax="18">share</queue>
-      <queue walltimemax="12:00:00" nodemin="1" nodemax="4032">economy</queue>
-    </queues>
-  </batch_system>
-
   <!-- coeus slurm -->
   <batch_system MACH="coeus" type="slurm" >
     <batch_query per_job_arg="-j">squeue</batch_query>
@@ -311,39 +265,6 @@
     </submit_args>
   </batch_system>
 
-  <batch_system MACH="cori-haswell" type="slurm" >
-    <batch_submit>sbatch</batch_submit>
-    <submit_args>
-      <argument> --time $JOB_WALLCLOCK_TIME </argument>
-      <argument> -q $JOB_QUEUE </argument>
-      <argument> --account $PROJECT </argument>
-    </submit_args>
-    <directives>
-      <directive>-C haswell </directive>
-    </directives>
-    <queues>
-      <queue walltimemax="06:00:00" nodemin="1" nodemax="710">regular</queue>
-    <!--  <queue walltimemax="00:30:00" nodemin="1" nodemax="3072" default="true">debug</queue> -->
-    </queues>
-  </batch_system>
-
-  <batch_system MACH="cori-knl" type="slurm" >
-    <batch_submit>sbatch</batch_submit>
-    <submit_args>
-      <argument> --time $JOB_WALLCLOCK_TIME </argument>
-      <argument> -q $JOB_QUEUE </argument>
-      <argument> --account $PROJECT </argument>
-    </submit_args>
-    <directives>
-      <directive>-C knl,quad,cache </directive>
-      <directive>-S 2 </directive>
-    </directives>
-    <queues>
-      <queue walltimemax="02:00:00" nodemin="1" nodemax="177">regular</queue>
-    <!--  <queue walltimemax="00:30:00" nodemin="1" nodemax="3072" default="true">debug</queue> -->
-    </queues>
-  </batch_system>
-
   <batch_system MACH="daint" type="slurm" >
     <batch_submit>sbatch</batch_submit>
     <submit_args>
@@ -450,6 +371,7 @@
       <directive>-d $RUNDIR</directive>
       <directive>-o $RUNDIR/$CASE.out </directive>
       <directive>-S /bin/bash  </directive>
+      <directive>-V</directive>
     </directives>
     <queues>
       <queue walltimemax="01:00:00" nodemin="1" nodemax="35">debug</queue>
@@ -508,28 +430,13 @@
     </queues>
   </batch_system>
 
-  <!-- hobart is PBS -->
-  <batch_system type="pbs" MACH="hobart" >
-    <directives>
-      <directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
-      <directive default="/bin/bash" > -S {{ shell }}  </directive>
-    </directives>
-    <queues>
-      <queue walltimemax="02:00:00"   strict="true" nodemin="1"  nodemax="8">short</queue>
-      <queue walltimemax="08:00:00"   strict="true" nodemin="1"  nodemax="6" default="true">medium</queue>
-      <queue walltimemax="40:00:00"   strict="true" nodemin="1"  nodemax="8">long</queue>
-      <queue walltimemax="80:00:00"   strict="true" nodemin="1"  nodemax="8">verylong</queue>
-      <queue walltimemax="32:00:00"   strict="true" nodemax="16" nodemin="1">overnight</queue>
-      <queue walltimemax="3000:00:00" strict="true" nodemax="32" nodemin="1">monster</queue>
-    </queues>
-  </batch_system>
-
-  <batch_system type="pbs" MACH="izumi" >
+   <batch_system type="pbs" MACH="izumi" >
     <batch_submit>qsub</batch_submit>
     <jobid_pattern>(\d+.izumi.cgd.ucar.edu)$</jobid_pattern>
     <directives>
       <directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
+      <directive> -V </directive>
     </directives>
     <queues>
       <queue walltimemax="02:00:00"   strict="true" nodemin="1"  nodemax="8">short</queue>
@@ -541,16 +448,6 @@
     </queues>
   </batch_system>
 
-  <batch_system MACH="laramie" type="pbs">
-    <directives>
-      <directive default="/bin/bash" > -S {{ shell }}  </directive>
-      <directive> -l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}</directive>
-    </directives>
-    <queues>
-      <queue default="true" walltimemax="12:00" nodemin="1" nodemax="72">regular</queue>
-    </queues>
-  </batch_system>
-
   <batch_system MACH="lawrencium-lr3" type="slurm">
     <batch_submit>sbatch</batch_submit>
     <directives>
@@ -578,17 +475,12 @@
     </queues>
   </batch_system>
 
-  <batch_system MACH="mira" type="cobalt">
-    <queues>
-      <queue walltimemax="06:00:00" nodemin="1" nodemax="12288" default="true">default</queue>
-    </queues>
-  </batch_system>
-
   <!-- modex is PBS -->
   <batch_system MACH="modex" type="pbs">
     <directives>
       <directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
+      <directive> -V </directive>
     </directives>
     <queues>
       <queue walltimemax="36:00:00" default="true">batch</queue>
@@ -632,6 +524,7 @@
       <directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=bro</directive>
       <directive>-l place=scatter:excl</directive>
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
+      <directive> -V </directive>
     </directives>
     <queues>
       <queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
@@ -647,6 +540,7 @@
       <directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=has</directive>
       <directive>-l place=scatter:excl</directive>
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
+      <directive> -V </directive>
     </directives>
     <queues>
       <queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
@@ -662,6 +556,7 @@
       <directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=ivy</directive>
       <directive>-l place=scatter:excl</directive>
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
+      <directive> -V </directive>
     </directives>
     <queues>
       <queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
@@ -677,6 +572,7 @@
       <directive>-l select={{ num_nodes }}:ncpus={{ max_tasks_per_node }}:mpiprocs={{ tasks_per_node }}:ompthreads={{ thread_count }}:model=san</directive>
       <directive>-l place=scatter:excl</directive>
       <directive default="/bin/bash" > -S {{ shell }}  </directive>
+      <directive> -V </directive>
     </directives>
     <queues>
       <queue walltimemax="08:00:00" nodemin="1" nodemax="5256" default="true">normal</queue>
@@ -713,6 +609,7 @@
   <batch_system MACH="swan" type="pbs" >
     <directives>
       <directive>-l nodes={{ num_nodes }}</directive>
+      <directive> -V </directive>
     </directives>
     <queues>
       <queue walltimemax="24:00:00" default="true" >default</queue>