-
-
Notifications
You must be signed in to change notification settings - Fork 409
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.
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
Dilution factor fix #956
Dilution factor fix #956
Conversation
'CSVY field descriptions exist without corresponding csv data' | ||
if unsupported_columns != set(): | ||
logger.warning("The following columns are specified in the csvy" | ||
"model file, but are IGNORED by TARDIS: %s"%(str(unsupported_columns))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"model file, but are IGNORED by TARDIS: %s"%(str(unsupported_columns))) | |
"model file, but are IGNORED by TARDIS: {0}".format(unsupported_columns))) |
and is this shifting the dilution factor into the code. it doesn't look like it. |
@@ -562,8 +580,8 @@ def from_csvy(cls, config): | |||
|
|||
dilution_factor = None | |||
if hasattr(csvy_model_data, 'columns'): | |||
if 'w' in csvy_model_data.columns: | |||
dilution_factor = csvy_model_data['w'].iloc[0:].to_numpy() | |||
if 'dilution_factor' in csvy_model_data.columns: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wkerzendorf is this what you meant by "shifting the dilution factor into the code?" This is the change that loads the given dilution factor profile into the csvy model.
* Replaced 'w' with 'dilution_factor' in csvy model * Added Warning for unsupported CSVY columns * Changed supported column checks to use Sets
No longer use the name 'w' because it is confused with atomic symbol for Tungsten.