clean up debug code

utils/python/CIME/case.py

@@ -828,11 +828,13 @@ def create_clone(self, newcase, keepexe=False, mach_dir=None, project=None):
         if newcase_cimeroot != clone_cimeroot:
             logger.warning(" case  CIMEROOT is %s " %newcase_cimeroot)
             logger.warning(" clone CIMEROOT is %s " %clone_cimeroot)
-            logger.warning(" It is NOT recommended to clone cases from different versions of CIMEROOT")
+            logger.warning(" It is NOT recommended to clone cases from different versions of CIME.")
+
 
         # *** create case object as deepcopy of clone object ***
         srcroot = os.path.join(newcase_cimeroot,"..")
         newcase = self.copy(newcasename, newcaseroot, newsrcroot=srcroot)
+        newcase.set_value("CIMEROOT", newcase_cimeroot)
 
         # determine if will use clone executable or not
         if keepexe:

utils/python/CIME/utils.py

@@ -21,8 +21,8 @@ def expect(condition, error_msg, exc_type=SystemExit):
     """
     if (not condition):
         # Uncomment these to bring up a debugger when an expect fails
-        import pdb
-        pdb.set_trace()
+        #import pdb
+        #pdb.set_trace()
         raise exc_type("ERROR: %s" % error_msg)
 
 # Should only be called from get_cime_config()