fix issues in rebase

ESMCI · Jun 9, 2017 · c3d6262 · c3d6262
1 parent f8d5147
commit c3d6262
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/scripts/lib/CIME/XML/entry_id.py b/scripts/lib/CIME/XML/entry_id.py
@@ -416,11 +416,11 @@ def compare_xml(self, other):
                                 f1value_nodes = self.get_nodes("value", root=node)
                                 for valnode in f1value_nodes:
                                     f2valnodes = other.get_nodes("value", root=f2match, attributes=valnode.attrib)
-                                for f2valnode in f2valnodes:
-                                    if valnode.attrib is None and f2valnode.attrib is None or \
-                                       f2valnode.attrib == valnode.attrib:
-                                        if other.get_resolved_value(f2valnode.text) != self.get_resolved_value(valnode.text):
-                                            xmldiffs["{}:{}".format(vid, valnode.attrib)] = [valnode.text, f2valnode.text]
+                                    for f2valnode in f2valnodes:
+                                        if valnode.attrib is None and f2valnode.attrib is None or \
+                                           f2valnode.attrib == valnode.attrib:
+                                            if other.get_resolved_value(f2valnode.text) != self.get_resolved_value(valnode.text):
+                                                xmldiffs["{}:{}".format(vid, valnode.attrib)] = [valnode.text, f2valnode.text]
         return xmldiffs
 
     def __iter__(self):

diff --git a/scripts/lib/CIME/XML/env_mach_pes.py b/scripts/lib/CIME/XML/env_mach_pes.py
@@ -63,6 +63,8 @@ def get_total_tasks(self, comp_classes):
             pstrid = self.get_value("PSTRID", attribute={"component":comp})
             tt = rootpe + (ntasks - 1) * pstrid + 1
             total_tasks = max(tt, total_tasks)
+        import pdb
+        pdb.set_trace()
         total_tasks *= self.get_value("NINST_CPL")
         return total_tasks
 

diff --git a/scripts/lib/CIME/case.py b/scripts/lib/CIME/case.py
@@ -636,7 +636,7 @@ def _setup_mach_pes(self, pecount, ncouplers, ninst, machine_name, mpilib):
         ftype = gfile.get_id()
         expect(ftype == "env_mach_pes.xml" or ftype == "config_pes", " Do not recognize {} as a valid CIME pes file {}".format(self._pesfile, ftype))
         if ftype == "env_mach_pes.xml":
-            new_mach_pes_obj = EnvMachPes(infile=self._pesfile, components=self._components)
+            new_mach_pes_obj = EnvMachPes(infile=self._pesfile, components=self._component_classes)
             self.update_env(new_mach_pes_obj, "mach_pes")
             return new_mach_pes_obj.get_value("TOTALPES")
         pesobj = Pes(self._pesfile)

diff --git a/scripts/lib/CIME/case_submit.py b/scripts/lib/CIME/case_submit.py
@@ -16,8 +16,6 @@
 logger = logging.getLogger(__name__)
 
 def _submit(case, job=None, resubmit=False, no_batch=False, skip_pnl=False, batch_args=None):
-    caseroot = case.get_value("CASEROOT")
-
     if job is None:
         if case.get_value("TEST"):
             job = "case.test"
@@ -32,7 +30,7 @@ def _submit(case, job=None, resubmit=False, no_batch=False, skip_pnl=False, batc
             case.set_value("CONTINUE_RUN", True)
     else:
         if job in ("case.test","case.run"):
-            check_case(case, caseroot)
+            check_case(case)
             check_DA_settings(case)
             if case.get_value("MACH") == "mira":
                 with open(".original_host","w") as fd:
@@ -93,7 +91,7 @@ def submit(case, job=None, resubmit=False, no_batch=False, skip_pnl=False, batch
 
         raise
 
-def check_case(case, caseroot):
+def check_case(case):
     check_lockedfiles(case)
     create_namelists(case) # Must be called before check_all_input_data
     logger.info("Checking that inputdata is available as part of case submission")