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.

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

Release 3.7.0 #2196

Merged
merged 62 commits into from
May 23, 2024
Merged

Release 3.7.0 #2196

merged 62 commits into from
May 23, 2024

Commits on Feb 8, 2024

  1. Configuration menu
    Copy the full SHA
    1429985 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6c5ec50 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2100 from modflowpy/post-release-3.6.0-reset

    Post release 3.6.0 reset
    wpbonelli authored Feb 8, 2024
    Configuration menu
    Copy the full SHA
    626563a View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Configuration menu
    Copy the full SHA
    b58a703 View commit details
    Browse the repository at this point in the history
  2. fix(PRT): allow empty recarray or dataframe for output conversion fns (

    …#2103)
    
    * previously PRT <-> MP7 conversion functions crashed on empty DataFrame or recarray
    * return early if input argument is empty or already in desired format
    * convert particle name to StringDtype if returning DataFrame
    * consolidate pathline/endpoint output dtype definitions
    * expand conversion function tests
    * fix branch names in dev docs
    wpbonelli authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    dda482b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4c5e2ee View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Configuration menu
    Copy the full SHA
    3122080 View commit details
    Browse the repository at this point in the history
  2. fix(gridintersect): gridintersect does not work for rotated vertex gr…

    …ids (#2107)
    
    * use correct vertices for rotated/offset vertexgrids
    * add local kwarg to force gridintersect to use local model coordinates
    * make local an attribute so structured methods can use it
    * add tests for rotated vertexgrids and test local kwarg
    * remove non-existing attributes from Grid docstring
    dbrakenhoff authored Feb 20, 2024
    Configuration menu
    Copy the full SHA
    40c0391 View commit details
    Browse the repository at this point in the history
  3. chore(get-modflow): revert 4c5e2ee for now (#2113)

    * until ARM mac distributions supported from all three distributions?
    wpbonelli authored Feb 20, 2024
    Configuration menu
    Copy the full SHA
    63c2af0 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. update(plotting): check for user set axes limits (#2108)

    * update(plotting): check for user set axes limits
    
    * added method to check for user supplied axes limits and set with default extents if autoscaling is on
    * update docstring in StructuredGrid.neighbors
    * add tests for axes limit checks and scaling
    
    * change np.alltrue back to np.all for numpy 2.0
    jlarsen-usgs authored Feb 21, 2024
    Configuration menu
    Copy the full SHA
    4e6f4c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Configuration menu
    Copy the full SHA
    53a94a9 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Configuration menu
    Copy the full SHA
    f2f2d9d View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. fix(str and repr): better repr and str output for transient data with…

    … multiple blocks (#2058) (#2102)
    
    * fix(str and repr): improved display string for str and repr data with multiple blocks
    
    * fix(str and repr)
    
    * fix(str/repr): pandas list str/repr fix
    scottrp authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    1fe5157 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. feat(binaryfile): get budget by second package name paknam2 (#2050)

    * feat get budget data by second package name `paknam2`
    
    * Add a test and update docstring
    
    ---------
    
    Co-authored-by: Langevin, Christian D <langevin@usgs.gov>
    ougx and langevin-usgs authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    5ec612a View commit details
    Browse the repository at this point in the history
  2. chore: switch to ruff, ignore known test warnings, numpy compat fixes (

    …#2124)
    
    * switch to ruff from black, isort, flake8, pylint, keep (mostly) the same settings
    * apply some suggested linting/formatting rules, ignore others in pyproject.toml
    * run ruff check --select NPY201 as suggested here, replace deprecated syntax
        * np.float_ -> np.float64
        * np.NaN -> np.nan
    * ignore well-known python-dateutil and pandas warnings
    wpbonelli authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    b142b08 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Configuration menu
    Copy the full SHA
    00b3d1c View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. fix(get_package and model_time): #2117, #2118 (#2123)

    * fix(get_package and model_time): #2117, #2118
    
    get_package now allows you to get package only by name or type, instead of always searching for a package both by name and type
    
    model_time displays the correct steady state array and no longer gets confused if packages are named similar to the package type it is searching for
    
    * fix(resolve merge conflict)
    
    ---------
    
    Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
    spaulins-usgs and scottrp authored Mar 20, 2024
    Configuration menu
    Copy the full SHA
    11f573b View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. feat(get-modflow): support windows parallel nightly build (#2128)

    * install with --repo modflow6-nightly-build --ostag win64par
    * todo: generalize asset name discovery?
    wpbonelli authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    43e5178 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Configuration menu
    Copy the full SHA
    f75853f View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. refactor(modpathfile): toward unified particle tracking api (#2127)

    * introduce base particle track file module and class
    * rename _ModpathSeries -> ModpathFile
    * deduplicate shared logic in ModpathFile
    * deprecate write_shapefile() params
    * prep to add support for MF6 PRT
    * clarify canonical (minimal) fields
    * add dtypes as class attributes
    * misc cleanup in plotutil.py
    wpbonelli authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    77e5e1d View commit details
    Browse the repository at this point in the history
  2. test(regression): fix syntax causing regression test failures (#2129)

    * accidentally broken with switch to ruff
    wpbonelli authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    e84f430 View commit details
    Browse the repository at this point in the history
  3. test(plotutil): fix syntax causing test failures (#2130)

    * accidentally broken with switch to ruff
    * fixes optional dependency ci tests
    wpbonelli authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    ed262db View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. feat(dis2d): introduce limited support for a 2D structured grid (for …

    …overland flow) (#2131)
    
    * This first PR doesn't really do anything, except define model shapes and cellids for dis2d
    * No testing yet
    * A modelgrid for this discretization type has not been addressed yet
    * Unclear what type of plotting and export to support
    langevin-usgs authored Apr 1, 2024
    Configuration menu
    Copy the full SHA
    18014af View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. feat(vtk): improve vtk particle track export (#2132)

    * support PRT pathline format
    * support dataframe or recarray
    * support merged or separate paths
    * attach layer array to exported points
    wpbonelli authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    3028863 View commit details
    Browse the repository at this point in the history
  2. feat(disv1d): rename DISL to DISV1D (#2133)

    * feat(disv1d): rename DISL to DISV1D
    * ruff
    
    Merging this in even though a few of the mf6 tests are failing.  Those tests will fail until this gets in.
    langevin-usgs authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    4c44cb0 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. fix(modflow): dataframe support was patchy in a few packages (#2136)

    * patch a few remaining gaps in support for dataframes
    * update mf6_mnw2_tutorial01.py to use dataframe pkg input
    * update a test in test_modflow.py to use dataframe pkg input
    wpbonelli authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    aa9f410 View commit details
    Browse the repository at this point in the history
  2. chore(format): add isort rule, update default rules (#2137)

    * extend default rules in pyproject.toml
    * apply import sorting
    * fix line lengths: demo what's needed to fully observe E501
      * flopy/version.py
      * update_version.py
      * flopy/utils/zonbud.py
    * ignore line length violations in comments for now
    wpbonelli authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    4c717cb View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Configuration menu
    Copy the full SHA
    0fe4150 View commit details
    Browse the repository at this point in the history
  2. fix(empty transient data): Empty first stress period block (#1091) (#…

    …2139)
    
    * fix(empty transient data): empty stress period 1 transient data is now retained and used to create empty stress period block (#1091)
    
    * fix(empty transient data)
    
    ---------
    
    Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
    spaulins-usgs and scottrp authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    0f14f1f View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. update(MFSimulationBase): allow simulations to have no attached models (

    #2140)
    
    * update(MFSimulationBase): allow simulations to have no attached models
    
    * updates for mfmodel
    jlarsen-usgs authored Apr 6, 2024
    Configuration menu
    Copy the full SHA
    9e87acd View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. fix(comma delimited, scientific notation): #2053 (#2144)

    * fix(comma delimited, scientific notation): #2053
    
    Fixed issue with flopy not reading a mix of space and comma delimited text and an issue where flopy does not read scientific notation when a capital "D" is used instead of "e" (1D-4).
    
    * fix(formatting)
    
    ---------
    
    Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
    spaulins-usgs and scottrp authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    5aaa5ff View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. chore(pandas): use sep instead of deprecated delim_whitespace (#2148)

    * delim_whitespace param on read_table() and read_csv() is deprecated, use sep="\\s+" instead
    * https://pandas.pydata.org/docs/whatsnew/v2.2.0.html#other-deprecations
    wpbonelli authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    99b8884 View commit details
    Browse the repository at this point in the history
  2. fix(empty transient arrays): #2145 (#2146)

    Empty transient array block were not being read or written correctly.
    
    Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
    spaulins-usgs and scottrp authored Apr 12, 2024
    Configuration menu
    Copy the full SHA
    f4a4274 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. feat(disv2d): introduce support for a 2D vertex grid (for overland fl…

    …ow) (#2151)
    
    * feat(disv2d): introduce limited support for a 2D vertex grid (for overland flow)
    
    * ruff ruff
    langevin-usgs authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    e023235 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    57cf82e View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. fix(grb): update binary grid file reader for new grid types (#2157)

    * fix(grb): update binary grid file reader for new grid types
    
    * more updates to support other grid types
    
    * try more general way that may prevent us from getting locked
    
    * try to implement methods in a way that does not required grid type
    langevin-usgs authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    30e0349 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Configuration menu
    Copy the full SHA
    187885b View commit details
    Browse the repository at this point in the history
  2. refactor(lgrutil): convert numpy types to builtins for np2 compat (#2158

    )
    
    * test_lgrutil.py fails with numpy>=2.0.0rc1
    * wrap numpy scalars with float() to avoid precision loss per https://numpy.org/devdocs/numpy_2_0_migration_guide.html#changes-to-numpy-data-type-promotion
    * using builtin types in custom output data structures, rather than mixing builtins and np types, seems preferable in general
    wpbonelli authored Apr 19, 2024
    Configuration menu
    Copy the full SHA
    029a4e1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ff82488 View commit details
    Browse the repository at this point in the history
  4. feat(vtk): include all arrays on pathline input (#2161)

    Instead of hardcoding which arrays to include in vtk pathline export, include all numeric arrays present in the pathline data
    wpbonelli authored Apr 19, 2024
    Configuration menu
    Copy the full SHA
    43cbe47 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Configuration menu
    Copy the full SHA
    bb5461b View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. feat(mp7particledata): add localz option for PRT PRP conversions (#2166)

    * determines whether to return local z coordinates
    * useful to set release elevation w.r.t. water table
    * minor docstring improvements
    wpbonelli authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    e50ab9a View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. test: mark tests requiring shapely (#2171)

    * use python 3.9 for example notebook tests in rtd.yml
    wpbonelli authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    50666a5 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. refactor(mp7particledata): match mp7 order in to_coords()/to_prp() (#…

    …2172)
    
    * return the same particle order from to_coords() and to_prp() as generated by MP7 — preserves particle indexing for MF6 PRT, making it easier to compare results
    * refactoring/cleanup, factor out helper methods get_cell_release_points(), get_face_release_points()
    * defer materialization — return iterators not lists so the consumer can control memory use, previously done for to_coords() and to_prp() but not get_release_points(), might be relevant for very large release configurations
    * test-drive a pytest plugin for previously hardcoded snapshot tests, introduce some fixtures in autotest/conftest.py for nicer array snapshots than the default format, maybe these could live in devtools if they see wider use?
    wpbonelli authored May 1, 2024
    Configuration menu
    Copy the full SHA
    c7af787 View commit details
    Browse the repository at this point in the history
  2. feat(sim options block packages): Support for packages declared in si…

    …mulation name file's options block (#2164)
    
    * feat(sim options block packages):
    
    Support for simulation options block packages added including the hpc package.
    
    * feat
    
    * feat
    
    * fix
    
    * fix(format)
    
    * fix(array reader)
    
    * Revert "fix(array reader)"
    
    This reverts commit 0b753ac.
    
    ---------
    
    Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
    spaulins-usgs and scottrp authored May 1, 2024
    Configuration menu
    Copy the full SHA
    4e1d53a View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. fix(gridgen): remove duplicate disv grid vertices #1492 (#2119)

    * round to remove near-duplicate vertices produced by GRIDGEN, with tunable precision
    wpbonelli authored May 2, 2024
    Configuration menu
    Copy the full SHA
    50bbd01 View commit details
    Browse the repository at this point in the history
  2. feat(sim options block packages): Support for packages declared in si…

    …mulation name file's options block (#2174)
    
    * feat(sim options block packages):
    
    Support for simulation options block packages added including the hpc package.
    
    * feat
    
    * feat
    
    * fix
    
    * fix(format)
    
    * fix(array reader)
    
    * Revert "fix(array reader)"
    
    This reverts commit 0b753ac.
    
    * fix(array reader): Limit array line size read based on the dimensions of the array (#2053)
    
    * fix(data formatting): test case data format issue
    
    * fix(test updates)
    
    * fix(reformat)
    
    * fix(HPC)
    
    ---------
    
    Co-authored-by: scottrp <45947939+scottrp@users.noreply.github.com>
    spaulins-usgs and scottrp authored May 2, 2024
    Configuration menu
    Copy the full SHA
    6237cec View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. fix(discretization/UnstructuredGrid) (#2177)

    * fix(discretization/UnstructuredGrid)
    
    Method from_gridspec:
    * allow comments before headers
    * force consistent upper case header strings for parsing
    * refactor autotest/test_grid.py and add test for gsf file with comment line
    
    * ruff
    
    * gsf file for test...ahem
    
    * test_grid.py remove comment lines form loaded file data
    cnicol-gwlogic authored May 3, 2024
    Configuration menu
    Copy the full SHA
    864732d View commit details
    Browse the repository at this point in the history
  2. fix(mfmodel): fix budgetkey for transport models (#2176)

    * add budgetkey param to MF6Output and pass it down to MF6ListBudget in MF6Output.__list()
    * update MFModel.output to set budgetkey to "MASS..." instead of volume for transport models
    * todo: revisit and generalize for additional model types
    wpbonelli authored May 3, 2024
    Configuration menu
    Copy the full SHA
    8e16aab View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. feat(MfList): support kper field in stress period data (#2179)

    ndarray is treated as before — only named data structures (recarray and dataframe) are considered, to avoid questions about where to put the kper column
    wpbonelli authored May 4, 2024
    Configuration menu
    Copy the full SHA
    7122219 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Configuration menu
    Copy the full SHA
    dc35b09 View commit details
    Browse the repository at this point in the history
  2. fix(gridintersect): relax cell boundary checks with np.isclose (#2173)

    Check np.isclose instead of exact equality in find_position_in_array() to allow for floating point error after round-trip coordinate transformation — if a coordinate passes the fuzzy check, clamp it to the cell boundary
    wpbonelli authored May 6, 2024
    Configuration menu
    Copy the full SHA
    15d1d7f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4968753 View commit details
    Browse the repository at this point in the history
  4. fix(MFFileAccessArray): read_text_data_from_file modified for non-lay…

    …ered (#2183)
    
    * fix(MFFileAccessArray): read_text_data_from_file modified to work with non-layered input
    
    * minor comment fix
    langevin-usgs authored May 6, 2024
    Configuration menu
    Copy the full SHA
    344579b View commit details
    Browse the repository at this point in the history
  5. docs(developer): document ruff, mention modflow-devtools, cleanup (#2185

    )
    
    * mention modflow-devtools testing dependency in DEVELOPER.md, motivated by #2180
    * update CONTRIBUTING.md and DEVELOPER.md with info on ruff instead of black/isort
    * update etc/environment.yml lint deps (ruff replaces black/isort/flake8/pylint)
    * remove scripts/pull_request_prepare.py, suggest ruff commands instead
    * update .github/workflows/release.yml to use ruff
    wpbonelli authored May 6, 2024
    Configuration menu
    Copy the full SHA
    12f80dc View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Configuration menu
    Copy the full SHA
    acfd0d3 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. test(snapshots): use devtools snapshot fixtures (#2189)

    * import snapshot fixtures from modflow-devtools and remove them from conftest.py
    * switch to dev version of devtools in environment.yml, use micromamba in rtd.yml ci
    wpbonelli authored May 15, 2024
    Configuration menu
    Copy the full SHA
    a7ee6b2 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. fix(get_structured_faceflows): fix lower face flows when idomain is -1 (

    #2192)
    
    get_structured_faceflows returned flf = 0 for cells when the cell below it has idmomain -1
    vincentpost authored May 17, 2024
    Configuration menu
    Copy the full SHA
    29e247d View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Configuration menu
    Copy the full SHA
    7879c2f View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. ci(release): remove unneeded run_notebooks.py script (#2194)

    * notebooks can be converted/executed with pytest via autotest/test_notebooks.py
    * no more need to run notebooks pre-release since ipynb files are not versioned
    wpbonelli authored May 23, 2024
    Configuration menu
    Copy the full SHA
    71350bc View commit details
    Browse the repository at this point in the history
  2. chore(dfns): update dfns and mf6 components (#2195)

    Update DFN files and generated mf6 component classes in preparation for 3.7.0 release
    wpbonelli authored May 23, 2024
    Configuration menu
    Copy the full SHA
    a49b613 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0764153 View commit details
    Browse the repository at this point in the history