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

fix(get_active) include the cbd layers when checking layer thickness … #1051

Merged
merged 1 commit into from Feb 8, 2021

Conversation

ougx
Copy link
Contributor

@ougx ougx commented Feb 6, 2021

DIS uses this function before BAS is loaded. There will be an error when there is a quasi 3-D confining bed layer, which is active.shape != thickness.shape (Line 784 in mfdis.py).

@langevin-usgs
Copy link
Contributor

Hi @ougx, thank you for this contribution. Can you run black on this source file and recommit? We are now requiring that the flopy source code be properly formatted. The error from the github action shows how to reformat:

if black check fails run
  black --line-length 79 ./flopy
and then commit the changes.
would reformat /home/runner/work/flopy/flopy/flopy/utils/check.py
Oh no! 💥 💔 💥
1 file would be reformatted, 225 files would be left unchanged.
Error: Process completed with exit code 1.

If you don't have it, you can pip install black.

@codecov
Copy link

codecov bot commented Feb 7, 2021

Codecov Report

Merging #1051 (dba58de) into develop (5bfdf71) will increase coverage by 1.094%.
The diff coverage is 100.000%.

@@              Coverage Diff              @@
##           develop     #1051       +/-   ##
=============================================
+ Coverage   71.759%   72.853%   +1.094%     
=============================================
  Files          225       221        -4     
  Lines        51901     51123      -778     
=============================================
+ Hits         37244     37245        +1     
+ Misses       14657     13878      -779     
Impacted Files Coverage Δ
flopy/utils/check.py 83.928% <100.000%> (+0.047%) ⬆️
flopy/mt3d/mtcts.py
flopy/mf6/utils/reference.py
flopy/utils/voronoi.py
flopy/mf6/utils/testutils.py
flopy/mf6/modflow/mfgwtfmi.py 61.904% <0.000%> (+15.476%) ⬆️

@ougx
Copy link
Contributor Author

ougx commented Feb 7, 2021

@langevin-usgs: I modified the code but it failed for a test not sure what it is.

@langevin-usgs
Copy link
Contributor

Looks like a weird hiccup. I restarted.

@langevin-usgs langevin-usgs merged commit 3ccdd57 into modflowpy:develop Feb 8, 2021
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