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.

Sign up for GitHub

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

Jump to bottom

Feature: MODFLOW 6 support #12

Merged
merged 48 commits into from
May 25, 2021
Merged

Feature: MODFLOW 6 support #12

merged 48 commits into from
May 25, 2021

Conversation

mwtoews
Copy link
Owner

@mwtoews mwtoews commented Mar 31, 2021

The plan is to implement this feature independent of older MF support (for now) to get this feature going.

mwtoews and others added 5 commits March 18, 2021 16:59
@mwtoews
Start of modflow module re-do
8721573 
- Move MfSfrNetwork to _legacy.py -- this may be removed later
- Move _core.py to _base.py, for base abstract class, shared logic
- Use SwnModflow for classic MODFLOW
- Use SwnMf6 for MODFLOW 6
@briochh
Started plumbing in some mf6 data structures
c9b0685
@mwtoews
CI: get USGS executables
482cb21
@mwtoews
Replace idomain for ibound
1e2d338
@mwtoews
Split mf6 tests, based on original modflow tests -- WIP
cb9b28e
@mwtoews mwtoews mentioned this pull request Mar 31, 2021
Closed
@mwtoews mwtoews added the enhancement New feature or request label Mar 31, 2021
@mwtoews
CI: declare branches for push and pull_request
f212f36
@mwtoews
Several WIP items:
0dbff73 
- Split 'other_from_swn_flopy' into two parts, with the second
  content going to 'set_sfr_data'
- Start of 'packagedata' property, which depends on data in reaches
@mwtoews
Copy link
Owner Author

mwtoews commented Apr 8, 2021

some pseudo code on how this should work is as follows:

n = SurfaceWaterNetwork
m = ModflowGwf

nm = SwnMf6.some_class_method(n, m)

# gets containter of grid cells
# and assign reach data

# Use should set reach data
nm.set_reach_data('rtp')
nm.set_reach_data('man', 3.e-5)
nm.set_reach_data('rwid', 10.)  # or next line
nm.set_reach_data('rwid', n.segments.width)

# propery to pandas data frame for MF6 (of flopy)
nm.package_data
nm.connection_data
nm.period_data

nm.build_sfr_data()  # prepare flopy object -- do later

mwtoews and others added 20 commits April 12, 2021 16:28
@mwtoews
More WIP
aa1ea98
@briochh
some quick reach connection ds building hackery
9fe6987
@mwtoews
Evaluate to_rno using a function
6eedb4d
@mwtoews
WIP
7070f90
@mwtoews
Move mf6 model into subfolder, rename from "mf6h" to just "h"
72b3271
@mwtoews
Increase INNER_MAXIMUM to allow mf6 model to converge/succeed
4bff025
@mwtoews
Tidy up 'from_swn_flopy' methodclass, add grid and linestring data to…
13d52ac 
… reaches df

Still not sure what to do with 'set_sfr_data'...

Work on test_modflow6.py test suite...
@mwtoews
Several WIP
53259c2 
 - rename class properties
 - fix __repr__
 - rename 'from_rno' to plural 'from_rnos'
 - fix last from_rnos
@mwtoews
More focus on packagedata/connectiondata WIP
e8b1a88
@mwtoews
Add write_* methods, rename a few methods, fix some tests
ddea9e9
@mwtoews
Fix SwnMf6.plot()
3d26614
@mwtoews
Many WIP items:
0b10438 
 - Rename to_* methods to internal _* methods
 - Add flopy_* method properties
 - Fix repr
 - When setting model property, check tdis
 - Fix geotransform_from_flopy
 - Check over tests, discard some, now only 1 xfail (for diversions)
