From cfbe500095ccb2201697962bf84adc11c877f2e5 Mon Sep 17 00:00:00 2001
From: Jim Edwards <jedwards@ucar.edu>
Date: Thu, 5 Oct 2017 21:19:29 -0600
Subject: [PATCH] make tests work on congo

---
 config/cesm/machines/config_machines.xml | 2 +-
 scripts/lib/CIME/get_timing.py           | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
index 755fbbf5c46..8c55b92d2a3 100644
--- a/config/cesm/machines/config_machines.xml
+++ b/config/cesm/machines/config_machines.xml
@@ -214,7 +214,7 @@
     <BATCH_SYSTEM>none</BATCH_SYSTEM>
     <SUPPORTED_BY>me@my.address</SUPPORTED_BY>
     <MAX_TASKS_PER_NODE>8</MAX_TASKS_PER_NODE>
-    <MAX_MPITASKS_PER_NODE>4</MAX_MPITASKS_PER_NODE>
+    <MAX_MPITASKS_PER_NODE>8</MAX_MPITASKS_PER_NODE>
     <PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
     <mpirun mpilib="default">
       <executable>mpiexec</executable>
diff --git a/scripts/lib/CIME/get_timing.py b/scripts/lib/CIME/get_timing.py
index 4353f78a860..4ae32edbce4 100644
--- a/scripts/lib/CIME/get_timing.py
+++ b/scripts/lib/CIME/get_timing.py
@@ -125,8 +125,11 @@ def _getTiming(self, inst=0):
         ncpl_base_period = self.case.get_value("NCPL_BASE_PERIOD")
         ncpl = 0
         for compclass in self.case.get_values("COMP_CLASSES"):
-            ncpl = max(ncpl, self.case.get_value("{}_NCPL".format(compclass)))
-        ocn_ncpl = self.case.get_value("OCN_NCPL")
+            comp_ncpl = self.case.get_value("{}_NCPL".format(compclass))
+            if compclass == "OCN":
+                ocn_ncpl = comp_ncpl
+            if comp_ncpl is not None:
+                ncpl = max(ncpl, comp_ncpl)
 
         compset = self.case.get_value("COMPSET")
         if compset is None: