Code

V0.6.0#105

Code

Merged

aleaf merged 64 commits intomasterDOI-USGS/modflow-setup:masterfrom v0.6.0DOI-USGS/modflow-setup:v0.6.0Copy head branch name to clipboardJan 6, 2025

+2,597-1,184

Commits

Commits on Mar 28, 2024

• fix(pyproject.toml): add tomli; python_version < 3.11 to requires; potential fix for pip install issue (missing setup.cfg) that seems to occur with python<3.11. Re-add python 3.10 to test.yaml matr…

  Show description for 4bfd847
  aleaf

  committed
  4bfd847

  Copy full SHA for 4bfd847

Commits on Apr 3, 2024

• minor fixes for mf6 model setup

  

  apryet

  authored and

  aleaf

  committed
  5c55095

  Copy full SHA for 5c55095

Commits on May 7, 2024

• fix(ci::test_mf6_shellmound.py::test_rch_setup): relative pct difference issue on osx

  aleaf

  committed
  01c8870

  Copy full SHA for 01c8870

• fix(sourcedata.py::setup_array): only make adjustments involving the original model top in a model creation context (not when working with a loaded model)

  aleaf

  committed
  869e1af

  Copy full SHA for 869e1af

Commits on Jul 9, 2024

• ci(test.yaml): turn off fail-fast

  aleaf

  committed
  0a1961d

  Copy full SHA for 0a1961d

• fix(fileio.py): uint overflow error that was occuring on macos CI with python 3.10 (recast unit arrays to int)

  aleaf

  committed
  0e93d6f

  Copy full SHA for 0e93d6f

• fix(mfsetup/tmr.py): geopandas.sjoin 'op' arg to 'predicate'

  aleaf

  committed
  81b7997

  Copy full SHA for 81b7997

• tests(test_lgr.py::test_lgr_model_setup): relax arbitrary head comparison criteria; differences probably due to discretization

  aleaf

  committed
  9fab1b8

  Copy full SHA for 9fab1b8

• fix(sourcedata.py; MFnwtModel): add _drop_thin_cells=False attribute to MFnwtModel for consistency with MF6model; only expand thin cells to the minimum thickness if drop_thin_cells=False; otherwise…

  Show description for 0179b73
  aleaf

  committed
  0179b73

  Copy full SHA for 0179b73

