Bring in changes from ESCOMP/CAM#1492

Author: nusbaume

.config_files.xml

@@ -5,21 +5,21 @@
 <entry_id>
 
   <!-- This is the same as the default entry in
-       cime/config/cesm/config_files.xml except for the value for clm:
-       In a standalone cam checkout, COMP_ROOT_DIR_CAM is $SRCROOT
+       cime/config/cesm/config_files.xml except for the value for cam-sima:
+       In a standalone cam-sima checkout, COMP_ROOT_DIR_CAM is $SRCROOT
        rather than $SRCROOT/components/cam.
        However, because of the way overrides are handled, we need to
        re-specify the full information here rather than just overriding
-       the value for cam.
+       the value for cam-sima.
   -->
   <entry id="COMP_ROOT_DIR_ATM">
     <type>char</type>
     <default_value>unset</default_value>
     <values>
       <value component="cam"      >$SRCROOT</value>
-      <value component="dlnd"      >$CIMEROOT/src/components/data_comps/dlnd</value>
-      <value component="slnd"      >$CIMEROOT/src/components/stub_comps/slnd</value>
-      <value component="xlnd"      >$CIMEROOT/src/components/xcpl_comps/xlnd</value>
+      <value component="datm"     >$SRCROOT/components/cdeps/datm</value>
+      <value component="satm"     >$CIMEROOT/CIME/non_py/src/components/stub_comps_$COMP_INTERFACE/satm</value>
+      <value component="xatm"     >$SRCROOT/components/cmeps/med_test_comps/xatm</value>
     </values>
     <group>case_comps</group>
     <file>env_case.xml</file>