Skip to content

Merge NCAR feature/transition-to-capgen-1 (prepare for cap_gen.py, step 1) to master #330

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

Merged
climbfuji merged 5 commits into from
Oct 9, 2020
Merged

Merge NCAR feature/transition-to-capgen-1 (prepare for cap_gen.py, step 1) to master #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1dda224
Remove empty/unused .gitmodules file
climbfuji Sep 19, 2020
3079c24
Remove obsolete warning message from scripts/metadata_parser.py
climbfuji Oct 2, 2020
3fee72a
Merge pull request #326 from climbfuji/update_from_master_20201002_an…
climbfuji Oct 5, 2020
5b6f4c9
Add debug log statements before trying to perform unit conversions
climbfuji Oct 6, 2020
79c0f84
Merge pull request #327 from climbfuji/improve_log_unit_conversion
climbfuji Oct 7, 2020
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
Empty file removed .gitmodules
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions scripts/ccpp_prebuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ def compare_metadata(metadata_define, metadata_request):
if var.units == metadata_define[var_name][0].units:
continue
# Register conversion, depending on the intent for this subroutine.
logging.debug('Registering unit conversion for variable {0} in {1}'.format(var_name, var.container))
if var.intent=='inout':
var.convert_from(metadata_define[var_name][0].units)
var.convert_to(metadata_define[var_name][0].units)
Expand Down
3 changes: 1 addition & 2 deletions scripts/metadata_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ def read_new_metadata(filename, module_name, table_name, scheme_name = None, sub
else:
container = encode_container(module_name, new_metadata_header.title)
else:
logging.warning("DH DEBUG: new_metadata_header.property_table, new_metadata_header.title, scheme_name: {} {} {}".format(new_metadata_header.property_table, new_metadata_header.title, scheme_name))
# Scheme property tables
if new_metadata_header.property_table and new_metadata_header.title == scheme_name:
# If this is a ccpp-table-properties table for a scheme, it can only contain dependencies;
Expand All @@ -171,7 +170,7 @@ def read_new_metadata(filename, module_name, table_name, scheme_name = None, sub
# make sense), we swap the standard name and add a note to the long name
legacy_note = ''
if standard_name == 'horizontal_loop_extent' and scheme_name and \
(table_name.endswith("_init") or table_name.endswith("finalize")):
(table_name.endswith("_init") or table_name.endswith("_finalize")):
logging.warn("Legacy extension - replacing variable 'horizontal_loop_extent'" + \
" with 'horizontal_dimension' in table {}".format(table_name))
standard_name = 'horizontal_dimension'
Expand Down