Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix #2070 main_v5.0 var list numeric order #2074

Merged
merged 1 commit into from
Mar 10, 2023
Merged

Bugfix #2070 main_v5.0 var list numeric order #2074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions internal/tests/pytests/util/config_metplus/test_config_metplus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,3 +913,18 @@ def test_format_var_items_options_semicolon(config_value,
var_items = config_metplus._format_var_items(field_configs, time_info)
result = var_items.get('extra')
assert result == expected_result

@pytest.mark.util
def test_parse_var_list_double_digit(metplus_config):
"""!This test ensures that parse_var_list returns field info in
numeric order (1,2,...,9,10,11) instead of alphabetical (1,10,11,2,3,etc)
"""
config = metplus_config
for n in range(1, 12, 1):
config.set('config', f'FCST_VAR{n}_NAME', f'fcst_name{n}')
config.set('config', f'OBS_VAR{n}_NAME', f'obs_name{n}')

var_list = config_metplus.parse_var_list(config)
for n, var_item in enumerate(var_list, start=1):
assert var_item['fcst_name'] == f'fcst_name{n}'
assert var_item['obs_name'] == f'obs_name{n}'
2 changes: 1 addition & 1 deletion metplus/util/config_metplus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ def parse_var_list(config, time_info=None, data_type=None, met_tool=None,
if 'ens_output_name' in v.keys():
config.logger.debug(" ens_output_name:"+v['ens_output_name'])
'''
return sorted(var_list, key=lambda x: x['index'])
return sorted(var_list, key=lambda x: int(x['index']))

def _find_var_name_indices(config, data_types, met_tool=None):
data_type_regex = f"{'|'.join(data_types)}"
Expand Down