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.

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

bugfix for setup_lak #12

Closed
wants to merge 15 commits into from
Closed

bugfix for setup_lak #12

wants to merge 15 commits into from

Conversation

mnfienen
Copy link
Contributor

@mnfienen mnfienen commented Dec 3, 2020

Needed to accomodate the case where no stage/vol/area tables are passed in the YML configuration file. Just set a flag to None if no tables block.

@mnfienen
Copy link
Contributor Author

mnfienen commented Dec 3, 2020

this build fail seems to be related to the default of not including horizontal connections for lakes:

assert not info.loc[info.claktype == 'horizontal', 'cellface'].isnull().any()

@mnfienen
Copy link
Contributor Author

mnfienen commented Dec 3, 2020

looks like that assert is just verifying that the connections file was written. Can use "vertical" rather than "horizontal" and all should be fine

Copy link
Collaborator

@aleaf aleaf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @mnfienen this looks good but can you modify so that it's just the changes to mf6model.py? I ended up turning the horizontal connections back on for the pleasant_mf6 test so that they continue to get tested.

@mnfienen
Copy link
Contributor Author

mnfienen commented Dec 4, 2020

yeah - I always struggle with my forkss going of the rails like this. I think I'll just make a new fork

@mnfienen mnfienen closed this Dec 4, 2020
@aleaf
Copy link
Collaborator

aleaf commented Dec 4, 2020

You should be able to fix the commits by rebasing to the upstream (and then pushing that to your fork). But those aren't as important because they can be rebased on merging the pull request. For the other 2 files besides mf6model.py I think resetting them to the last commit on the upstream would work. I'd make the change myself but I think the only way to "cherry pick" pull requests is to pull the branch down to your machine and do it manually.

@mnfienen
Copy link
Contributor Author

mnfienen commented Dec 4, 2020

no worries - for now just going to go nuclear and make a new fork. the only current relevant changes are on mf6model.py anyway

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants