fix(datafile): fix mixed-text file behavior#2714
Open
wpbonelli wants to merge 5 commits intomodflowpy:developfrom
Open
fix(datafile): fix mixed-text file behavior#2714wpbonelli wants to merge 5 commits intomodflowpy:developfrom
wpbonelli wants to merge 5 commits intomodflowpy:developfrom
Conversation
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## develop #2714 +/- ##
===========================================
+ Coverage 55.5% 72.4% +16.8%
===========================================
Files 644 674 +30
Lines 124135 130634 +6499
===========================================
+ Hits 68947 94585 +25638
+ Misses 55188 36049 -19139
🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR builds on #2231.
Ignoring
textbreaks the only mechanism to access secondary record types in a mixed-text file (e.g. DRAWDOWN in a HEAD+DRAWDOWN file).Keep
textfunctional. The newheaderscan contain all of the headers in the file, regardless of record type, whilerecordarrayholds only records of typetext.Keep doing substring matching when filtering by
text.Make
BinaryLayerFilepublic. Defaulttext=Noneand automatically read it from the first header in the file. Warn on mixed-text files i.e. more than one record type.Add a
unique_recordsproperty which will in most cases have a single element, multiple for mixed-text files.I think it's cleanest for these file handle classes to scope to a single record type like this. With the addition of
headersandunique_recordsone can easily see if a file is mixed-text, then open separate handles for the other record types.BinaryLayerFilebecomes the recommended entry point for MF6 advanced package output files (LAK, SFR, UZF, etc.) where the text label isn't known in advance, so we avoid theHeadFilenaming mismatch.Child class defaults stay the same:
HeadFile(text="head"),UcnFile(text="concentration"),HeadUFile(text="headu"). Raise if no records matching the giventextare found. SoHeadFile("model.ddn")will error. ButHeadFile("model.ddn", text="drawdown")orBinaryLayerFile("model.ddn")will work.