diff --git a/scripts/metadata_table.py b/scripts/metadata_table.py index 8b0cfc18..30b6aa76 100755 --- a/scripts/metadata_table.py +++ b/scripts/metadata_table.py @@ -921,7 +921,7 @@ def parse_variable(self, curr_line, known_ddts, skip_ddt_check=False): (not MetadataTable.table_start(curr_line))) if valid_line: # variable_start handles exception - local_name = MetadataSection.variable_start(curr_line, self.__pobj) + local_name = MetadataSection.variable_start(curr_line, self.__pobj).lower() else: local_name = None # end if @@ -1003,7 +1003,7 @@ def parse_variable(self, curr_line, known_ddts, skip_ddt_check=False): var_ok = False # end if # end for - pval.append(dim) + pval.append(dim.lower()) else: dim_ok = VarDictionary.loop_var_okay(standard_name=dim, is_run_phase=self.__section_title.endswith("_run")) @@ -1014,10 +1014,14 @@ def parse_variable(self, curr_line, known_ddts, skip_ddt_check=False): var_ok = False # end if cone_str = 'ccpp_constant_one:{}' - pval.append(cone_str.format(dim)) + pval.append(cone_str.format(dim.lower())) # end if # end for # end if + # Special handling for standard_names (convert to lowercase) + if pname == 'standard_name': + pval = pval.lower() + # end if # Add the property to our Var dictionary var_props[pname] = pval # end if diff --git a/scripts/metavar.py b/scripts/metavar.py index 1f320de4..8f283df6 100755 --- a/scripts/metavar.py +++ b/scripts/metavar.py @@ -708,7 +708,7 @@ def call_string(self, var_dict, loop_vars=None): lname = "" for item in dim.split(':'): if item: - dvar = var_dict.find_variable(standard_name=item.lower(), + dvar = var_dict.find_variable(standard_name=item, any_scope=False) if dvar is None: try: diff --git a/test/advection_test/cld_liq.meta b/test/advection_test/cld_liq.meta index 69ad3f4f..e55dcfe7 100644 --- a/test/advection_test/cld_liq.meta +++ b/test/advection_test/cld_liq.meta @@ -52,7 +52,7 @@ [ temp ] standard_name = temperature units = K - dimensions = (horizontal_loop_extent, vertical_layer_dimension) + dimensions = (horizontal_loop_extent, vertical_LAYER_dimension) type = real kind = kind_phys intent = inout