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 develop into transport #333

Merged
merged 36 commits into from
Mar 7, 2020
Merged

merge develop into transport #333

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
fb4d447
fix(uzf): fix indexing error in UZF (#274)
langevin-usgs Dec 17, 2019
c05f59b
fix(memory): some variables not deallocated (#278)
langevin-usgs Dec 31, 2019
ab4cc43
refactor(budobj): new budget object for advanced packages (#279)
langevin-usgs Dec 31, 2019
040e572
refactor(advanced packages): read static data as part of df() (#281)
langevin-usgs Jan 3, 2020
f081258
fix(budterm): initialize nlist to zero (#283)
langevin-usgs Jan 6, 2020
b81a177
initialize nlist to zero (#284)
langevin-usgs Jan 6, 2020
c1a7fe9
Merge branch 'develop' into transport
langevin-usgs Jan 6, 2020
78a3c13
fix(lak): initialize chdratin and chdratout to zero (#286)
langevin-usgs Jan 8, 2020
10c4ada
fix(lak): added sign checks for user specified lak flow terms (#288)
langevin-usgs Jan 10, 2020
5f6e70c
feat(sfr): add storage term to sfr budget (#293)
langevin-usgs Jan 27, 2020
0a7acd2
Merge branch 'transport' of https://github.com/MODFLOW-USGS/modflow6 …
langevin-usgs Jan 27, 2020
eaa131e
* fix(csub): Fix CSUB binary budget data saved as IMETH=6 datatype
jdhughes-usgs Jan 29, 2020
ef46069
refactor(sfr): Refactor SFR Package to remove use of Geometry objects…
jdhughes-usgs Jan 30, 2020
d355017
Merge branch 'transport' of https://github.com/MODFLOW-USGS/modflow6 …
langevin-usgs Feb 4, 2020
29dfadc
Merge branch 'transport' of https://github.com/MODFLOW-USGS/modflow6 …
langevin-usgs Feb 10, 2020
0f2a497
refactor(xt3d): accumulate flowja instead of set (#306)
langevin-usgs Feb 12, 2020
d750b95
Merge branch 'transport' of https://github.com/MODFLOW-USGS/modflow6 …
langevin-usgs Feb 12, 2020
c39a17d
fix(dis): corrected connection vector error in DIS package (#308)
langevin-usgs Feb 13, 2020
f345907
Merge branch 'transport' of https://github.com/MODFLOW-USGS/modflow6 …
langevin-usgs Feb 13, 2020
1973d12
Update sln-ims-example.dat
langevin-usgs Feb 13, 2020
e3f68e6
refactor(maw): refactor MAW conductance calculation for issue 305 (#310)
jdhughes-usgs Feb 18, 2020
e400a8e
feat(tableobj): Add a generic table object for lst file output (#303)
jdhughes-usgs Feb 21, 2020
63b2388
feat(tableobj): update MAW package to use tableobj for data output (#…
jdhughes-usgs Feb 24, 2020
db11c23
fix(auxmult): auxmult fix when auxmult and bound are in time series (…
langevin-usgs Feb 25, 2020
38343a9
Merge branch 'transport' of https://github.com/MODFLOW-USGS/modflow6 …
langevin-usgs Feb 25, 2020
6872df8
refactor(BoundaryPackage): Add use of TableObject for print_flows opt…
jdhughes-usgs Feb 25, 2020
de9f3cb
Merge branch 'transport' of https://github.com/MODFLOW-USGS/modflow6 …
langevin-usgs Feb 26, 2020
3460cfb
feat(lnf): update n-point geometry package data
jdhughes-usgs Feb 26, 2020
5301d5c
Revert "feat(lnf): update n-point geometry package data"
jdhughes-usgs Feb 26, 2020
c896047
fix(lak): revise the way outlet to-mvr flows are stored in budobj (#321)
langevin-usgs Feb 27, 2020
81ed892
Merge branch 'transport' of https://github.com/MODFLOW-USGS/modflow6 …
langevin-usgs Feb 27, 2020
e301eec
refactor(lak/maw/sfr): for CONSTANT features write fixed value instea…
langevin-usgs Mar 4, 2020
aeafcae
fix(maw): new headtable corrected to have mawwells rows instead of ma…
langevin-usgs Mar 6, 2020
889022b
Merge branch 'transport' of https://github.com/MODFLOW-USGS/modflow6 …
langevin-usgs Mar 6, 2020
9d8e0f5
merge develop into transport
langevin-usgs Mar 6, 2020
5c3b214
fix some weird errors popping up from a merge
langevin-usgs Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor(xt3d): accumulate flowja instead of set (#306) 
This change is required for transport, which accumulates terms in flowja
  • Loading branch information
@langevin-usgs
langevin-usgs committed Feb 12, 2020
commit 0f2a4971269cb67c798d302cf870913c46ec5f92
4 changes: 2 additions & 2 deletions src/Model/ModelUtilities/Xt3dInterface.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,8 +870,8 @@ subroutine xt3d_flowja(this, hnew, flowja)
call this%xt3d_qnbrs(nodes, m, n, nnbr1, inbr1, chat1j, hnew, qnbrs)
qnm = qnm - qnbrs
ipos = ii01
flowja(ipos) = qnm
flowja(this%dis%con%isym(ipos)) = -qnm
flowja(ipos) = flowja(ipos) + qnm
flowja(this%dis%con%isym(ipos)) = flowja(this%dis%con%isym(ipos)) - qnm
enddo
enddo
!
Expand Down