merge develop into vkd #400
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
…rform clean up.
up of constants specified in code (DZERO and DONE) instead of relying on constants module.
allocated using the memory manager. Also fixed issue with SEGFAULT in mf5to6 that was related to a pointer in ChdPackageWriter that was not pointed to null (=> null()) in definition.
test016_Keating_disu_250.
test016_Keating_disu_250. (2)
require successful testing of gfortran-7 and gfortran-8 environments.
Added section for current release and added header for 6.0.3 version changes.
Updated CONTRIBUTING.md and added DEVELOPER.md. DEVELOPER.md probably still needs additional work.
Fix issue reading binary 2d arrays. read_binary_header was imbedded in the row loop of the 2d readers. Modify test_gwf_binaryinput01 to create binary files for strt, idomain, botm, and icelltype for models with layered and non-layered cases.
fix(ArrayReaders): Fix issue reading binary 2d arrays
… and read binary file with open/close statement Reading of the botm discretization array from a binary file had already been tested. This change now tests the model top array being read from a binary file.
The SFR Newton-Raphson iteration description had a typo in it.
The variable rough was incorrectly described in the period block, though it was correct in the outlet block.
Added a new error check for very small time steps. If the value of startime plus the time step length is equal to endtime, then the time step is too small to be differentiated by the program based on the precision of floating point numbers. The program will terminate with an error in this case. The program will also terminate if the storage package and a transient stress period has a time step length of zero. Closes MODFLOW-USGS#42.
Renamed the binary file and time series autotests to be of the form test_gwf_utlxx_purpose. These tests are testing the utility parts of the code, so they are grouped now into a gwf_utl category. We should continue to name our tests in a consistent manner so that we use wildcards with nosetests to test only the things we are working on.
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.
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
… 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.
* changed some things to public in lak, uzf, sfr * fixed minor bug in uzf * updated release notes and dfn files * modified lak to store hlak and clak in the bound array
…GS#355) Write integer cellids to csv files instead of string. Add method to discretization classes to return array of user indices. Refactored table output to use table object instead of UWWORD. closes MODFLOW-USGS#299
…ate (MODFLOW-USGS#359) CSUB source has been modified to report NODATA values for observations that are not calculated during steady-state stress periods. Observations that are not calculated for steady-state stress periods include SKE, SK, SKE-CELL, SK-CELL, DELAY-HEAD, DELAY-PRECONSTRESS, DELAY-GSTRESS, DELAY-ESTRESS, PRECONSTRESS-CELL. Update mfio to reflect these changes. Also modified CSUB observations so that thick-cell observation is correctly calculated during steady-state stress periods. Closes MODFLOW-USGS#300
* update mkdist.py to copy additional MSVS solutions and projects
…DFLOW-USGS#367) * refactor(uzf): refactor uzf to use table object instead of UWWORD Also simplify table object to write tables of unknown length. * refactor(uzf): refactor uzf to use table object instead of UWWORD Simplify table object to write tables of unknown length. Update observations to use table object when PRINT_INPUT (iprpak=1) is specified to write input observation data.
…LOW-USGS#378) * boundary budgets were being calculated using hcof and rhs values from the previous iteration. This could cause drain flows to be into the aquifer, for example. This fix recalculates the package hcof and rhs values in bd using the final head solution. * update release notes to reflect this change
* refactor(src): remove unused variables * update mkdist.py to copy additional MSVS solutions and projects * docs(sfr/lak): couple minor doc changes
…one recarray (MODFLOW-USGS#381) * refactor(lak package dfn - perioddata): combined lakeperioddata and outletperioddata into perioddata * refactor(lak stress period data): updated dfn
* refactor(NumericalSolution): refactor csv output Refactor csv output to save at the end of the each outer iteration. Add options to save separate outer and inner iteration data. closes MODFLOW-USGS#172
Refactor *_cc() methods to pass package integer (ipak) location information and the total number of inner iterations. The ipak variable simplifies construction of the solution outer iteration information for the csv file. The total number of inner iterations makes package convergence csv files consistent with the outer iteration csv file. Update the release notes to reflect recent changes to csv convergence output. Also moved changes for previous versions to release notes appendix (Appendix A).
# Conflicts: # autotest/test_gwf_mvr01.py # autotest/test_gwf_rch01.py # doc/ReleaseNotes/ReleaseNotes.tex # doc/mf6io/mf6ivar/dfn/gwf-npf.dfn # doc/mf6io/mf6ivar/md/mf6ivar.md # doc/mf6io/mf6ivar/tex/gwf-npf-desc.tex # doc/mf6io/mf6ivar/tex/gwf-npf-options.dat # doc/mf6io/mf6ivar/tex/sln-ims-options.dat # doc/mf6io/mf6switches.tex # hook_files.py # post-merge.py # src/Model/GroundWaterFlow/gwf3.f90 # src/Model/GroundWaterFlow/gwf3csub8.f90 # src/Model/GroundWaterFlow/gwf3lak8.f90 # src/Model/GroundWaterFlow/gwf3mvr8.f90 # src/Model/GroundWaterFlow/gwf3sfr8.f90 # src/Model/GroundWaterFlow/gwf3uzf8.f90 # src/Model/ModelUtilities/BndUzfKinematic.f90 # src/Model/ModelUtilities/BoundaryPackage.f90 # src/Model/NumericalModel.f90 # src/Solution/NumericalSolution.f90 # src/Utilities/comarg.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.