merge develop into transport #484
Merged
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
* Error introduced as part of recent UZF refactoring * Closes MODFLOW-USGS#273
Implemented new check in develop mode so code bombs with error if memory manager variable not deallocated
…GS#279) * single code base for writing binary budget files for advanced packages * single code base for creating and writing budget tables to list file for advanced packages * implemented for MAW, UZF, LAK, SFR, and MVR * closes MODFLOW-USGS#277 * update mf6exes from 2.0 to 3.0 * will allow generalized transport calculations for advanced packages
…W-USGS#281) * refactor(advanced packages): modify advanced packages to read all static data as part of df() * modify setup_budobj to include the connectivity so that it is available to other models
…W-USGS#288) * User-specified values for RAINFALL, EVAPORATION, RUNOFF, INFLOW, and WITHDRAWAL must be positive. The program worked if these values were negative, but that doesn't necessarily make sense and is probably an input error. * Updated definition file to reflect these changes * Corrected minor typo in lake definition file * Updated release notes to reflect this change * Close MODFLOW-USGS#287
* Also includes a reach volume term written as an aux variable. This is needed for transport. * initialize str so non-ascii characters don't show up in output files * updated notes for these changes
…MODFLOW-USGS#296) * refactor(sfr): Refactor SFR Package to remove use of Geometry objects * doc(pak-ts): update description of package timeseries variables. * ci(yml): update yml to clone shallow copy of flopy and pymake repos * doc(release): Update release notes * Closes MODFLOW-USGS#276, and MODFLOW-USGS#289
This change is required for transport, which accumulates terms in flowja
…SGS#308) Code was incorrectly calculating cell center elevations when nozee was .false. This error would have affected XT3D simulations with unconfined flow and non-zero values specified for ANGLE2 in the NPF Package. It also would affect dispersive transport with XT3D for unconfined conditions.
…DFLOW-USGS#310) Add traps to catch 1) skin factors that are <= 0 when using the SKIN conductance equation and 2) and negative saturated conductances values. Closes MODFLOW-USGS#305
…OW-USGS#303) Full implementation for SFR package. Partial implementation for LAK, MAW, and UZF packages.
…ODFLOW-USGS#315) Also fix some budget reporting issues in the MAW package
…ODFLOW-USGS#316) * change order of time series interpolation so aux is done first in case it is an auxmult column * partially addresses MODFLOW-USGS#314 * updated release notes
This reverts commit 3460cfb.
…DFLOW-USGS#321) * fix(lak): revise the way outlet to-mvr flows are stored in budobj * updated release notes
…d of DHNOFLO to binary file (MODFLOW-USGS#329) * refactor(lak/maw/sfr): for CONSTANT features write fixed value instead of DHNOFLO to binary file * update release notes
… transport (MODFLOW-USGS#339) * feat(transport): update develop with some general routines needed for transport * fix(mover): correct typo in error message * closes MODFLOW-USGS#336 * refactor(disu): correct type in disu error message * closes MODFLOW-USGS#635
…ODFLOW-USGS#338) DNODATA values reported if 1) delay interbed observations are specified and no delay interbeds are specified and 2) interbed observations are specified and the number of interbeds is zero. Added test of all observation types to test_gwf_csub_sk01.py which has no interbeds. closes MODFLOW-USGS#298
Modify mf5to6 to use standard SimVariables.f90 in mf6 src and add ListType variables in original mf5to6 SimVariables.f90 file to SimListVariables.f90 and update use statements.
* refactor(bmi): refactor grid routines Previously we used the 'save' attribute to allocate the memory and persist over the call to the routine. This is not fool proof (multiple calls before using the results will mess things up). After this commit, the caller has to allocate the appropriate memory, similar to get_var_shape. * refactor(bmi): change i6 to i0
* feat(maw): add defined flow correction option
* docs(releasenotes): cleanup for 6.1.1 distribution * removed print_list_entry from discretizationbase
MODFLOW-USGS#474) Add subroutine definitions to all routines and standardize dummy variable names for scalars, integer arrays, and real arrays. Fix simulation script when comparison is mf6.
…ODFLOW-USGS#476) Since tomvr flows are lagged by one non-linear iteration it is possible for tomvr to be numerically greater than the calculated boundary discharge. This can result in small positive values in the lst budget when there should not be (for example, with the drn package). Add check for tomvr/rrate ratio > 1. In this case, set rrate to 0 so that the budget error is correctly accounted for the the lst budget.
…on file for examples (MODFLOW-USGS#477)
…ab6_filename definition (MODFLOW-USGS#479) * docs(gwf-drn.dfn): offer clarification to AUXDEPTHNAME definition * docs(gwf-lak.dfn): replace undefined CTABNAME variable name from tab6_filename definition fixes 384 * docs(gwf-lak.dfn): latex requires underscores be preceded by backslash
# Conflicts: # doc/ReleaseNotes/ReleaseNotes.tex # doc/ReleaseNotes/appendixA.tex # doc/ReleaseNotes/folder_struct.tex # doc/mf6io/mf6ivar/dfn/gwf-lak.dfn # doc/mf6io/mf6ivar/md/mf6ivar.md # doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex # doc/mf6io/mf6noname.tex # doc/mf6io/mf6output.tex # doc/mf6io/mf6switches.tex # make/makefile # msvs/mf6core.vfproj # src/Model/GroundWaterFlow/gwf3.f90 # src/Model/GroundWaterFlow/gwf3sfr8.f90 # src/SimulationCreate.f90 # src/Utilities/Constants.f90 # src/Utilities/defmacro.fpp # utils/mf5to6/make/makefile # utils/mf5to6/msvs/mf5to6.vfproj # utils/zonebudget/make/makefile # utils/zonebudget/msvs/zonebudget.vfproj
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.