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

Update master from dtc/develop 2020/03/17 #268

Merged
merged 8 commits into from
Mar 18, 2020
Merged

Update master from dtc/develop 2020/03/17 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7daec21
scripts/mkcap.py: change the log message to match the logic for autom…
climbfuji Jan 22, 2020
745c113
scripts/metadata_parser.py: bugfix for converting optional attribute …
climbfuji Jan 23, 2020
1c41a61
Merge pull request #248 from climbfuji/fix_travis_standalone_build_20…
climbfuji Jan 24, 2020
abbe8ab
Merge pull request #256 from climbfuji/update_dtc_develop_from_master
climbfuji Feb 3, 2020
9c41d33
Merge branch 'fix_log_message_unit_conversions' of https://github.com…
climbfuji Feb 3, 2020
0ea1008
Merge branch 'bugfix_metadata_optional_attribute_master' of https://g…
climbfuji Feb 3, 2020
d9cd9e6
Merge pull request #260 from climbfuji/dom_combine_prs_20200204
climbfuji Feb 6, 2020
5d5f8ec
Merge branch 'dtc/develop' of https://github.com/NCAR/ccpp-framework …
climbfuji Mar 17, 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
2 changes: 1 addition & 1 deletion scripts/metadata_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def read_new_metadata(filename, module_name, table_name, scheme_name = None, sub
container = container,
kind = new_var.get_prop_value('kind'),
intent = new_var.get_prop_value('intent'),
optional = new_var.get_prop_value('optional'),
optional = 'T' if new_var.get_prop_value('optional') else 'F',
)
# Set rank using integer-setter method
var.rank = rank
Expand Down
4 changes: 2 additions & 2 deletions scripts/mkcap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def convert_to(self, units):
function_name = '{0}__to__{1}'.format(string_to_python_identifier(self.units), string_to_python_identifier(units))
try:
function = getattr(unit_conversion, function_name)
logging.info('Automatic unit conversion from {0} to {1} for {2} before entering {3}'.format(self.units, units, self.standard_name, self.container))
logging.info('Automatic unit conversion from {0} to {1} for {2} after returning from {3}'.format(self.units, units, self.standard_name, self.container))
except AttributeError:
raise Exception('Error, automatic unit conversion from {0} to {1} for {2} in {3} not implemented'.format(self.units, units, self.standard_name, self.container))
conversion = function()
Expand All @@ -196,7 +196,7 @@ def convert_from(self, units):
function_name = '{1}__to__{0}'.format(string_to_python_identifier(self.units), string_to_python_identifier(units))
try:
function = getattr(unit_conversion, function_name)
logging.info('Automatic unit conversion from {0} to {1} for {2} after returning from {3}'.format(self.units, units, self.standard_name, self.container))
logging.info('Automatic unit conversion from {0} to {1} for {2} before entering {3}'.format(self.units, units, self.standard_name, self.container))
except AttributeError:
raise Exception('Error, automatic unit conversion from {1} to {0} for {2} in {3} not implemented'.format(self.units, units, self.standard_name, self.container))
conversion = function()
Expand Down