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

Update to v2 pre-release #312

Merged
merged 62 commits into from
Nov 14, 2024
Merged

Update to v2 pre-release #312

merged 62 commits into from
Nov 14, 2024

Commits on Sep 4, 2024

  1. allow disconnected nodes in flowgraph

    @jmccreight
    jmccreight committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    52bfc28 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. move python versions forward, pin setuptools because of issue

    @jmccreight
    jmccreight committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    8bcf362 View commit details
    Browse the repository at this point in the history

  2. move python versions forward, pin setuptools because of issue, xfail … 

    …mmr_to_mf6 tests
    @jmccreight
    jmccreight committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    e953e14 View commit details
    Browse the repository at this point in the history

  3. update env to match pyproject

    @jmccreight
    jmccreight committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    7e49bb3 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. enhance flow graph tests, add ci_local.sh

    @jmccreight
    jmccreight committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    0cc98bb View commit details
    Browse the repository at this point in the history

  2. update ci_local

    @jmccreight
    jmccreight committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    ab73962 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. add arrowhead lake pic

    @jmccreight
    jmccreight committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    0de2486 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. extra coordinates in netcdf output

    @jmccreight
    jmccreight committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    f643e5d View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. fix mmr to dfw, renaming swf to chf; some other pyproject and env fixes

    @jmccreight
    jmccreight committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    223994d View commit details
    Browse the repository at this point in the history

  2. lint

    @jmccreight
    jmccreight committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    767d498 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. fix StarfitFlowNode to return scalars but track np 1d arrays internal… 

    …ly for budget; netcdf extra coordinates handled for xr.open_dataarray; xr time not ns warnings addressed
    @jmccreight
    jmccreight committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    9eefbb9 View commit details
    Browse the repository at this point in the history

  2. remove unused dependence

    @jmccreight
    jmccreight committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    692608b View commit details
    Browse the repository at this point in the history

  3. update python version for rtd builds; setup-micromamba/issues/225 pin… 

    …ning attempt 1
    @jmccreight
    jmccreight committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    c7da527 View commit details
    Browse the repository at this point in the history

  4. setup-micromamba/issues/225 pinning attempt 2

    @jmccreight
    jmccreight committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    8e46ee7 View commit details
    Browse the repository at this point in the history

  5. setup-micromamba/issues/225 pinning attempt 3

    @jmccreight
    jmccreight committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    6399471 View commit details
    Browse the repository at this point in the history

  6. setup-micromamba/issues/225 pinning attempt 4

    @jmccreight
    jmccreight committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    668684b View commit details
    Browse the repository at this point in the history

  7. disable mf6 related tests pending fix of install-modflow-action

    @jmccreight
    jmccreight committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    9baa0f3 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. setup-micromamba/issues/225 pinning for ci_examples.yaml

    @jmccreight
    jmccreight committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    2b6c260 View commit details
    Browse the repository at this point in the history

  2. update notebook 06

    @jmccreight
    jmccreight committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    a5ddbf3 View commit details
    Browse the repository at this point in the history

  3. refactor for changes in pyPRMS

    @jmccreight
    jmccreight committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    c34273e View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. micromamba-version: 1.5.10-0

    @jmccreight
    jmccreight committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    5db46ff View commit details
    Browse the repository at this point in the history

  2. comment check against MF6 output

    @jmccreight
    jmccreight committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    bbd070f View commit details
    Browse the repository at this point in the history

  3. details of outputing FlowGraph coordinates

    @jmccreight
    jmccreight committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    809b45b View commit details
    Browse the repository at this point in the history

  4. add new notebook 06 details

    @jmccreight
    jmccreight committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    f1249fd View commit details
    Browse the repository at this point in the history

  5. little linting

    @jmccreight
    jmccreight committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    8b3d96b View commit details
    Browse the repository at this point in the history

  6. node_maker_id missed in a few tests; bring back MF6 binary install

    @jmccreight
    jmccreight committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    3f6242b View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. update to pyPRMS new API for data files

    @jmccreight
    jmccreight committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    173913d View commit details
    Browse the repository at this point in the history

  2. clean up extra_coords/string/chararray coordinate outputs for flow graph

    @jmccreight
    jmccreight committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    5056023 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. regression means

    @jmccreight
    jmccreight committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    9a63115 View commit details
    Browse the repository at this point in the history

  2. update notebook 06; add notebook 07

    @jmccreight
    jmccreight committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    eed30d3 View commit details
    Browse the repository at this point in the history

  3. update rtd yaml python version

    @jmccreight
    jmccreight committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    8c5c55d View commit details
    Browse the repository at this point in the history

  4. suppress warnings temporarily in CI

    @jmccreight
    jmccreight committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    f98f7ae View commit details
    Browse the repository at this point in the history

  5. suppress warnings temporarily in CI part 2

    @jmccreight
    jmccreight committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    9b1183c View commit details
    Browse the repository at this point in the history

  6. suppress warnings temporarily in CI part 3, ci yaml work

    @jmccreight
    jmccreight committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    8442785 View commit details
    Browse the repository at this point in the history

  7. suppress warnings temporarily in CI part 4, pathlib detail

    @jmccreight
    jmccreight committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    1e0e354 View commit details
    Browse the repository at this point in the history

  8. suppress warnings temporarily in CI part 5, ci errors with env vars

    @jmccreight
    jmccreight committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    2b3452a View commit details
    Browse the repository at this point in the history

  9. suppress warnings temporarily in CI part 6, ipython dosent take -W

    @jmccreight
    jmccreight committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    1763176 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Merge pull request EC-USGS#307 from jmccreight/feat_swf 

    fix mmr to dfw, renaming swf to chf;
    @jmccreight
    jmccreight authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    c02941b View commit details
    Browse the repository at this point in the history

  2. pws 2 review fixes

    @jmccreight
    jmccreight committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    f18fe4f View commit details
    Browse the repository at this point in the history

  3. merge upstream/develop

    @jmccreight
    jmccreight committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    b29a899 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. FlowGraph capability to cull additional, heterogeneous variables from… 

    … Nodes and output to NetCDF
    @jmccreight
    jmccreight committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    7612552 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. prms_channel_flow_graph _postprocess and _model_dict both handle new … 

    …nodes grouped in-series; various FlowGraph details and testing
    @jmccreight
    jmccreight committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    e3d4001 View commit details
    Browse the repository at this point in the history

  2. rename ObsInNode -> ObsInFlowNode and PassThroughNode -> PassThroughF… 

    …lowNode
    @jmccreight
    jmccreight committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    b878c37 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. fix renaming to ObsInFlowNode in notebook 06

    @jmccreight
    jmccreight committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    582b030 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. fix renaming to ObsInFlowNode in notebook 06, part 2

    @jmccreight
    jmccreight committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    d8e7881 View commit details
    Browse the repository at this point in the history

  2. Merge pull request EC-USGS#306 from jmccreight/feat_flow_dag 

    additional FlowGraph features
    @jmccreight
    jmccreight authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    e566244 View commit details
    Browse the repository at this point in the history

  3. inital numpy2 migration

    @jmccreight
    jmccreight committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    95cfaa3 View commit details
    Browse the repository at this point in the history

  4. merge upstream/develop

    @jmccreight
    jmccreight committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    1220ee4 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. numpy2 fix for converting column 0 of PRMS csv files

    @jmccreight
    jmccreight committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    b00d11b View commit details
    Browse the repository at this point in the history

  2. update environment.yml

    @jmccreight
    jmccreight committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    cc63680 View commit details
    Browse the repository at this point in the history

  3. numpy 2: fix errors, warnings, and additional warnings

    @jmccreight
    jmccreight committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    f3c292a View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. fix error and warnings in notebook 07

    @jmccreight
    jmccreight committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    abd4b79 View commit details
    Browse the repository at this point in the history

  2. Merge pull request EC-USGS#310 from jmccreight/feat_numpy_2.0 

    Feat numpy 2.0
    @jmccreight
    jmccreight authored Oct 26, 2024
    Configuration menu
    Copy the full SHA
    2920c8f View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. stop testing Fortran code; xml output for domainless tests

    @jmccreight
    jmccreight committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    1151d8c View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. touch up some FlowGraph docs and notebook 06

    @jmccreight
    jmccreight committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    1711c82 View commit details
    Browse the repository at this point in the history

  2. lint up some E501s

    @jmccreight
    jmccreight committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    f5a0b23 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. final update of notebooks

    @jmccreight
    jmccreight committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    593f7b6 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Merge pull request EC-USGS#311 from jmccreight/feat_flow_dag 

    Feat flow dag
    @jmccreight
    jmccreight authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    ff674c3 View commit details
    Browse the repository at this point in the history

  2. merge upstream/develop into feat_3099

    @jmccreight
    jmccreight committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    50a45eb View commit details
    Browse the repository at this point in the history

  3. fix bad merge

    @jmccreight
    jmccreight committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    b6df066 View commit details
    Browse the repository at this point in the history

  4. fix bad merge some more

    @jmccreight
    jmccreight committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    87129c2 View commit details
    Browse the repository at this point in the history

  5. remove incomplete cascading flow notebook.

    @jmccreight
    jmccreight committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    f632b16 View commit details
    Browse the repository at this point in the history