@mwtoews
Move core MF algro to abstract base
6a26e28
@mwtoews
WIP to integrate SwnModflow to replace MfSfrNetwork
fdd1ac7
@mwtoews
More progress integrating core logic
118a390 
- Re-integrate diversions
- Diversions use 'divid', and not 'segnum' with iupseg!=0
- Update __repr__
@mwtoews
Add set_reaches_slope() with a few methods
b3cf459 
Move min_slope out of set_sfr_data methods
@mwtoews
WIP to integrate SwnMf6.set_sfr_data() helper
4f60009
@mwtoews
Always use k,i,j intead of lay,row,col
322bef7
@mwtoews
Rename set_reaches_slope -> set_reach_slope
4f70284
@mwtoews
Clean-up redundant or unused methods and properties
3062827 
SwnMf6 - segment_data not used, so drop set_segment_data
mwtoews added 18 commits May 10, 2021 20:11
@mwtoews
Add iseg and ireach to abstract base class, because they are useful
65005ed 
Move plot() method to base class too.

Start test_modflow_base.py for generic tests
@mwtoews
Reword test_modflow_base.py to a working state
c6ffc45
@mwtoews
Modflow abstract base changes:
f5d7ee3 
* Merge plot() to base, show diversions and inflow points too
* Use base class (via super()) for __iter__ and __setstate__
* Create _get_segments_inflow() to gather external flow
* Change set_reach_slope() method "linestringz_ab" to "zcoord_ab"
* Add misc function transform_data_to_series_or_frame() to help
  read and check segment or diversion data.
* Add _set_stationary_tsvar_data() to help set_* methods that set
  a data frame of stationary data and a dict of time-varying data

SwnModflow changes (too many, but a list is attempted here):

* Add property segment_data_ts to data model as a dict of tsvar frames
* Remove set_sfr_data(), as it was too high-level
* Also remove set_segment_data(), as it's also too high level
* Add new_segment_data() to generate a basic segment_data frame
* Add set_segment_data_from_scalar()
* Add set_segment_data_from_segments(), data indexed by segments
* Add set_segment_data_from_diversions(), data indexed by diversions
* Add set_segment_data_inflow(), data indexed by segments in/out of model
* Add flopy_segment_data property method to create dict of rec.array
* Add default_segment_data() to set high-level data and defaults
* Add set_sfr_obj() to create and set a flopy sfr object to the model

Tests:

* Use get_basic_swn() and get_basic_modflow() helper functions
@mwtoews
Re-arrange SfrMf6 methods, prefer double quotes
a7b21aa
@mwtoews
More double quotes
c746993
@mwtoews
Change default width1 from 10.0 to None for auto-detection, if "width"
bb6a67a 
was part of the segments frame.

Start clean-up of MF6 logic for default_packagedata
@mwtoews
Move _set_stationary_tsvar_data to SwnModflow._set_segment_data
3ffe134
@mwtoews
Rename _SwnModflow to SwnModflowBase
75b3951 
Start of SwnMf6 logic to handle time-varying data as "tsvar"
@mwtoews
Remove @Property for flopy_* methods, as these may later have parameters
3c8ac24
@mwtoews
Fixes for Windows int32 vs int64 dtypes
3e8f558
@mwtoews
Use get_basic_modflow() functions, where helpful
fa3d401 
Prefer tmp_path fixture over tmpdir_factory

Clean-up unused parts
@mwtoews
pycodestyle
eb0c789
@mwtoews
Rename _packagedata_df to public packagedata_df
9e4c352 
Fix set_sfr_obj(), remove perioddata keyword but allow packagedata and
connectiondata.

Update tests to use default_packagedata() and set_sfr_obj()
@mwtoews
Clean-up many unused/untested methods from SwnMf6
cb78054 
A version of these may come back later
@mwtoews
Update README.txt to use SwnModflow
f90cf3a 
Show warning that MfSfrNetwork is legacy code when initialized
@mwtoews
Add auxiliary and boundname parameters to packagedata_df and related
5f9c690
@mwtoews
Promote _connectiondata_series to public connectiondata_series
d193ea6
@mwtoews
Final review, flake8
060c8d6
@mwtoews mwtoews marked this pull request as ready for review May 25, 2021 22:39
@mwtoews mwtoews merged commit 56a30ee into main May 25, 2021
@mwtoews mwtoews deleted the feat_mf6sfr branch May 25, 2021 23:58
@mwtoews mwtoews mentioned this pull request May 26, 2021
Closed
@mwtoews mwtoews added this to the 0.4 milestone Jul 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
0.4
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mwtoews @briochh