update master to v6.4.0 #1092
Merged
update master to v6.4.0 #1092
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
…LOW-USGS#925) add option to write MAW extraction and injection flow reductions to csv. Co-authored-by: kzeiler <[email protected]>
Start adding doxygen comments and reformatting older code. Closes MODFLOW-USGS#931
… with flopy's new interface (MODFLOW-USGS#933) * feat(dfn): Move information from flopy.dfn into the header of the package dfns. * fix(test cases): test cases changed to work with new flopy interface * testing * remove test
…FLOW-USGS#934) Fixed indexing error for flow/transport model when MVR is active and aux variables are used for concentrations. Two new autotests patterned after the test_gwt_ssm01FMI autotest drop RIV, add SFR, and add MVR and MVT to transfer water and solute from a WEL to SFR. This condition resulted in an error message that not should have been printed to the screen. However, the error condition only happened when the flow and transport simulations were run simultaneously (the 2nd of the two new autotests). The first autotest runs the models separately and has been added for completeness (tests the same configuration that runs GWF & GWT simultaneously). Both autotests use auxiliary variables and mover in the WEL package, the condition condition that previously triggered an error msg that shouldn't have been triggered (see below).
* Not strictly needed, but why shouldn't we be explicit about it. * Failure is know sporadic failure on macOS
…del (MODFLOW-USGS#939) * The xt3d procedure for storing and adding matrix coefficients for extended xt3d connections did not work for lgr configurations in which a highly refined child model was nested inside a coarser parent model. The logic was improved so that matrix terms added by exchanges were properly handled by the internal calculations used by xt3d. Prior to this fix, the xt3d logic assumed that any matrix terms added to the local model space of the solution were because of xt3d. This can no longer be assumed for lgr configurations.
…GS#940) * create new GwfMvrPeriodData object for reading and storing mover stress period data * store mover stress period data as vectors in the memory manager * revise the low-level mover object to point into the input data * update makefile * doxygenate
* implementation assumes user specifies pxdp in order from low to high and that values are between zero and 1.0. * Addresses MODFLOW-USGS#938 and MODFLOW-USGS#930 * fix duplication of final error message upon termination * update release notes
- Removes compile call. This is already done by install. Now it doesn't give a confusing message anymore. - Print the commands it runs
…OW-USGS#942) * refactor(gwt): set hooks to prepare for for gwe * Update header comments * Add new generalized transport module to meson.build * amendment needed in another makefile as well.
* working toward consistent code formatting
* working toward consistent code formatting
* working toward consistent code formatting
…#936) * add get_version routine to modflow api (xmi) * update xmi get_version
Downgrade GitHub Actions windows VM to use server-2019. Black formatting and isort on python scripts.
* docs: Fix vscode instructions Fixes MODFLOW-USGS#959 * docs: Improve instructions * Update .vscode/README.md Co-authored-by: langevin-usgs <[email protected]> Co-authored-by: langevin-usgs <[email protected]>
* working toward consistent code formatting
* working toward consistent code formatting
* Close MODFLOW-USGS#1043 * When a WITHDRAWAL value was specified for lakes, only the withdrawal value for the last lake would be reported in budget files, lake budget tables, and in lake withdrawal observations. This error would also be propagated to the GWT Lake Transport (LKT) Package, if active. This error would only show up for models with more than one lake and if the lake withdrawal term was included. * When lakes were assigned with the STATUS CONSTANT setting to prescribe the lake stage, the CONSTANT term used in the lake budget table was tabulated using an incorrect sign for aquifer leakage. This error would result in inaccurate budget tables. The program modified to use the correct leakage values for calculating the CONSTANT term. * The BUDGETCSV option was activated to work for the GWT advanced packages; although the keyword option was read, the file remained empty. * A new test was added for LAK and LKT * The bedleak entry in gwf-lak.dfn support was specified as DOUBLE PRECISION even though NONE could be specified. This meant that lake packages could not be loaded by flopy if bedleak was specified as NONE. * The description for the SS_CONFINED_ONLY option in the GWF Storage Package was improved. * The release notes were updated to reflect these changes.
…ODFLOW-USGS#1047) * fix model crash with option SURF_RATE_SPECIFIED and nseg=1 * add a brief description in the release notes
…FLOW-USGS#1049) * release notes was updated in MODFLOW-USGS#1047 and broke nightly build * minor change to npf
…ODFLOW-USGS#1055) * store package_type as a string variable stored in the memory manager * duplicates this%filtyp * More extensive refactoring can be done to store name_model and package_name in memory manager
…tion (MODFLOW-USGS#1056) * remove dis_init_mem routines as they were not being used * change size of unspecified NPF arrays to be zero instead of 1, which will help support a forthcoming interface model pull request * update some tex files that had not been updated based on changes to the dfn files
* moved npf array allocation and grid data reading up to npf_df * this is preparatory work for the synchronization in interface model (towards parallelization)
…#1060) * prep. refactoring for the interface model: - introduced cell center coordinate arrays for all DIS, getting rid of get_cellxy subroutine - transform_xy is now stateless
* move allocate_arrays up to _df for dsp and npf * - add BEFORE_AR stage to synchronization - adding some npf vars (K11, K22, K33, ICELLTYPE) - introduced delayed retrieval of memory items in sync, others (and for dsp too) are awaiting input data model * first test with dist data access: tests green * Further reduction of using (numerical) model pointers in the interface model framework * moved npf array allocation and grid data reading up to npf_df * undoing this temporarily * fix: remnant causing double allocation * save progress: full npf synchronization is working now * npf data in interface is now fully synchronized * move allocate arrays and reading grid data up to define for dsp * interface model dsp synchronization implemented too * update makefile * update msvs * fprettify * fixing merge error * load ia and ja instead of pointer * prep. refactoring for the interface model: - introduced cell center coordinate arrays for all DIS, getting rid of get_cellxy subroutine - transform_xy is now stateless * replacing more pointers with load from memory * fixing typo in disv * fix: DISU does not always have cellxy data * fprettify * Regional lookup table converted to using DistributedModelType too * Fully removed model pointer from global cell data structure
* uget_block did not terminate with an error when looking for a required block and found end of file instead * update release notes * Close MODFLOW-USGS#148
…FLOW-USGS#1064) * introduce dfn derived fortran input definition format * add script to generate input definitions * add generic input loader for mf6 file types * add mem_set_value interface * update dis, disv, disu, npf, dsp to source input from input data path * pass invalid npf,dsp inunit number from interface model * add doxygen comments for IDM routines * fprettify Co-authored-by: mjreno <[email protected]> Co-authored-by: Langevin, Christian D <[email protected]>
…d maintainability (MODFLOW-USGS#1072) Co-authored-by: mjreno <[email protected]>
* switch from modflowpy/install-gfortran-action to awvwgk/setup-fortran for gfortran setup * rename test_z03_largetests.py to test_z03_largetestmodels.py (allows cleaner CI config) * bump latest gfortran tests, nightly build tests and large/example model tests to GCC/gfortran 12 * colocate push-triggered CI jobs in ci.yml * update CI badges in readme * mark get_exes tests as flaky to retry download on failure (and add flaky to environment.yml) * add ci-diagnose* to branches triggering CI
Addition of new viscosity package for the GWT Model
* uzf did not route water to water table unless there was an underlying uzf cell * Close MODFLOW-USGS#1075 * add test for uzf fix * update release notes for next release
* fix(zbud): fix zonebudget for spaces in path * update release notes * typo
* update release notes * issue error if more than one VSC6/BUY6 package active * convert to lower case error messages
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.