Merge branch 'jgfouca/update_to_cime_5.3.0.34' into next (PR #1788)

Merge #5 for this PR.
E3SM-Project · Oct 4, 2017 · c99f89e · c99f89e
2 parents 808389a + 47d3e20
commit c99f89e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cime/config/acme/allactive/config_pesall.xml b/cime/config/acme/allactive/config_pesall.xml
@@ -6706,8 +6706,8 @@
         <comment>ne4 grid on 4 nodes pure-MPI </comment>
         <ntasks>
           <ntasks_atm>96</ntasks_atm>
-          <ntasks_ice>96</ntasks_ice>
-          <ntasks_cpl>96</ntasks_cpl>
+          <ntasks_ice>36</ntasks_ice>
+          <ntasks_cpl>36</ntasks_cpl>
           <ntasks_lnd>36</ntasks_lnd>
           <ntasks_rof>36</ntasks_rof>
           <ntasks_ocn>36</ntasks_ocn>
@@ -6728,8 +6728,8 @@
           <rootpe_atm>0</rootpe_atm>
           <rootpe_ice>0</rootpe_ice>
           <rootpe_cpl>0</rootpe_cpl>
-          <rootpe_lnd>108</rootpe_lnd>
-          <rootpe_rof>108</rootpe_rof>
+          <rootpe_lnd>36</rootpe_lnd>
+          <rootpe_rof>36</rootpe_rof>
           <rootpe_ocn>108</rootpe_ocn>
           <rootpe_glc>0</rootpe_glc>
           <rootpe_wav>0</rootpe_wav>

diff --git a/cime/scripts/lib/CIME/wait_for_tests.py b/cime/scripts/lib/CIME/wait_for_tests.py
@@ -56,7 +56,7 @@ def create_cdash_test_xml(results, cdash_build_name, cdash_build_group, utc_time
     site_elem = xmlet.Element("Site")
 
     if ("JENKINS_START_TIME" in os.environ):
-        time_info_str = "Total testing time: {:d} seconds".format(current_time - int(os.environ["JENKINS_START_TIME"]))
+        time_info_str = "Total testing time: {:d} seconds".format(int(current_time) - int(os.environ["JENKINS_START_TIME"]))
     else:
         time_info_str = ""