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

refactor(MemoryManager): add reassign_ptr function and clean up #92

Merged
merged 24 commits into from
Feb 15, 2019
Merged

refactor(MemoryManager): add reassign_ptr function and clean up #92

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
aca7d35
refactor(pre-commit.py): use OrderdedDict to load and write code.json
langevin-usgs Oct 14, 2018
a665ae5
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Oct 14, 2018
5b03530
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Oct 15, 2018
773e098
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Oct 16, 2018
cffd502
fix(GwfGwfExchangeModule): specific discharge not updated correctly f…
langevin-usgs Oct 30, 2018
b16dd88
fix(GwfGwfExchangeModule): specific discharge not updated correctly f…
langevin-usgs Oct 30, 2018
75325a4
Merge commit 'cfe6e02f35876961c68a88e00f07565002be2317' into develop
langevin-usgs Oct 31, 2018
b9c58f3
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Nov 9, 2018
e320602
docs(mf6ivar): readme.md needed a description of the valid keyword
langevin-usgs Nov 10, 2018
5699dd2
Corrected misspelling of execution in the release notes.
langevin-usgs Dec 10, 2018
ad3de27
Merge remote-tracking branch 'upstream/develop' into develop
langevin-usgs Dec 23, 2018
9000d56
Merge remote-tracking branch 'upstream/develop' into develop
langevin-usgs Dec 28, 2018
573396b
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Jan 7, 2019
798acae
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Jan 8, 2019
3326270
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Jan 31, 2019
e73d1a1
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Feb 7, 2019
bc0cce4
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Feb 11, 2019
2fb504c
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Feb 11, 2019
a011cc4
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Feb 13, 2019
a6fa57e
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Feb 13, 2019
e05169a
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in…
langevin-usgs Feb 14, 2019
adfed70
refactor(MemoryManager): add reassign_ptr function and clean up memor…
langevin-usgs Feb 15, 2019
5e0a825
Completed the mem_reassignptr routines so there are versions for int1…
langevin-usgs Feb 15, 2019
c0ef6c4
Adding optional name and origin arguments to the other array dealloca…
langevin-usgs Feb 15, 2019
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
Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 
…to develop

# Conflicts:
#	README.md
#	code.json
#	doc/version.tex
#	src/Utilities/version.f90
#	version.txt
  • Loading branch information
@langevin-usgs
langevin-usgs committed Oct 14, 2018
commit a665ae505d67482e68f2cef86a65967fdaa41775

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.