-
Notifications
You must be signed in to change notification settings - Fork 56
[newchem-cpp] Remove Hard-coded injection path names from grackle_field_data
#480
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
Open
mabruzzo
wants to merge
179
commits into
grackle-project:newchem-cpp
Choose a base branch
from
mabruzzo:ncc/remove-InjectPathFieldPack
base: newchem-cpp
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[newchem-cpp] Remove Hard-coded injection path names from grackle_field_data
#480
mabruzzo
wants to merge
179
commits into
grackle-project:newchem-cpp
from
mabruzzo:ncc/remove-InjectPathFieldPack
+10,661
−6,326
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There is some unforunate consequences, but if we don't do this you end up with some pretty confusing looking code... (the confusion primarily arises if new_FrozenKeyIdxBiMap or drop_FrozenKeyIdxBiMap has different behavior from other functions with similar names). I really think it would be better to make this into a simple C++ class with a constructor and destructor, but thats a topic for another time
…rp_table_utils.hpp
There's still a lot of work to be done (the type is incomplete and isn't filled by anything at all)
We don't yet use the new format, but we are just about ready to start doing so
This is an important step in order to generalize for modelling arbitrary injection pathway names.
1b615a0 to
1bbb83e
Compare
643a69c to
a41f096
Compare
This a crude hack
This leaves some temporary machinery
a41f096 to
7e2d847
Compare
This is uglier, but the number of inject field paths are now entirely determined by the values read in from the table. To add/remove/rename pathways, you "just" need to modify `inject_model/raw_data.[ch]pp` and `inject_model/load_data.[ch]pp`. This is a massive step that will make it possible to move this data into HDF5 tables
grackle_field_datagrackle_field_data
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To be reviewed after #479 is merged
This PR replaces all hard-coded injection pathway data-members from the
grackle_field_data(e.g.grackle_field_data::local_ISM_metal_density,grackle_field_data::y19_metal_density, ...) with an array of pointers known asgrackle_field_data::inject_pathway_metal_density. In other words, Grackle no longer hardcodes the names of each injection pathway members as part of thegrackle_field_datastruct. (To determine the names, users must use the query-machinery introduced in #479).This is significant for 2 reasons:
grackle_field_datawhenever someone wanted another model (while maintaining members for all existing models)inject_model/raw_data.[ch]ppandinject_model/load_data.[ch]pp.