Skip to content

Commit

Permalink
ci(test_environment.yml): pin numpy<2 until dependency conflicts get …
Browse files Browse the repository at this point in the history 
…resolved
  • Loading branch information
@aleaf
aleaf committed Aug 28, 2024
1 parent ee5d4d4 commit 98ffd10
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 26 deletions.
2 changes: 1 addition & 1 deletion ci/test_environment.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- ipykernel
- matplotlib
- pyyaml
- numpy
- numpy<2
- scipy
- pandas
- xarray
Expand Down
1 change: 1 addition & 0 deletions docs/source/config-summary.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ simulation:
verify_data: False
write_headers: True
lazy_io: False
use_pandas: True

model:
# MODFLOW-NWT or MODFLOW-2005 information
Expand Down
Binary file modified examples/Notebooks/shps/nhd_hr_demo_sfr_outlets.dbf
View file
Binary file not shown.
Binary file modified examples/Notebooks/shps/nhd_hr_demo_sfr_routing.dbf
View file
Binary file not shown.
48 changes: 24 additions & 24 deletions examples/neversink_rondout/nhd_hr_demo.sfr
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# MODFLOW-6 SFR input; created by SFRmaker v. 0.11.0.post1.dev0+g5f6e045
# MODFLOW-6 SFR input; created by SFRmaker v. 0.11.2.post3.dev0+gee5d4d4

