Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge remote-tracking branch 'upstream/develop' into refactor-src-merge-develop #349

Merged
merged 19 commits into from
Mar 15, 2020
Merged

Merge remote-tracking branch 'upstream/develop' into refactor-src-merge-develop #349

merged 19 commits into from
Mar 15, 2020

Conversation

jdhughes-usgs
Copy link
Contributor

Conflicts:
autotest/simulation.py
msvs/mf6.vfproj
src/Model/GroundWaterFlow/gwf3csub8.f90
src/Solution/NumericalSolution.f90
src/Utilities/List.f90
src/Utilities/Sim.f90
src/Utilities/SimVariables.f90
src/mf6.f90
utils/mf5to6/src/Preproc/SimVariables.f90

jdhughes-usgs and others added 19 commits February 18, 2020 17:59
@jdhughes-usgs
refactor(maw): refactor MAW conductance calculation for issue 305 (#310)
e3f68e6 
Add traps to catch 1) skin factors that are <= 0 when using the SKIN
conductance equation and 2) and negative saturated conductances values.

Closes #305
@jdhughes-usgs
feat(tableobj): Add a generic table object for lst file output (#303)
e400a8e 
Full implementation for SFR package. Partial implementation for LAK, MAW, and UZF packages.
@jdhughes-usgs
feat(tableobj): update MAW package to use tableobj for data output (#315
63b2388 
)

Also fix some budget reporting issues in the MAW package
@langevin-usgs
fix(auxmult): auxmult fix when auxmult and bound are in time series (#…
db11c23 
…316)

* change order of time series interpolation so aux is done first in case it is an auxmult column
* partially addresses #314
* updated release notes
@jdhughes-usgs
refactor(BoundaryPackage): Add use of TableObject for print_flows opt…
6872df8 
…ion (#317)
@jdhughes-usgs
feat(lnf): update n-point geometry package data
3460cfb
@jdhughes-usgs
Revert "feat(lnf): update n-point geometry package data"
5301d5c 
This reverts commit 3460cfb.
@langevin-usgs
fix(lak): revise the way outlet to-mvr flows are stored in budobj (#321)
c896047 
* fix(lak): revise the way outlet to-mvr flows are stored in budobj

* updated release notes
@langevin-usgs
refactor(lak/maw/sfr): for CONSTANT features write fixed value instea…
e301eec 
…d of DHNOFLO to binary file (#329)

* refactor(lak/maw/sfr): for CONSTANT features write fixed value instead of DHNOFLO to binary file

* update release notes
@langevin-usgs
fix(maw): new headtable corrected to have mawwells rows instead of ma…
aeafcae 
…xbound (#332)
@jdhughes-usgs
fix(sfr): Remove upstream_fraction check from PACKAGEDATA block (#334)
783ad3b 
closes #324
@langevin-usgs
feat(transport): update develop with some general routines needed for…
ff705ce 
… transport (#339)

* feat(transport): update develop with some general routines needed for transport
* fix(mover): correct typo in error message
* closes #336
* refactor(disu): correct type in disu error message
* closes #635
@jdhughes-usgs
fix(csub): Allow interbed observations when no interbeds specified (#338
6c70f0f 
)

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 #298
@jdhughes-usgs
ci(travis): update travis.yml to install miniconda instead of apt pyt…
85c5ace 
…hon (#346)
@jdhughes-usgs
refactor(mf6): standardize output to STDOUT to use istdout variable
cea2121
@jdhughes-usgs
refactor(mf6): standardize output to STDOUT to use istdout variable
3b427bf 
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.
@jdhughes-usgs
refactor(mf6): standardize output to STDOUT to use istdout variable (#…
41cb6d9 
…348)
@jdhughes-usgs
Merge remote-tracking branch 'upstream/develop' into refactor-src-mer…
b079a17 
…ge-develop

# Conflicts:
#	autotest/simulation.py
#	msvs/mf6.vfproj
#	src/Model/GroundWaterFlow/gwf3csub8.f90
#	src/Solution/NumericalSolution.f90
#	src/Utilities/List.f90
#	src/Utilities/Sim.f90
#	src/Utilities/SimVariables.f90
#	src/mf6.f90
#	utils/mf5to6/src/Preproc/SimVariables.f90
@jdhughes-usgs
Merge remote-tracking branch 'upstream/develop' into refactor-src-mer…
90defe3 
…ge-develop

# Conflicts:
#	autotest/simulation.py
#	msvs/mf6.vfproj
#	src/Model/GroundWaterFlow/gwf3csub8.f90
#	src/Solution/NumericalSolution.f90
#	src/Utilities/List.f90
#	src/Utilities/Sim.f90
#	src/Utilities/SimVariables.f90
#	src/mf6.f90
#	utils/mf5to6/src/Preproc/SimVariables.f90
@jdhughes-usgs jdhughes-usgs merged commit a462b18 into MODFLOW-USGS:refactor-src Mar 15, 2020
@jdhughes-usgs jdhughes-usgs deleted the refactor-src-merge-develop branch March 15, 2020 01:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jdhughes-usgs @langevin-usgs