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

docs(mf6io): update .dfn files corresponding to similar change in mf6 #1956

Merged

Conversation

emorway-usgs
Copy link
Contributor

Not sure what's causing the failure in MF6 #1356, maybe the discrepancy between the dfn files stored in mf6 vs what's here in flopy?

@emorway-usgs emorway-usgs changed the title docs(mf6io): update .dfn files corresponding to parallel change in mf6 docs(mf6io): update .dfn files corresponding to similar change in mf6 Sep 20, 2023
@codecov
Copy link

codecov bot commented Sep 20, 2023

Codecov Report

Merging #1956 (73ceda6) into develop (5b5eb4e) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##           develop   #1956   +/-   ##
=======================================
  Coverage     72.6%   72.6%           
=======================================
  Files          257     257           
  Lines        57801   57804    +3     
=======================================
+ Hits         42018   42022    +4     
+ Misses       15783   15782    -1     
Files Coverage Δ
flopy/mf6/modflow/__init__.py 100.0% <100.0%> (ø)
flopy/mf6/modflow/mfgwflak.py 100.0% <ø> (ø)
flopy/mf6/modflow/mfgwfmaw.py 100.0% <ø> (ø)
flopy/mf6/modflow/mfgwfsfr.py 100.0% <ø> (ø)
flopy/mf6/modflow/mfgwfuzf.py 100.0% <ø> (ø)
flopy/mf6/modflow/mfgwtlkt.py 70.3% <ø> (ø)
flopy/mf6/modflow/mfgwtmwt.py 70.3% <ø> (ø)
flopy/mf6/modflow/mfgwtsft.py 70.3% <ø> (ø)
flopy/mf6/modflow/mfgwtuzt.py 70.3% <ø> (ø)
flopy/mf6/modflow/mfsimulation.py 100.0% <100.0%> (ø)

... and 1 file with indirect coverage changes

@langevin-usgs
Copy link
Contributor

It's unclear to me why this PR is required for the MODFLOW 6 refactoring. I think we should update the dfn files, but I think we typically do that when we make mf6 and flopy releases.

@wpbonelli
Copy link
Member

wpbonelli commented Sep 24, 2023

@langevin-usgs I think updating flopy DFNs is needed as a consequence of #1824. Before that, the official mf6 release was used for flopy CI tests. I believe we discussed at the time but I don't recall the full context. May be worth revisiting / reconsidering?

@emorway-usgs
Copy link
Contributor Author

I was unaware the .dfn files get updated during the procedures leading up to a release. I opened the PR as a matter of "house-keeping" with the thinking that the .dfn files should remain synchronized as development moves forward.

@wpbonelli
Copy link
Member

IIRC, the addition of an example model using develop features prompted the move to keep mf6 and flopy DFNs in sync. I don't think this would be necessary if a develop/master branch release approach were adopted on the example repo.

@langevin-usgs
Copy link
Contributor

@emorway-usgs, can you regenerate the flopy classes and include them in this PR?

@emorway-usgs emorway-usgs force-pushed the chng_2_go_w_mf6_dfn_chng branch from 1834dee to 7dd94cf Compare September 26, 2023 14:55
@langevin-usgs
Copy link
Contributor

It would probably be better if you only updated the classes relevant to this PR.

@emorway-usgs
Copy link
Contributor Author

@langevin-usgs, agreed, have backed-out the adjustments that were made to the timestamps of the other classes not touched by this PR

@langevin-usgs langevin-usgs merged commit a3fb59b into modflowpy:develop Sep 26, 2023
21 checks passed
@emorway-usgs emorway-usgs deleted the chng_2_go_w_mf6_dfn_chng branch September 26, 2023 17:35
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.

3 participants