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

Ictorigin patch #93

Merged
merged 23 commits into from
Feb 15, 2019
Merged

Ictorigin patch #93

merged 23 commits into from
Feb 15, 2019

Commits on Oct 14, 2018

  1. refactor(pre-commit.py): use OrderdedDict to load and write code.json 

    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.
    @langevin-usgs
    langevin-usgs committed Oct 14, 2018
    Configuration menu
    Copy the full SHA
    aca7d35 View commit details
    Browse the repository at this point in the history

  2. 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
    @langevin-usgs
    langevin-usgs committed Oct 14, 2018
    Configuration menu
    Copy the full SHA
    a665ae5 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2018

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop

# Conflicts:
#	README.md
#	code.json
#	version.txt
    @langevin-usgs
    langevin-usgs committed Oct 15, 2018
    Configuration menu
    Copy the full SHA
    5b03530 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    773e098 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. fix(GwfGwfExchangeModule): specific discharge not updated correctly f… 

    …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.
    @langevin-usgs
    langevin-usgs committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    cffd502 View commit details
    Browse the repository at this point in the history

  2. fix(GwfGwfExchangeModule): specific discharge not updated correctly f… 

    …or LGR

Updated the release notes and added some docstrings to the autotest.
    @langevin-usgs
    langevin-usgs committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    b16dd88 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2018

  1. Merge commit 'cfe6e02f35876961c68a88e00f07565002be2317' into develop 

    # Conflicts:
#	doc/ReleaseNotes/ReleaseNotes.tex
    @langevin-usgs
    langevin-usgs committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    75325a4 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2018

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Nov 9, 2018
    Configuration menu
    Copy the full SHA
    b9c58f3 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2018

  1. docs(mf6ivar): readme.md needed a description of the valid keyword

    @langevin-usgs
    langevin-usgs committed Nov 10, 2018
    Configuration menu
    Copy the full SHA
    e320602 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2018

  1. Corrected misspelling of execution in the release notes.

    @langevin-usgs
    langevin-usgs committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    5699dd2 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2018

  1. Merge remote-tracking branch 'upstream/develop' into develop

    @langevin-usgs
    langevin-usgs committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    ad3de27 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2018

  1. Merge remote-tracking branch 'upstream/develop' into develop

    @langevin-usgs
    langevin-usgs committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    9000d56 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2019

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    573396b View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2019

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    798acae View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2019

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Jan 31, 2019
    Configuration menu
    Copy the full SHA
    3326270 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2019

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    e73d1a1 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    bc0cce4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    2fb504c View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    a011cc4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    a6fa57e View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2019

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    e05169a View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2019

  1. Merge branch 'develop' of https://github.com/MODFLOW-USGS/modflow6 in… 

    …to develop
    @langevin-usgs
    langevin-usgs committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    ebbb735 View commit details
    Browse the repository at this point in the history

  2. refactor(BndType): Generalized BndType pointer to NPF ICELLTYPE to be… 

    … model agnostic.
    @langevin-usgs
    langevin-usgs committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    3ecf428 View commit details
    Browse the repository at this point in the history