Merge branch 'jgfouca/cime/fix_timer_vals' into master (PR #1727)

Fix values for TIMER_DETAIL and TIMER_LEVEL These got mixed-up in CIME somehow. Fixes #1655 [BFB] * jgfouca/cime/fix_timer_vals: Address GitHub feedback Fix values for TIMER_DETAIL and TIMER_LEVEL
ESMCI · Aug 17, 2017 · a2f76fd · a2f76fd
2 parents 3fbfd19 + 8f81021
commit a2f76fd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/config/config_tests.xml b/config/config_tests.xml
@@ -440,7 +440,6 @@ NODEFAIL          Tests restart upon detected node failure. Generates fake failu
     <STOP_N>0</STOP_N>
     <REST_OPTION>none</REST_OPTION>
     <COMP_RUN_BARRIERS>TRUE</COMP_RUN_BARRIERS>
-    <TIMER_LEVEL>12</TIMER_LEVEL>
     <DOUT_S>FALSE</DOUT_S>
   </test>
 
@@ -530,7 +529,6 @@ NODEFAIL          Tests restart upon detected node failure. Generates fake failu
     <STOP_N>10</STOP_N>
     <REST_OPTION>none</REST_OPTION>
     <COMP_RUN_BARRIERS>TRUE</COMP_RUN_BARRIERS>
-    <TIMER_LEVEL>12</TIMER_LEVEL>
     <DOUT_S>FALSE</DOUT_S>
   </test>
 

diff --git a/src/drivers/mct/bld/testdir/env_run.xml b/src/drivers/mct/bld/testdir/env_run.xml
@@ -279,7 +279,7 @@
       <valid_values/>
       <desc>Where to auto archive timing data</desc>
     </entry>
-    <entry id="TIMER_LEVEL" value="12">
+    <entry id="TIMER_LEVEL" value="20">
       <type>integer</type>
       <desc>timer output depth</desc>
     </entry>

diff --git a/src/drivers/mct/cime_config/config_component.xml b/src/drivers/mct/cime_config/config_component.xml
@@ -940,15 +940,6 @@
     <desc>logical to diagnose model timing at the end of the run</desc>
   </entry>
 
-
-  <entry id="TIMER_LEVEL">
-    <type>integer</type>
-    <default_value>12</default_value>
-    <group>run_flags</group>
-    <file>env_run.xml</file>
-    <desc>timer output depth</desc>
-  </entry>
-
   <entry id="PROFILE_PAPI_ENABLE">
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>

diff --git a/src/drivers/mct/cime_config/config_component_acme.xml b/src/drivers/mct/cime_config/config_component_acme.xml
@@ -33,6 +33,14 @@
   </entry>
 
   <entry id="TIMER_DETAIL">
+    <type>integer</type>
+    <default_value>12</default_value>
+    <group>run_flags</group>
+    <file>env_run.xml</file>
+    <desc>timer output depth</desc>
+  </entry>
+
+  <entry id="TIMER_LEVEL">
     <type>integer</type>
     <default_value>20</default_value>
     <group>run_flags</group>

diff --git a/src/drivers/mct/cime_config/config_component_cesm.xml b/src/drivers/mct/cime_config/config_component_cesm.xml
@@ -50,6 +50,14 @@
     <desc>timer output depth</desc>
   </entry>
 
+  <entry id="TIMER_LEVEL">
+    <type>integer</type>
+    <default_value>12</default_value>
+    <group>run_flags</group>
+    <file>env_run.xml</file>
+    <desc>timer output depth</desc>
+  </entry>
+
   <entry id="BFBFLAG">
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>