merge develop into transport #322
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
# Conflicts: # msvs/mf6.vfproj # src/Utilities/BudgetTerm.f90
…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
…into transport
…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
…into transport
…into transport
This change is required for transport, which accumulates terms in flowja
…into transport
…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.
…into transport
…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
…into transport
…into transport
This reverts commit 3460cfb.
…DFLOW-USGS#321) * fix(lak): revise the way outlet to-mvr flows are stored in budobj * updated release notes
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.