Merge branch 'develop' of https://github.com/NCAR/ccpp-framework into…

… register-phase
NCAR · Sep 14, 2024 · d538375 · d538375
2 parents 97b5047 + af90b94
commit d538375
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/scripts/ccpp_track_variables.py b/scripts/ccpp_track_variables.py
@@ -69,7 +69,7 @@ def create_metadata_filename_dict(metapath):
        with that scheme"""
 
     metadata_dict = {}
-    scheme_filenames = glob.glob(os.path.join(metapath, "*.meta"))
+    scheme_filenames = glob.glob(os.path.join(metapath, "*.meta"), recursive=True)
     if not scheme_filenames:
         raise Exception(f'No files found in {metapath} with ".meta" extension')
 

diff --git a/scripts/var_props.py b/scripts/var_props.py
@@ -936,6 +936,13 @@ def __init__(self, var1_stdname, var1_type, var1_kind, var1_units,
             # end if
         # end if
         if self.__compat:
+            # Only "none" units are case-insensitive
+            if var1_units.lower() == 'none':
+                var1_units = 'none'
+            # end if
+            if var2_units.lower() == 'none':
+                var2_units = 'none'
+            # end if
             # Check units argument
             if var1_units != var2_units:
                 self.__equiv = False

diff --git a/test/var_compatibility_test/test_host.meta b/test/var_compatibility_test/test_host.meta
@@ -26,7 +26,7 @@
 [ errmsg ]
   standard_name = ccpp_error_message
   long_name = Error message for error handling in CCPP
-  units = none
+  units = None
   dimensions = ()
   type = character
   kind = len=512