make cam7 physics directory; allow 32 level cam7; up wallclock limits

bld/configure

@@ -1300,6 +1300,20 @@ EOF
 
 if ($print>=2) { print "Maximum number of sub-columns per column: $psubcols$eol"; }
 
+#-----------------------------------------------------------------------------------------------
+# model_top -- Introduced in cam7 to provide a way to specify the model top
+#              independently of the number of model layers.
+
+# Set default
+my $model_top = 'none';
+$cfg_ref->set('model_top', $model_top);
+
+# user override
+if (defined $opts{'model_top'}) {
+    $cfg_ref->set('model_top', $opts{'model_top'});
+}
+if ($print>=2) { print "model_top: $model_top$eol"; }
+
 #-----------------------------------------------------------------------------------------------
 # Number of vertical levels
 my $nlev = 0;
@@ -1323,7 +1337,7 @@ elsif ($chem_pkg =~ /waccm_/) {
     }
 }
 elsif ($phys_pkg eq 'cam7') {
-    $nlev = 58;
+    $nlev = 32;
 }
 elsif ($phys_pkg eq 'cam6') {
     $nlev = 32;
@@ -1363,23 +1377,6 @@ if ($phys_pkg eq 'spcam_sam1mom' or $phys_pkg eq 'spcam_m2005') {
    $cfg_ref->set('spcam_nz', $nlev-2);
 }
 
-#-----------------------------------------------------------------------------------------------
-# model_top -- Introduced in cam7 to provide a way to specify the model top
-#              independently of the number of model layers.
-
-# Set default
-my $model_top = 'none';
-if ($phys_pkg =~ m/cam7/) {
-    $model_top = 'lt';
-}
-$cfg_ref->set('model_top', $model_top);
-
-# user override
-if (defined $opts{'model_top'}) {
-    $cfg_ref->set('model_top', $opts{'model_top'});
-}
-if ($print>=2) { print "model_top: $model_top$eol"; }
-
 #------------------------------------------------------------------------------------------------
 # chemistry preprocessor....
 #  -- avoid using the chem_preprocessor unless it's required

cime_config/testdefs/testlist_cam.xml

@@ -93,7 +93,7 @@
       <machine name="derecho" compiler="intel" category="aux_cam_short"/>
     </machines>
     <options>
-      <option name="wallclock">00:20:00</option>
+      <option name="wallclock">00:30:00</option>
     </options>
   </test>
 
@@ -1675,7 +1675,7 @@
       <machine name="derecho" compiler="intel" category="camchem"/>
     </machines>
     <options>
-      <option name="wallclock">00:20:00</option>
+      <option name="wallclock">00:30:00</option>
     </options>
   </test>
   <test compset="FCnudged" grid="ne30_ne30_mg17" name="SMS_D_Ln9" testmods="cam/outfrq3s_zmean_nudging">
@@ -2405,7 +2405,7 @@
       <machine name="derecho" compiler="intel" category="aux_cam"/>
     </machines>
     <options>
-      <option name="wallclock">00:40:00</option>
+      <option name="wallclock">00:50:00</option>
     </options>
   </test>
   <test compset="FWHIST" grid="f09_f09_mg17" name="SMS_D_Ln9" testmods="cam/reduced_hist3s">
@@ -2449,7 +2449,7 @@
       <machine name="derecho" compiler="intel" category="aux_cam"/>
     </machines>
     <options>
-      <option name="wallclock">00:10:00</option>
+      <option name="wallclock">00:20:00</option>
     </options>
   </test>
   <test compset="QPX2000" grid="f19_f19_mg17" name="SMS_D_Ln9_P240x3" testmods="cam/outfrq9s_ltr">
@@ -2790,7 +2790,7 @@
       <machine name="derecho" compiler="intel" category="aux_cam"/>
     </machines>
     <options>
-      <option name="wallclock">00:10:00</option>
+      <option name="wallclock">00:20:00</option>
       <option name="comment">WACCM w/ RRTMGP</option>
     </options>
   </test>