-
Notifications
You must be signed in to change notification settings - Fork 8
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
Feature/input structure #8
Merged
rogiersbart
merged 152 commits into
rogiersbart:develop
from
cneyens:feature/input-structure
Jan 29, 2020
Merged
Feature/input structure #8
rogiersbart
merged 152 commits into
rogiersbart:develop
from
cneyens:feature/input-structure
Jan 29, 2020
Conversation
This file contains 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
Hi Cas, thanks for all this work.
I'll try to have a deeper look into all of this. Not sure if I will add some commits here or just merge ... There's a lot to check out! :) |
Deprecated functions are gone now. Concerning item 2 above, see also #11. |
Merged
Merged
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 contains a bunch of new functionality. I've written some vignettes to explain the major updates (they are not build but you should be able to knit them after pulling this PR and installing RMODFLOW again).
Input data structure:
rmf_arrays
have been streamlined: subsetting, dimension labels, keeping attributes etc.rmf_array
, armf_list
class can be created from data.frame-like objects to deal with MODFLOW list databud
keyword is replaced withcbc
(for cell-by-cell flow data). The volumetric budget (i.e. as read from the listing file) is now assigned thebud
keyword.dis$nlay
) but are explicitly represented bydis$botm
and all calculations using this array.rmfi_list_packages
lists all packages in the MODFLOW-2005 family as well as RMODFLOW supported packages. Every time a new package is supported, it should be added to thepack_names
andrmf_names
vectors. These are used in the top-level functions.rmf_calculate_thickness
,rmf_gradient
&rmf_darcy
(need to check overlap withrmf_convert_cbc_to_darcy
which is probably better).abind
&ggquiver
(for vector plotting)Plotting:
type = 'vector'
for plotting vector arrows. The smoothing option still needs some work (perhaps using interpolation like the contour type).Top-level:
rmf_create()
,rmf_write()
andrmf_read()
handle entire MODFLOW models in a robust way.rmf_write()
. I think this has to do with my admin rights on the laptop sincermf_write()
is just a fancy wrapper for all otherrmf_write_*
functions. It also doesn't always give an error, which makes it even stranger...Probably forgetting a bunch of stuff
Some important notes:
rmfi_list_packages
function should be updated as well as the wikirmf_read_fhd
&rmf_read_bhd
functions? They're basically wrappers forrmf_read_hed
with the binary argument set differently.Up-next:
I have some
print
functions on another branch + some spatial conversion functions (not pushed yet) but I think that the more urgent addition should be tests (+ CI) seeing as the package is getting pretty big...In the future, remind me not to make these PR's so big ;)