update cice and cdeps for regression failures,Changelog for PR,scam t…

…o use coldstart, restore ne30 defaults in pes configure

.gitmodules

@@ -151,7 +151,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.45
+fxtag = cdeps1.0.48
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
 
@@ -172,7 +172,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
 [submodule "cice"]
 path = components/cice
 url = https://github.com/ESCOMP/CESM_CICE
-fxtag = cesm_cice6_5_0_10
+fxtag = cesm_cice6_5_0_12
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
 

cime_config/config_pes.xml

@@ -112,6 +112,43 @@
       </pes>
     </mach>
   </grid>
+  <grid name="a%ne30" >
+    <mach name="any">
+      <pes pesize="any" compset="any">
+	<comment>none</comment>
+	<ntasks>
+	  <ntasks_atm>-4</ntasks_atm>
+	  <ntasks_lnd>-4</ntasks_lnd>
+	  <ntasks_rof>-4</ntasks_rof>
+	  <ntasks_ice>-4</ntasks_ice>
+	  <ntasks_ocn>-4</ntasks_ocn>
+	  <ntasks_glc>-4</ntasks_glc>
+	  <ntasks_wav>-4</ntasks_wav>
+	  <ntasks_cpl>-4</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>
+  </grid>
   <grid name="a%ne30" >
     <mach name="hobart|izumi">
       <pes pesize="any" compset="any">

cime_config/testdefs/testlist_cam.xml

@@ -1165,7 +1165,7 @@
       <option name="wallclock">00:30:00</option>
     </options>
   </test>
-  <test compset="QPC6" grid="ne3_ne3_mg37" name="SCT_D_Ln7_Vnuopc" testmods="cam/scm_prep_c6">
+  <test compset="QPC6" grid="ne3_ne3_mg37" name="SCT_D_Ln7" testmods="cam/scm_prep_c6">
     <machines>
       <machine name="izumi" compiler="gnu" category="aux_cam"/>
     </machines>
@@ -1358,7 +1358,7 @@
       <option name="wallclock">00:30:00</option>
     </options>
   </test>
-  <test compset="QPC5" grid="ne3_ne3_mg37" name="SCT_D_Ln7_Vnuopc" testmods="cam/scm_prep">
+  <test compset="QPC5" grid="ne3_ne3_mg37" name="SCT_D_Ln7" testmods="cam/scm_prep">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cam"/>
     </machines>
@@ -1474,7 +1474,7 @@
   </test>
 
 <!--              CAM SCAM runs                      -->
-  <test compset="FSCAMARM97" grid="T42_T42" name="SMS_D_Ln9_Vnuopc" testmods="cam/outfrq9s">
+  <test compset="FSCAMARM97" grid="T42_T42" name="SMS_D_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cam"/>
       <machine name="derecho" compiler="intel" category="test_scam"/>
@@ -1484,7 +1484,7 @@
       <option name="wallclock">00:10:00</option>
     </options>
   </test>
-  <test compset="FSCAMARM97" grid="T42_T42" name="SMS_D_Ln9_Vnuopc" testmods="cam/scam_mpace_outfrq9s">
+  <test compset="FSCAMARM97" grid="T42_T42" name="SMS_D_Ln9" testmods="cam/scam_mpace_outfrq9s">
     <machines>
       <machine name="derecho" compiler="intel" category="prealpha"/>
       <machine name="derecho" compiler="intel" category="test_scam"/>

cime_config/usermods_dirs/scam_mandatory/shell_commands

@@ -9,7 +9,7 @@
 ./xmlchange REST_OPTION=never
 
 # Note that clm cannot use initial conditions with SCAM -so will only use specified phenology
-# Only change if CLM_FORCE_COLDSTART exists and dycore is eulerian
-if [ `./xmlquery --value CAM_DYCORE` == 'eul' ] && [ `./xmlquery --value CLM_FORCE_COLDSTART |& grep -c 'ERROR'` -eq 0 ]; then
+# Only change if CLM_FORCE_COLDSTART exists.
+if [ `./xmlquery --value CLM_FORCE_COLDSTART 2>&1 | grep -c 'ERROR'` -eq 0  ]; then
 ./xmlchange CLM_FORCE_COLDSTART='on'
 fi