• tests(test_mf6_shellmound.py::setup_sfr): add skipif for unknown macos CI failure (passes on other platforms, and locally on macos

  aleaf

  committed
  45683b6

  Copy full SHA for 45683b6

Commits on Aug 6, 2024

• feat: support for local grid refinement models that only occupy some layers of the enclosing parent model

  aleaf

  committed
  b91db3a

  Copy full SHA for b91db3a

• refactor(bcs.py:setup_basic_stress_data): for models with LGR, drop non-well BCs within LGR areas. (assumes that CHD, DRN, GHB, and RIV cells all represent surface or near-surface features that sho…

  Show description for 3730ca0
  aleaf

  committed
  3730ca0

  Copy full SHA for 3730ca0

• fix(discretization.py:fill_empty_layers): get_next_above() was not actually returning the next layer above because of incorrect sorting. Include the model top when filling missing layers, in case t…

  Show description for 54e499b
  aleaf

  committed
  54e499b

  Copy full SHA for 54e499b

• feat(wells.py::setup_wel_data): add layer assignment from screen top/botm to wells: dictionary input option to facilitate easier testing. LGR parent models, remove wells with >50% of their open int…

  Show description for 826214d
  aleaf

  committed
  826214d

  Copy full SHA for 826214d

• feat: partial LGR in the vertical direction (child model nested in a subset of parent layers).

  Show description for c303cf1
  aleaf

  committed
  c303cf1

  Copy full SHA for c303cf1

Commits on Aug 8, 2024

• refactor(mfmodel.py): add error trap for missing setup_grid input; fix error message in mf6model.py

  aleaf

  committed
  0fb4e47

  Copy full SHA for 0fb4e47

• docs(config-file): add note about whitespace-delimited dictionary input in YAML

  aleaf

  committed
  dcedeb8

  Copy full SHA for dcedeb8

• refactor(grid.py): relax requirement that parent and inset model grids must exactly align when snap_to_parent=True. For example, we may want a model that is aligned, but only every n cells, because…

  Show description for 77c050e
  aleaf

  committed
  77c050e

  Copy full SHA for 77c050e

• feat(grid.rasterize; shapefile source data): add exclude_features option to include all features in a shapefile except for those specified

  aleaf

  committed
  85b7816

  Copy full SHA for 85b7816

Commits on Aug 27, 2024

• fix(mf6model.write_input): handle cases of single model or multi-model LGR simulation by working with the simulation-level model dictionary to implement model write functionality that is not includ…

  Show description for 105f42d
  aleaf

  committed
  105f42d

  Copy full SHA for 105f42d

• ci(test_environment.yaml): pin numpy<2.1 for now, to avoid this shapely error: shapely/shapely#2098

  aleaf

  committed
  96d82b6

  Copy full SHA for 96d82b6

• fix(MF6model.write_input): handle case of single obs package

  aleaf

  committed
  0215fb8

  Copy full SHA for 0215fb8

Commits on Aug 28, 2024

• fix(ic.py): handle cases where there is no strt source data configuration or default parent model source data. Add error trap for invalid strt source data and additional testing of strt input options.

  aleaf

  committed
  5177a31

  Copy full SHA for 5177a31

Commits on Sep 9, 2024

• refactor(mfmodel; fileio.load_cfg): non-conprehensive pathlib conversions; tests(conftest.py): convert path fixtures to pathlib objects

  aleaf

  committed
  ab32596

  Copy full SHA for ab32596

• fix(sourcedata.py::setup_array): for LGR inset models with default_source_data=True, don't copy idomain from parent (which will result in all inactive cells in the inset model).

  aleaf

  committed
  22ce035

  Copy full SHA for 22ce035

• fix(fileio.py::set_cfg_paths_to_absolute): don't touch file paths within the 'lgr': 'cfg' sub-block (when LGR inset configuration is supplied in the same file; this is mostly done in a test context).

  aleaf

  committed
  6265686

  Copy full SHA for 6265686

• fix(mover.py::get_sfr_package_connections): refactor to use GWFGWF exchanges and a threshold distance to determine SFR Package connections between a parent and inset/child LGR model. This fixes pre…

  Show description for c10c32d
  aleaf

  committed
  c10c32d

  Copy full SHA for c10c32d

Commits on Sep 10, 2024

• fix(SFR Package water mover setup for LGR models): apparently the mover package file reference was not getting written to the GWFGWF Exchange file in at least some cases. Integrate GWFGWF and Mover…

  Show description for 094a04e
  aleaf

  committed
  094a04e

  Copy full SHA for 094a04e

Commits on Sep 12, 2024

• fix(tdis.py::aggregate_xarray_to_stress_period): copy period_stat input so that it doesn't get modified by multiple function calls; this affected instances where list input to a period_stats sub-bl…

  Show description for 31a3c11
  aleaf

  committed
  31a3c11

  Copy full SHA for 31a3c11

Commits on Sep 20, 2024

• fix(MF6model.write_input): don't check for mover package if mover is in the SFR options block (not clear that this check is needed). Previously was not passing mover option if simulation-level move…

  Show description for 7c2e389
  aleaf

  committed
  7c2e389

  Copy full SHA for 7c2e389

Commits on Sep 23, 2024

• fix(lakes.py::get_flux_variable_from_config): support direct flux input (precip, evap., etc) by lake; for MODFLOW 6 models, more direct flux input to perioddata: sub-block

  aleaf

  committed
  4d86763

  Copy full SHA for 4d86763

• feat(Lake Package): direct flux input by lake and by period

  aleaf

  committed
  c66aab9

  Copy full SHA for c66aab9

• Specifying raster file to zonal_stats in setup_basic_stress_data() lead to proj issues. Bypassed when source raster is loaded with rasterio and affine transform specified

  

  apryet

  authored and

  aleaf

  committed
  68ece13

  Copy full SHA for 68ece13

• added simulate_high_k_lakes condition to setup_array in sourcedata

  

  apryet

  authored and

  aleaf

  committed
  d2c02f5

  Copy full SHA for d2c02f5

• fix(sourcedata.py): when setting up the bottom array(s), only make edits to the model top if the lake package is being built, and a lake bathymetry raster was supplied (to be subtracted from the in…

  Show description for 86cc1d5
  aleaf

  committed
  86cc1d5

  Copy full SHA for 86cc1d5

• refactor(discretization.fill_cells_vertically): only return bottom array, since top shouldn't be modified; refactor(sourcedata.setup_array): move resetting of model top to branch where the top modi…

  Show description for 9f53a9c
  aleaf

  committed
  9f53a9c

  Copy full SHA for 9f53a9c

• fix(MF6model._set_idomain): Don't inactivate Lake BCs for MF6 models

  aleaf

  committed
  3142198

  Copy full SHA for 3142198

Commits on Oct 16, 2024

• fix(grid.py::setup_structured_grid): when snapping to parent grid, snap lower left corner to nearest vertex, since lower left is what is typically specified (previously was snapping upper left corn…

  Show description for 61e0ef4
  aleaf

  committed
  61e0ef4

  Copy full SHA for 61e0ef4

• ci: switch to setup-micromamba@v2; try removing init-shell arg; not clear that this was ever needed

  aleaf

  committed
  01fe727

  Copy full SHA for 01fe727

• fix(grid.py): more fixes to logic for snapping grid to parent model, esp. for grids based on buffers around features

  aleaf

  committed
  0a540bb

  Copy full SHA for 0a540bb

• fix(mfsetup/fileio.py): refactor flopy_mfsimulation_load() and flopy_mf6model_load() for compatibility with flopy f378f84a5677b99191ce178bb1c5b67ac1d1bd66

  aleaf

  committed
  46b8d62

  Copy full SHA for 46b8d62

• fix(equality.py): add support for Flopy mf6.mfbase.PackageContainer class

  aleaf

  committed
  901bf74

  Copy full SHA for 901bf74

• ci: revert to mamba-org/setup-micromamba@v1

  aleaf

  committed
  6754bfe

  Copy full SHA for 6754bfe

• fix(equality.py::package_eq): skip packages within packages to avoid RecursionError in Flopy < 3.9

  aleaf

  committed
  e2535e6

  Copy full SHA for e2535e6

• refactor(Pleasant_lake_lgr_example.ipynb): center example parent model around inset model after changes to grid-snapping; include lake connections in layer 0 (default for MF6 is now to keep layer 1…

  Show description for 019d090
  aleaf

  committed
  019d090

  Copy full SHA for 019d090

• fix(fileio.py::flopy_mfsimulation_load): _package_container AttributeError for Flopy<3.9

  aleaf

  committed
  d8810b3

  Copy full SHA for d8810b3

• tests(test_lgr.py::test_mover_get_sfr_package_connections): fix the test

  aleaf

  committed
  07c6821

  Copy full SHA for 07c6821

Commits on Oct 17, 2024

• docs: remove html_theme_path; deprecated in Sphinx>=8

  aleaf

  committed
  ccfbed8

  Copy full SHA for ccfbed8

Commits on Oct 23, 2024

• tests(test_mf6_shellmound.py): fixes to support string identifiers in sfrmaker; switch test outlet location to hopefully make setup_sfr test more robust

  aleaf

  committed
  704e87b

  Copy full SHA for 704e87b

• tests(test_lgr.py): fix test_meandering_sfr_connections

  aleaf

  committed
  346edf0

  Copy full SHA for 346edf0

Commits on Nov 14, 2024

• ci(release.yml): setup automated releases from PRs

  aleaf

  committed
  a114d62

  Copy full SHA for a114d62

• ci: add GitHub dependabot for ci dependency management

  aleaf

  committed
  e931e82

  Copy full SHA for e931e82

• refactor(discretization.make_lgr_domain): add error trap for LGR grid corners outside of the parent model grid

  aleaf

  committed
  658d1f2

  Copy full SHA for 658d1f2

• fix(initial conditions/strt array setup): add option to explicitly specify strt: from_model_top in source_data: block; needed in the case where there is a parent model and default_source_data is se…

  Show description for d3803b5
  aleaf

  committed
  d3803b5

  Copy full SHA for d3803b5

• fix(partial vertical LGR): remove hard-coding in sourcedata.py::setup_array that was causing vertical gaps between LGR inset and parent models with horizontal refinments other than 5.

  aleaf

  committed
  c2a495d

  Copy full SHA for c2a495d

• feat(initial conditions/strt array setup): add option to explicitly set starting heads from parent starting heads

  aleaf

  committed
  6a08b65

  Copy full SHA for 6a08b65

• tests(initial conditions/strt array setup): add and consolidate tests

  aleaf

  committed
  e7328f3

  Copy full SHA for e7328f3

• docs: Add page on initial conditions setup; with example script for updating starting heads from a previous run

  aleaf

  committed
  45e95f4

  Copy full SHA for 45e95f4

• build(deps): bump JamesIves/github-pages-deploy-action

  Show description for 65803fd
  

  dependabot[bot]

  authored and

  aleaf

  committed
  65803fd

  Copy full SHA for 65803fd

• build(deps): bump actions/checkout from 3 to 4

  Show description for fdaafac
  

  dependabot[bot]

  authored and

  aleaf

  committed
  fdaafac

  Copy full SHA for fdaafac

Commits on Dec 6, 2024

• build(deps): bump JamesIves/github-pages-deploy-action

  Show description for 8d33cff
  

  dependabot[bot]

  authored and

  aleaf

  committed
  8d33cff

  Copy full SHA for 8d33cff

Commits on Dec 30, 2024

• build(deps): bump JamesIves/github-pages-deploy-action

  Show description for a211059
  

  dependabot[bot]

  authored and

  aleaf

  committed
  a211059

  Copy full SHA for a211059

Commits on Jan 3, 2025

• fix(mover.py::get_sfr_package_connections): when two outlets are connected across a LGR model interface and the connection threshold distance is large, a circular or double connection going both wa…

  Show description for 0b77526
  aleaf

  committed
  0b77526

  Copy full SHA for 0b77526

Commits on Jan 6, 2025

• docs: update release notes and readme

  aleaf

  committed
  d932f17

  Copy full SHA for d932f17