Merge remote-tracking branch 'upstream/development' into cam_sima_dme

Author: cacraigucar

test/unit/python/sample_files/reg_good_simple.xml

@@ -7,7 +7,7 @@
               units="count" type="integer" access="protected">
       <long_name>Number of horizontal columns</long_name>
       <initial_value>0</initial_value>
-      <initial_value dyn="SE,FV">1</initial_value>
+      <initial_value dyn="SE">1</initial_value>
     </variable>
     <variable local_name="latitude" standard_name="latitude"
               units="radians" type="real" kind="kind_phys"

test/unit/python/test_registry.py

@@ -85,7 +85,9 @@ def setUpClass(cls):
     def test_good_simple_registry(self):
         """Test that a good registry with only variables validates.
         Check that generate_registry_data.py generates good
-        Fortran and metadata files"""
+        Fortran and metadata files. Expectation is that the initial
+        value for ncol will be set to the default of 0 because there is no
+        dycore match"""
         # Setup test
         filename = os.path.join(_SAMPLE_FILES_DIR, "reg_good_simple.xml")
         out_source_name = "physics_types_simple"
@@ -607,6 +609,56 @@ def test_bad_registry_version(self):
         self.assertFalse(os.path.exists(out_meta))
         self.assertFalse(os.path.exists(out_source))
 
+    def test_registry_no_clear_initial_value(self):
+        """
+        Check that generate_registry_data.py throws the correct
+        error message when there is no clear "winner"
+        between the initial_value entries
+        """
+
+        # Setup test
+        infilename = os.path.join(_SAMPLE_FILES_DIR, "reg_good_simple.xml")
+        tree, root = read_xml_file(infilename)
+
+        # Open base XML file:
+        base_tree = ET.parse(infilename)
+        base_root = base_tree.getroot()
+
+        # Write new namelist entry with "bad" value:
+        initial_value_tie_string = \
+        """
+        <variable local_name="myvar" standard_name="variable_with_unclear_initial_value"
+                  units="count" type="integer" access="protected">
+           <long_name>Number of horizontal columns</long_name>
+           <initial_value>2</initial_value>
+           <initial_value dyn="SE">0</initial_value>
+           <initial_value dyn="SE">1</initial_value>
+        </variable>
+        """
+
+        initial_value_tie_entry = ET.fromstring(initial_value_tie_string)
+
+        # Add new namelist entry back to original namelist XML tree:
+        base_root[0].append(initial_value_tie_entry)
+
+        # Write out new, temporary XML namelist file for testing:
+        xml_test_fil = os.path.join(_TMP_DIR, "test_registry_initial_value_tie.xml")
+        base_tree.write(xml_test_fil, encoding="utf-8", xml_declaration=True)
+        filename = os.path.join(_TMP_DIR, "test_registry_initial_value_tie.xml")
+
+        # Attempt to generate registry:
+        with self.assertRaises(CCPPError) as cerr:
+            retcode, files, _ = gen_registry(filename, 'se', _TMP_DIR, 2,
+                                             _SRC_MOD_DIR, _CAM_ROOT,
+                                             loglevel=logging.ERROR,
+                                             error_on_no_validate=True)
+
+        # Check exception message
+        emsg = "Unclear which initial_value to use for myvar. "
+        emsg += "There are at least two configurations with 1 matching attributes"
+
+        self.assertEqual(emsg, str(cerr.exception))
+
     def test_missing_standard_name(self):
         """Test a registry with a missing standard name.
         Check that it does not validate and does not generate any