-
Notifications
You must be signed in to change notification settings - Fork 115
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
feat(rct): renamed SRB to RCT, and created IMD Package #68
Merged
langevin-usgs
merged 40 commits into
MODFLOW-USGS:transport
from
langevin-usgs:transport-rct
Dec 27, 2018
Merged
feat(rct): renamed SRB to RCT, and created IMD Package #68
langevin-usgs
merged 40 commits into
MODFLOW-USGS:transport
from
langevin-usgs:transport-rct
Dec 27, 2018
Conversation
This file contains 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
First crack at the sorption package. The GwtSrbModule has been implemented, but has not yet been added to the gwt model. The source compiles and existing tests run and pass so the new code doesn't break anything.
Sorption package is up and running and has a test, input instructions, and flopy support. Right now it only has equilibrium-control linear sorption. Should also add Freundlich, Langmuir and the nonequilibrium options that are in MT3D. And what about dual-domain? Does that go here? And there may still be a question about the volume that should be used for calculating sorption. Right now, we are using Vcell, but this might need another look. Also still need to add and test observations.
Removed a statement that was left in by accident.
docs(readme): fix directory name
Fix to apply ptc during steady-state stress periods to models using the Newton-Raphson formulation and including the STO package. Previously ptc was only applied to models using the Newton-Raphson formulation and no STO package - this is not the intended behaviour. Also migrated DEV_NO_PTC option to NO_PTC option. Added autotest (test_gwf_ptc01) that tests that the same results are achieved for problems with and without the STO packages (this test is identical to MODFLOW-NWT Problem 3 - low recharge). closes MODFLOW-USGS#47
Updated the code.json writer to use an ordered dictionary so that the order is always the same. This will minimize the number of changes that appear in the changelog due to ordering changes that do not change content.
…to develop # Conflicts: # README.md # code.json # doc/version.tex # src/Utilities/version.f90 # version.txt
Refactor dclosetest and replace with IS_SAME in GenericUtilities. Convert IS_SAME to logical function and allow passing of evaluation value (eps). If eps is not passed then DSAME is used. Modified calls to dclosetest to IS_SAME but did not pass an eps value (unlike what was done previously). All tests pass so current tests are not sensitive to a passed eps value. Need to monitor this for timeseries functionality which used dclosetest.
…to develop # Conflicts: # README.md # code.json # version.txt
…MODFLOW-USGS#50) Updated the code.json writer to use an ordered dictionary so that the order is always the same. This will minimize the number of changes that appear in the changelog due to ordering changes that do not change content.
# Conflicts: # README.md # code.json # doc/version.tex # src/Utilities/version.f90 # version.txt
Small improvements to ptc to reduce the ptcdel value loaded on the diagonal.
…or LGR The sign for the face normal needed to be flipped for model 2 so that specific discharge would be calculated correctly. Added a test to make sure that the velocities are correct. Addresses MODFLOW-USGS#51.
…or LGR Updated the release notes and added some docstrings to the autotest.
Modified the pbservation process to use non-advancing output instead of fixed length strings when writing ascii output. The previous use of fixed length strings resulted in truncation of ascii observation output when the product of user-specified digits + 7 and the number of observations exceeded 5000. Closes MODFLOW-USGS#54
# Conflicts: # doc/ReleaseNotes/ReleaseNotes.tex
… LGR (MODFLOW-USGS#56) * refactor(pre-commit.py): use OrderdedDict to load and write code.json Updated the code.json writer to use an ordered dictionary so that the order is always the same. This will minimize the number of changes that appear in the changelog due to ordering changes that do not change content. * fix(GwfGwfExchangeModule): specific discharge not updated correctly for LGR The sign for the face normal needed to be flipped for model 2 so that specific discharge would be calculated correctly. Added a test to make sure that the velocities are correct. Addresses MODFLOW-USGS#51. * fix(GwfGwfExchangeModule): specific discharge not updated correctly for LGR Updated the release notes and added some docstrings to the autotest.
- `double` → `double precision` - `valid_values` → `valid` - `in_record = false` → `in_record false`
…GS#60) * refactor(pre-commit.py): use OrderdedDict to load and write code.json Updated the code.json writer to use an ordered dictionary so that the order is always the same. This will minimize the number of changes that appear in the changelog due to ordering changes that do not change content. * fix(GwfGwfExchangeModule): specific discharge not updated correctly for LGR The sign for the face normal needed to be flipped for model 2 so that specific discharge would be calculated correctly. Added a test to make sure that the velocities are correct. Addresses MODFLOW-USGS#51. * fix(GwfGwfExchangeModule): specific discharge not updated correctly for LGR Updated the release notes and added some docstrings to the autotest. * docs(mf6ivar): readme.md needed a description of the valid keyword
# Conflicts: # README.md # code.json # doc/version.tex # src/Utilities/version.f90 # version.txt
…r changes Also added additional checks to make sure that ssm is used if there are sources/sinks in the model; fixed a problem with pointers in the dispersion package (we need to revisit the memory manager for the mem_setptr case because the underlying mt object isn't being updated if a pointer is reset.
…W-USGS#64) * refactor(pre-commit.py): use OrderdedDict to load and write code.json Updated the code.json writer to use an ordered dictionary so that the order is always the same. This will minimize the number of changes that appear in the changelog due to ordering changes that do not change content. * fix(GwfGwfExchangeModule): specific discharge not updated correctly for LGR The sign for the face normal needed to be flipped for model 2 so that specific discharge would be calculated correctly. Added a test to make sure that the velocities are correct. Addresses MODFLOW-USGS#51. * fix(GwfGwfExchangeModule): specific discharge not updated correctly for LGR Updated the release notes and added some docstrings to the autotest. * docs(mf6ivar): readme.md needed a description of the valid keyword * Corrected misspelling of execution in the release notes.
… and budget not implemented yet
Still need to break the budget into the individual components, not just the transfer to the immobile domain
By making the IMD Package a BndType Package, users can add as many immobile domains as desired. This means that triple porosity systems can be simulated by specifying two immobile domain packages. Or the user can specify n number of IMD Packages. Still more to do. Need ability to output immobile domain concentration. Need to refactor the Reactions Package to remove the immobile domain capability. Need to update the definition files and add one for IMD. Need to add tests.
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.
Renamed the Sorbtion Package to Reactions (RCT) Package. Implemented an Immobile Domain (IMD) Package, so that any number of immobile domains can be specified. The immobile domain capabilities are still part of the RCT package, so these need to be removed. Test and mf6io have been revised, and a dfn file has been created for IMD.