From d39619d4f68749fcf957ffc638cf0a13f3041cae Mon Sep 17 00:00:00 2001
From: Steve Goldhaber <goldy@ucar.edu>
Date: Tue, 11 Jan 2022 12:16:49 -0700
Subject: [PATCH] Address issues 498 and 500

---
 bld/build-namelist         |  8 +++++---
 cime_config/config_pes.xml | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/bld/build-namelist b/bld/build-namelist
index 8a9532897e..cbf7e7f3da 100755
--- a/bld/build-namelist
+++ b/bld/build-namelist
@@ -990,7 +990,7 @@ if ($aer_model eq 'mam' ) {
     %modal_groups = ( 'accum'  => [qw(so4 pom soa bc dst ncl)],
                       'aitken' => [qw(so4 soa ncl dst)],
                       'coarse' => [qw(dst ncl so4)],
-                      'primary_carbon' => [qw(pom bc)], 
+                      'primary_carbon' => [qw(pom bc)],
                       'coarse_strat' => [qw(so4)] );
 
     @mode_num_src  = qw(A A A A A);
@@ -1853,7 +1853,7 @@ if (($chem =~ /trop_mozart/ or $chem =~ /trop_strat/ or $chem =~ /waccm_tsmlt/)
                    'num_a1   -> ' => 'mam4_num_a1_emis_file',
                    'num_a2   -> ' => 'num_a2_emis_file',
                    'num_a4   -> ' => 'mam4_num_a4_emis_file',
-                   );								
+                   );
     } elsif ($chem =~ /mam4/) {
         %species = (%species,
                    'SOAG     -> ' => 'soag_emis_file',
@@ -2907,6 +2907,8 @@ if (($phys =~ /cam6/ or $phys =~ /cam_dev/) and $nl->get_value('deep_scheme') =~
 # cam_dev specific namelists
 if ($phys =~ /cam_dev/ and $nl->get_value('deep_scheme') =~ /ZM/) {
     add_default($nl, 'zmconv_parcel_pbl', 'val'=>'.true.');
+} else {
+    add_default($nl, 'zmconv_parcel_pbl', 'val'=>'.false.');
 }
 
 # Radiation scheme
@@ -4645,7 +4647,7 @@ sub check_snapshot_settings {
         if ($use_subcol_microp =~ /$TRUE/io) {
             push (@validList_bc, ("'microp_driver_tend_subcol'"));
         }
-        push (@validList_ac, ("'aero_model_wetdep'", 
+        push (@validList_ac, ("'aero_model_wetdep'",
                               "'radiation_tend'",
                               "'aoa_tracers_timestep_tend'",
                               "'co2_cycle_set_ptend'"));
diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 6ffb5ea9b8..1668901243 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -369,6 +369,41 @@
     </mach>
   </grid>
   <grid name="a%ne120">
+    <mach name="cheyenne">
+      <pes pesize="any" compset="_CAM6|_CAM%DEV">
+	<comment>none</comment>
+	<ntasks>
+	  <ntasks_atm>1800</ntasks_atm>
+	  <ntasks_lnd>1800</ntasks_lnd>
+	  <ntasks_rof>1800</ntasks_rof>
+	  <ntasks_ice>1800</ntasks_ice>
+	  <ntasks_ocn>1800</ntasks_ocn>
+	  <ntasks_glc>1800</ntasks_glc>
+	  <ntasks_wav>1800</ntasks_wav>
+	  <ntasks_cpl>1800</ntasks_cpl>
+	</ntasks>
+	<nthrds>
+	  <nthrds_atm>1</nthrds_atm>
+	  <nthrds_lnd>1</nthrds_lnd>
+	  <nthrds_rof>1</nthrds_rof>
+	  <nthrds_ice>1</nthrds_ice>
+	  <nthrds_ocn>1</nthrds_ocn>
+	  <nthrds_glc>1</nthrds_glc>
+	  <nthrds_wav>1</nthrds_wav>
+	  <nthrds_cpl>1</nthrds_cpl>
+	</nthrds>
+	<rootpe>
+	  <rootpe_atm>0</rootpe_atm>
+	  <rootpe_lnd>0</rootpe_lnd>
+	  <rootpe_rof>0</rootpe_rof>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>0</rootpe_ocn>
+	  <rootpe_glc>0</rootpe_glc>
+	  <rootpe_wav>0</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
+    </mach>
     <mach name="any">
       <pes pesize="any" compset="any">
 	<comment>none</comment>