BEGIN Options
save_flows
Expand Down Expand Up @@ -188,14 +188,14 @@ BEGIN Packagedata
172 1 72 52 30.876595 1.0 0.010849860216584621 446.370893973377 1 1.0 0.03700000047683716 1 1.0 0 10000200279331
173 1 72 53 30.28825 1.0 0.006302312550429494 446.03588723861634 1 1.0 0.03700000047683716 2 1.0 0 10000200279331
174 1 72 53 41.862648 1.1144267916679382 0.010749366550629203 445.8699951171875 1 1.0 0.03700000047683716 1 1.0 0 10000200095532
175 1 64 47 32.058174 1.1045022180441249 0.16340407571372972 437.00454942690794 1 1.0 0.03700000047683716 1 1.0 0 10000200114745
176 1 65 47 143.70834 1.4144184893315723 0.03370437521738999 431.76611311358613 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
177 1 66 47 18.810123 1.7009754579688332 0.23563646031579372 426.9225131821951 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
178 1 66 46 129.90965 1.9632021194711218 0.038641875912886293 422.4901622758412 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
179 1 67 46 38.525997 2.2601924661207446 0.09184434444968205 417.47020959593675 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
180 1 67 45 80.198616 2.469530922250072 0.07599549502935231 413.9318146423349 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
181 1 68 45 124.29945 2.830107433216381 0.03781840362868077 407.8370811166309 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
182 1 69 45 33.42777 3.1082164839196738 0.04805167166324491 403.1362742044428 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
175 1 64 47 32.19033 1.1038187502203085 0.16281979139035296 437.00082173057064 1 1.0 0.03700000047683716 1 1.0 0 10000200114745
176 1 65 47 143.70834 1.414035796040842 0.03369696212324288 431.7595988328996 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
177 1 66 47 18.810123 1.7006553139814644 0.2355847300418791 426.9170642249887 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
178 1 66 46 129.90965 1.962939321639875 0.0386333768422965 422.4856863714729 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
179 1 67 46 38.525997 2.2599944949778044 0.09182414378529047 417.46683780287714 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
180 1 67 45 80.198616 2.46937864524837 0.07597878023325419 413.92922110001433 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
181 1 68 45 124.29945 2.83003386241288 0.037810085676344536 407.83582807782454 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
182 1 69 45 33.42777 3.1082036184183774 0.04804511657796032 403.1360550825681 1 1.0 0.03700000047683716 2 1.0 0 10000200114745
183 1 54 72 28.129742 4.485470294952393 0.09864039921165274 405.63499450683594 1 1.0 0.03700000047683716 2 1.0 0 10000200299129
184 1 50 72 23.93202 8.36209288895756 0.00588543871936559 404.3930732631184 1 1.0 0.03700000047683716 2 1.0 0 10000200221280
185 1 51 72 101.191025 8.418115896146729 0.0020068066313789516 404.252222824875 1 1.0 0.03700000047683716 2 1.0 0 10000200221280
Expand Down Expand Up @@ -1997,7 +1997,7 @@ BEGIN Packagedata
1981 1 110 176 28.067043 23.12987373334231 0.0001 307.3399963378906 1 1.0 0.03700000047683716 2 1.0 0 10000700011597
1982 1 110 175 15.894516 23.137177199855095 0.0001 307.3399963378906 1 1.0 0.03700000047683716 2 1.0 0 10000700011597
1983 1 110 176 37.962616 23.14612463737135 0.0001 307.3399963378906 1 1.0 0.03700000047683716 2 1.0 0 10000700011597
1984 1 137 94 29.344706 11.371263980865479 0.05870268617306385 353.2900085449219 1 1.0 0.03700000047683716 2 1.0 0 10000200124758
1984 1 137 94 29.344706 11.371263980865479 0.05873413191282458 353.2900085449219 1 1.0 0.03700000047683716 2 1.0 0 10000200124758
1985 1 129 87 14.83398 91.77466324252806 0.0001 353.2900085449219 1 1.0 0.03700000047683716 3 1.0 0 10000200036649
1986 1 129 88 15.532204 91.77595422631974 0.0001 353.2900085449219 1 1.0 0.03700000047683716 2 1.0 0 10000200036649
1987 1 130 88 127.03237 91.78201519692578 0.0001 353.2900085449219 1 1.0 0.03700000047683716 2 1.0 0 10000200036649
Expand All @@ -2013,21 +2013,21 @@ BEGIN Packagedata
1997 1 136 92 96.16116 91.8454697157975 0.0001 353.2900085449219 1 1.0 0.03700000047683716 2 1.0 0 10000200036649
1998 1 137 92 28.455807 91.85076766326925 0.0001 353.2900085449219 1 1.0 0.03700000047683716 2 1.0 0 10000200036649
1999 1 137 93 122.83554 91.85719964412422 0.0001 353.2900085449219 1 1.0 0.03700000047683716 2 1.0 0 10000200036649
2000 1 137 94 18.182774 91.86319487185946 0.09473873906346712 353.2900085449219 1 1.0 0.03700000047683716 2 1.0 0 10000200036649
2000 1 137 94 18.182774 91.86319487185946 0.09478948852534126 353.2900085449219 1 1.0 0.03700000047683716 2 1.0 0 10000200036649
2001 1 129 136 19.09783 11.161112785204622 0.049220378028085474 319.83245381604286 1 1.0 0.03700000047683716 2 1.0 0 10000700001650
2002 1 129 137 121.66067 11.208783147646633 0.012837415681831983 318.89245141284914 1 1.0 0.03700000047683716 2 1.0 0 10000700001650
2003 1 110 176 64.62672 23.163238525390625 0.00023815107905662922 307.3399963378906 1 1.0 0.03700000047683716 2 1.0 0 10000700069496
2004 1 138 94 111.6645 92.67046827360005 0.024895996152160624 351.56739550232044 1 1.0 0.03700000047683716 3 1.0 0 10000200192359
2005 1 139 94 68.54264 92.67804807738776 0.001 348.78739660532733 1 1.0 0.03700000047683716 1 1.0 0 10000200192359
2006 1 129 137 13.266188 11.631403316402192 0.16470424703492634 317.33064285305676 1 1.0 0.03700000047683716 2 1.0 0 10000700049780
2007 1 129 138 25.416447 11.644018042800454 0.001 315.14564540220005 1 1.0 0.03700000047683716 1 1.0 0 10000700049780
2008 1 110 176 6.4879 23.350016306931288 0.025188004075738245 307.32460541559317 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2009 1 111 176 62.399117 23.361364385528287 0.0062601337853316775 307.16118816948466 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2010 1 111 177 102.26597 23.388490432089398 0.003595860931790369 306.7705613520073 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2011 1 112 177 52.74897 23.414026761365577 0.007856044918466292 306.4028271518638 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2012 1 112 178 121.93677 23.442803554151364 0.004922425459488728 305.9884288738916 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2013 1 112 179 131.08234 23.484484567978775 0.004192624728314831 305.3882042247173 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2014 1 113 180 100.58765 23.52264863173626 0.001 304.8386251795733 1 1.0 0.03700000047683716 1 1.0 0 10000700011596
2002 1 129 137 121.66067 11.208783147646633 0.012860708555067 318.89245141284914 1 1.0 0.03700000047683716 2 1.0 0 10000700001650
2003 1 110 176 64.62672 23.163238525390625 0.0002381861956476095 307.3399963378906 1 1.0 0.03700000047683716 2 1.0 0 10000700069496
2004 1 138 94 111.6645 92.67047605393616 0.024895994043562415 351.56647273634536 1 1.0 0.03700000047683716 3 1.0 0 10000200192359
2005 1 139 94 68.44616 92.67805204238478 0.001 348.7864740748078 1 1.0 0.03700000047683716 1 1.0 0 10000200192359
2006 1 129 137 13.266188 11.631498629521385 0.16470426330798657 317.32780902655287 1 1.0 0.03700000047683716 2 1.0 0 10000700049780
2007 1 129 138 25.270708 11.644065673447821 0.001 315.1428113598147 1 1.0 0.03700000047683716 1 1.0 0 10000700049780
2008 1 110 176 6.4879 23.35004491402662 0.025191718175385243 307.3246031461232 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2009 1 111 176 62.399117 23.361392959345824 0.00626105687398041 307.1611618033084 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2010 1 111 177 102.26597 23.388518926360874 0.0035963911598213415 306.7704773859149 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2011 1 112 177 52.74897 23.41405518075277 0.00785720333235139 306.40268896148837 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2012 1 112 178 121.93677 23.442831889151748 0.00492315129622415 305.9882295783769 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2013 1 112 179 131.08234 23.484512780751224 0.004191702943391557 305.38791642301726 1 1.0 0.03700000047683716 2 1.0 0 10000700011596
2014 1 113 180 100.50245 23.522662716515587 0.001 304.83845820759467 1 1.0 0.03700000047683716 1 1.0 0 10000700011596
END Packagedata

BEGIN Connectiondata
Expand Down
Binary file modified examples/tylerforks/grid.dbf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion sfrmaker/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def assign_layers(reach_data, botm_array,
botm_array = new_botm_array
reach_data['k'] = layers
elif return_3d or new_botm_array is None:
return layers, new_botm_array
return layers, new_botm_array[-1]
else:
warnings.warn('Previously, assign_layers has returned a 2D (model bottom) array. '
'Now, if idomain is specified, a 3D array of model cell bottoms is returned. '
Expand Down

0 comments on commit 98ffd10

Please sign in to comment.