V0.6.0 #105
Merged
V0.6.0 #105
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
…tential fix for pip install issue (missing setup.cfg) that seems to occur with python<3.11. Re-add python 3.10 to test.yaml matrix; bump checkout action to v4
…original model top in a model creation context (not when working with a loaded model)
…h python 3.10 (recast unit arrays to int)
…ison criteria; differences probably due to discretization
…to MFnwtModel for consistency with MF6model; only expand thin cells to the minimum thickness if drop_thin_cells=False; otherwise rounding errors can lead to inconsistent cell pinchouts
…s CI failure (passes on other platforms, and locally on macos
…layers of the enclosing parent model
…on-well BCs within LGR areas. (assumes that CHD, DRN, GHB, and RIV cells all represent surface or near-surface features that should be represented in the LGR child model(s) and not the parent model).
…tually returning the next layer above because of incorrect sorting. Include the model top when filling missing layers, in case there are all nans in the botm array; introducing nans into the top can cause issues with partical vertical LGR. feat(with partical vertical LGR:make_lgr_idomain): refactor vertical refinement input to use nccpl (list of LGR child layers in each parent layer), to allow for setup of LGR idomain with partial vertical refinement.
…botm to wells: dictionary input option to facilitate easier testing. LGR parent models, remove wells with >50% of their open interval within the LGR child area; LGR child models, remove wells with <50% of their open interval within the LGR child area. This ensures that pumping wells aren't included twice in a partial vertical LGR case (due to the automated well rellocation routines). Add any dropped wells to dropped_wells_file.
…subset of parent layers). * replace parent_start/end layer configuration input with "vertical_refinement" in each parent layer (int, list or dict), which gets translated to ncppl input to the Flopy Lgr utility * add some additional checks/error traps for invalid refinement input * ensure that child model bottom and parent model top are aligned (no overlap or gaps in numerical grid) * on setup of the Lgr grid, the parent model cell tops/bottoms are collapsed to zero thickness within the child model area(s) (parent model top is also set to child model bottom(s) in the child model area(s)); because of this, some additional logic is needed to disable the "original model top" functionality that is used in the context of the lake package to ensure that supplied bathymetry is always subtracted from the original top (the land surface) in the context of repeated model setups. A better fix would be to ensure that this functionality is only active when the Lake Package is being built. * prevent recharge, SFR and non-Well basic stress boundary conditions from being populated in any parts of the parent model below a child model (assuming that these represent surface or near-surface features that should be represented only in the child model) * wells with > 50% of their open interval within the child model domain get assigned to the child model * wells with > 50% of their open interval in the parent model get assigned to the parent model * added some additional functionality to allow the child model bottom to coincide with a sub-divided parent model bottom (between two supplied raster surfaces) * added some additional testing for LGR grid setup and boundary condition handling for models with partial vertical LGR.
…x error message in mf6model.py
…s must exactly align when snap_to_parent=True. For example, we may want a model that is aligned, but only every n cells, because of grid size considerations.
…ion to include all features in a shapefile except for those specified
…l LGR simulation by working with the simulation-level model dictionary to implement model write functionality that is not included in the simulation-level write_simulation(). Previously, BCs were presumably not getting removed from inactive cells, auxillary header information such as modflow-setup and model version were not getting written to child model package files, and child model SFR packagedata was not getting written to an external file.
…tion or default parent model source data. Add error trap for invalid strt source data and additional testing of strt input options.
…ions; tests(conftest.py): convert path fixtures to pathlib objects
…urce_data=True, don't copy idomain from parent (which will result in all inactive cells in the inset model).
…hin the 'lgr': 'cfg' sub-block (when LGR inset configuration is supplied in the same file; this is mostly done in a test context).
…changes and a threshold distance to determine SFR Package connections between a parent and inset/child LGR model. This fixes previous issue where SFR streams meandering in and out of the inset model were not getting connected to the parent model (due to SFRmaker connecting the segments within either model).
…er package file reference was not getting written to the GWFGWF Exchange file in at least some cases. Integrate GWFGWF and Mover setup; pass gwfgwf object instance to ModflowMvr constructor and add test for reference in gwfgwf file.
…ut so that it doesn't get modified by multiple function calls; this affected instances where list input to a period_stats sub-block was supplied for one period in an multi-stress period model (causing it to be repeated), or to multiple periods.
…in the SFR options block (not clear that this check is needed). Previously was not passing mover option if simulation-level mover package not found.
…ray, since top shouldn't be modified; refactor(sourcedata.setup_array): move resetting of model top to branch where the top modified by supplied lake bathymetry (since this should be the only situation where this is needed)
…ap lower left corner to nearest vertex, since lower left is what is typically specified (previously was snapping upper left corner to upper left vertex, which could lead to unexpected results if lower left y was specified slighly greater than the bottom edge of the desired parent cell). Fix potential inconsistency with lower left and upper left corners by recalculating after grid is snapped.
…lear that this was ever needed
…esp. for grids based on buffers around features
…mf6model_load() for compatibility with flopy f378f84a5677b99191ce178bb1c5b67ac1d1bd66
…RecursionError in Flopy < 3.9
…l around inset model after changes to grid-snapping; include lake connections in layer 0 (default for MF6 is now to keep layer 1 active and simulate lake above layer 1)
…Error for Flopy<3.9
… sfrmaker; switch test outlet location to hopefully make setup_sfr test more robust
… corners outside of the parent model grid
…ecify strt: from_model_top in source_data: block; needed in the case where there is a parent model and default_source_data is set to True. In this case, the default behavior was to set strt from the strt array in the parent model. fix(SFR Package setup:): when setting up inflows; try checking input sites against the routing dictionary as-is, or with the input sites as strings, to support versions of SFRmaker <= 0.11.3 (integer line identifiers) and > 0.11.3 (string line identifiers).
…_array that was causing vertical gaps between LGR inset and parent models with horizontal refinments other than 5.
…et starting heads from parent starting heads
…pdating starting heads from a previous run
Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 3.7.1 to 4.6.9. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@3.7.1...v4.6.9) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.6.9 to 4.7.1. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.6.9...v4.7.1) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.7.1 to 4.7.2. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.7.1...v4.7.2) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…ected across a LGR model interface and the connection threshold distance is large, a circular or double connection going both ways between the two models may result, which can prevent the Mover Package from converging in the simulation. This issue was fixed by adding a check for double connections, and then only retaining the connection with the smallest distance (which should always be correct if the flowline input to the SFR Package was digitized correctly).
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.
No description provided.