Refactor such that SpLUT is implemented with XMacros#27
Closed
mabruzzo wants to merge 449 commits into
Closed
Conversation
…sary now that the cool1d_cloudy_old_tables_g.F bug is fixed While I haven't tested it (I don't currently have access to an appropriate system), it should be fine since I was originally the one who originally added the flag (and I don't think anyone uses it)
A handful of c functions had a `[-Wreturn-type]` compiler warning where a function was supposed to return a value but had at least 1 control flow branch where we didn't return anything.
I realized that the running the code on MacOS machine with CMAKE_BUILD_TYPE=Release and CMAKE_BUILD_TYPE=Debug produces slightly different answers. The flags used in these cases are: - Release: -O3 - Debug: -g This is fairly disturbing since it should not make a difference (-O3 does not enable any floating point optimizations). While I haven't tested it, I'm **extremely** confident that this isn't a CMake issue. But I'm not really sure what we can do... Let's keep track of this
…cution Make `pytest` invokable from the root directory
…ugfixes Backport some minor bugfixes
Co-authored-by: Britton Smith <brittonsmith@gmail.com>
Co-authored-by: Britton Smith <brittonsmith@gmail.com>
…tructions Add instructions for running the corelib tests
mach file for fedora
…atPrecision Add a consistency check for the precision of gr_float
…ies.data_path.grackle_data_dir`` in external code. The whole premise is that PR grackle-project#237 is proposing an alternative approach that for managing data file locations, and I would prefer not to have multiple similar ways to do something like managing data files: - I happen to think that the alternative is much more robust (i.e. it does not require that a source directory is maintained in perpetuity and that the correct version of the source directory is checked out) - importantly, it is an approach that will work in C, C++, Fortran, and Python If we ultimately decide not to use the approach presented in PR grackle-project#237, we can always expose this part of the API later.
CI: shift core-library tests to a separate "job"
Co-authored-by: Britton Smith <brittonsmith@gmail.com>
Dependency group
Merge 'ncc-speedup-test_models' into ncc-answers
…_models [newchem-cpp] Speedup test_models.py by direct importing
[newchem-cpp] Add model tests for newchem-cpp functionality
The intention here is to merge this commit into the main branch while we configure pre-commit to run code formatting/linting in the newchem-cpp branch. PR grackle-project#287 (where we start configuring pre-commit to run formatting/linting) is configured so all changes build off this commit (in other words, there won't be any merge conflicts when we ultimately merge newchem-cpp into main). If we don't merge a .pre-commit-config.yaml file into the main branch, then pre-commit.ci will report a failure (since it can't find a .pre-commit-config.yaml file)
I also fixed some of the errors it found
…cribe/solve_rate_cool_g
…ribe/consistency-tweaks
…cribe/internal_types_updates
…sitor subdirectory)
…ranscribe/Implement-SpLUT-with-XMacros
Author
|
superseded by grackle-project#353 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This PR must be reviewed after #26 is merged
Previously, the SpLUT was implemented as a manually maintained list of all possible primordial, metal and dust species.
This PR consists of 3 commits:
SpLUTcorresponding to dust grains so that they are more consistent with the names tracked ingrackle_field_data. For the sake of consistency, I made the same modification to members ofOnlyGrainSpLUTSpLUT::SiO2Dis nowSpLUT::SiO2_dust(be aware, this is distinct from theSpLUT::SiO2entry)SpLUT::reforgis nowSpLUT::ref_org_dustSpLUT::volorgis nowSpLUT::vol_org_dustSpLUT::H20iceis nowSpLUT::H2O_ice_dust_dust(e.g.SpLUT::SiMis nowSpLUT::SiM_dust)grackle_field_data_fdatamembers.definto 2 files.1field_data_evolved_species.defcontains all species fields that are evolved by grackle. In other words, these are the primordial species, dust species, and grain species (these all have corresponding entries withinSpLUTfield_data_misc_fdatamembers.defcontains all of the other fieldsSpLUTto actually make use of the XMacros fromfield_data_evolved_species.defI have manually confirmed that all tests pass
Footnotes
There are other ways I could have accomplished the end-goal without doing this, but they all would require a bunch more work. Plus, I think having 2 files is reasonable since they each contain ~50 entries. ↩