merge develop into transport #269
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
* refactor(tests): to work with recent flopy changes * fix(test_gwf_utl02): added the time series filename due to possible bug in flopy
…ymake functionality (MODFLOW-USGS#117)
…r equal to zero (MODFLOW-USGS#124) * fix(dis/disv): terminate with error if all IDOMAIN values less than or equal to zero * couple fixes to get tests running with new flopy code
…W-USGS#45) Happens on Windows only. It is only used for logging, so no functional change.
…GS#131) * fix(mover): added better error trapping for mover entries * more refactoring to eliminate use of memory manager in the mover object * added characters to error message line length in memory manager * Added mover test with a variety of mover options active * some final cleanups on this mover patch closes MODFLOW-USGS#130 This required some fairly substantial refactoring of the mover object. Instead of looking up information in the memory manager, the mover object is now passed packagemover objects, which should be much more efficient.
…DFLOW-USGS#132) Add mf6 return codes and command args autotest. Update return codes to use select case.
…ODFLOW-USGS#134) Add no_ptc_option FIRST and ALL to no_ptc options keyword. Add autotest (test_gwf_noptc01.py) to test new option against simulation with PTC.
…OW-USGS#146) * fix(auxiliary): corrected inconsistencies and bugs advanced package aux variables Added a new test to make sure the aux variables are being carried correctly into the binary budget files. * More on the auxiliary fix * Another fix to get MAW right
Corrected a dfn typo as first reported here: https://github.com/modflowpy/flopy/pull/574/files
…S#194) * refactor(sfr): converted the first 12 entries of SfrDataType to flat arrays * refactor(sfr): ustrf flattening * refactor(sfr): ftotnd flattening * refactor(sfr): usflow flattening * refactor(sfr): dsflow flattening * refactor(sfr): depth flattening * refactor(sfr): stage and gwflow flattening * refactor(sfr): simevap flattening * refactor(sfr): simrunoff flattening * refactor(sfr): stage0 flattening * refactor(sfr): flattening usflow0 * refactor(sfr): ndiv flattening
…S#202) * refactor(gnc): removed mention of iasln as it was not used and named wrong * refactor(gwf): cleaning up model%ia/ja confusion in gwf * refactor(gwf): cleaning up call statements and arguments * refactor(xt3d): minor comment cleanup This is in preparation to be able to mask a primary connection between two model cells so that an interface model can be used to connect two models
…nst noutlet instead of nlak (MODFLOW-USGS#214) Addresses issue MODFLOW-USGS#200
* fix(npf): reset lastedge to zero This change addresses issue MODFLOW-USGS#216 * test_gwf_npf04_spdis.py updated to multiple stress periods to test this fix
…LOW-USGS#221) Error messages are stored in memory. If something goes terribly wrong, the number of errors can be so large that memory runs out. Limit the number of errors stored, by default, to 1000. The user can control this maximum number by specifying MAXERRORS in the mfsim.nam options block. Number of errors and number of errors above maxerrors are not written to mfsim.lst and to terminal. Closes MODFLOW-USGS#106
…FLOW-USGS#222) * test(gwf_errors): new test to make sure mf6 is failing correctly * cleanup of model testing script
* feat(cmask): skip calculation of amat terms in *_fc and *_fn for masked connections The purpose of this PR is to allow another package or module to shutoff the flow connection between two cells. A connection can be masked by calling set_mask with the position within the ja and amat arrays of the masked connection. A value of zero means the connection is masked. If not used, the masked array points to ja, which has non-zero values for all connections. The first call to set_mask allocates new memory for the masked array of size nja and initializes all values to one.
Commenting out the "conda update conda" line to see what is causing Travis to fail
Try adding back the conda update conda command to see if updating the cache fixed the issue.
…ODFLOW-USGS#226) * reduce repetition in matrix * remove inactive features like sudo and cache: apt * install packages with apt-get rather than miniconda
MODFLOW-USGS#227) * Closes MODFLOW-USGS#133. * Closes MODFLOW-USGS#141. * Closes MODFLOW-USGS#184. * Add summary of issue MODFLOW-USGS#145 to ReleaseNotes
…ODFLOW-USGS#228) * Expose cell x,y values for all DIS - add 'pure virtual' get_cellxy() to DisBaseType plus implementations in DIS, DISV, DISU. * Expose cell x,y values for all DIS, continue - redirect to appropriate type-bound procedures Closes MODFLOW-USGS#204.
- fixed how celly is determined from column numbers
…#242) if modflow6-examples has a branch with the same name as the modflow6 branch that is being tested, then checkout that branch of modflow6-examples for the z01 autotest
…MODFLOW-USGS#246) * refactor(fortran): turned on gfortran flags for better error checking * Close MODFLOW-USGS#182 * removed the min_satthk variable from xt3d as it is not needed
Closes MODFLOW-USGS#183 Added -pedantic -std=f2008 flags for gfortran compiling
…#249) bug could not be reproduced close MODFLOW-USGS#181
* close MODFLOW-USGS#34 * added K22OVERK and K33OVERK NPF options * added test for anisotropy and updated definition files * refactored routine in InputOutput.f90 to eliminate antiquated computed goto statement * updated release notes
…openclose=.true. (MODFLOW-USGS#254) added supportopenclose=.true. to many getblock calls close MODFLOW-USGS#163
* converter had multiple bugs for multiple MNW2 wells that spanned multiple model layers * closes MODFLOW-USGS#185 * added history to converter document
* remove nonstandard fseek and replace with custom fseek_stream() subroutine # Conflicts: # autotest/test000_setup.py # doc/ReleaseNotes/ReleaseNotes.tex # doc/mf6io/mf6ivar/dfn/sim-nam.dfn # src/Model/GroundWaterFlow/gwf3.f90 # src/Model/GroundWaterFlow/gwf3disu8.f90 # src/Model/GroundWaterFlow/gwf3npf8.f90 # src/Model/ModelUtilities/Connections.f90 # src/Solution/NumericalSolution.f90 # src/Solution/SparseMatrixSolver/ims8linear.f90
* feat(disu): adding idomain capability to disu * couple of fixes to get disu working for non-reduced grids * Found another place in disu where a conversion to user node number is required * change variable name todo list: still need to consider converting iac to ia right away change usr to input for variable names so as not to conflict with iausr/jausr in connections add more comprehensive test add idomain validity check support idomain < 0 values * more cleanup on disu idomain support * more disu cleanup and idomain testing * cleanup comments * Updated release notes
* Updated a couple doc files for DISU IDOMAIN changes * Updated version to reflect the upcoming 6.1.0 release
* change from UzfBndKinematic to UzfCellGroup * updated release notes * deallocate a couple NPF variables * close MODFLOW-USGS#107 This change converts the array of structures implemented for UZF into a structure of arrays (contained in UzfCellGroupType) in order to prevent excessive memory requirements.
# Conflicts: # doc/version.py # src/Model/GroundWaterFlow/gwf3.f90
…into transport # Conflicts: # doc/ReleaseNotes/ReleaseNotes.tex # src/Model/GroundWaterFlow/gwf3disu8.f90 # src/Model/ModelUtilities/Connections.f90
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.