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

merge develop into transport #322

Merged
merged 34 commits into from
Feb 27, 2020

Commits on Dec 17, 2019

  1. fix(uzf): fix indexing error in UZF (MODFLOW-USGS#274)

    * Error introduced as part of recent UZF refactoring
    * Closes MODFLOW-USGS#273
    langevin-usgs committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    fb4d447 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2019

  1. fix(memory): some variables not deallocated (MODFLOW-USGS#278)

    Implemented new check in develop mode so code bombs with error if memory manager variable not deallocated
    langevin-usgs committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    c05f59b View commit details
    Browse the repository at this point in the history
  2. refactor(budobj): new budget object for advanced packages (MODFLOW-US…

    …GS#279)
    
    * single code base for writing binary budget files for advanced packages
    * single code base for creating and writing budget tables to list file for advanced packages
    * implemented for MAW, UZF, LAK, SFR, and MVR
    * closes MODFLOW-USGS#277
    * update mf6exes from 2.0 to 3.0
    * will allow generalized transport calculations for advanced packages
    langevin-usgs committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    ab4cc43 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2020

  1. refactor(advanced packages): read static data as part of df() (MODFLO…

    …W-USGS#281)
    
    * refactor(advanced packages): modify advanced packages to read all static data as part of df()
    * modify setup_budobj to include the connectivity so that it is available to other models
    langevin-usgs committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    040e572 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. Configuration menu
    Copy the full SHA
    f081258 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b81a177 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'develop' into transport

    # Conflicts:
    #	msvs/mf6.vfproj
    #	src/Utilities/BudgetTerm.f90
    langevin-usgs committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    c1a7fe9 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

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

Commits on Jan 10, 2020

  1. fix(lak): added sign checks for user specified lak flow terms (MODFLO…

    …W-USGS#288)
    
    * User-specified values for RAINFALL, EVAPORATION, RUNOFF, INFLOW, and WITHDRAWAL must be positive.  The program worked if these values were negative, but that doesn't necessarily make sense and is probably an input error.
    * Updated definition file to reflect these changes
    * Corrected minor typo in lake definition file
    * Updated release notes to reflect this change
    * Close MODFLOW-USGS#287
    langevin-usgs committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    10c4ada View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2020

  1. feat(sfr): add storage term to sfr budget (MODFLOW-USGS#293)

    * Also includes a reach volume term written as an aux variable.  This is needed for transport.
    * initialize str so non-ascii characters don't show up in output files
    * updated notes for these changes
    langevin-usgs committed Jan 27, 2020
    Configuration menu
    Copy the full SHA
    5f6e70c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0a7acd2 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2020

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

Commits on Jan 30, 2020

  1. refactor(sfr): Refactor SFR Package to remove use of Geometry objects (

    …MODFLOW-USGS#296)
    
    * refactor(sfr): Refactor SFR Package to remove use of Geometry objects
    
    * doc(pak-ts): update description of package timeseries variables. 
    
    * ci(yml): update yml to clone shallow copy of flopy and pymake repos
    
    * doc(release): Update release notes
    
    * Closes MODFLOW-USGS#276, and MODFLOW-USGS#289
    jdhughes-usgs committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    ef46069 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2020

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

Commits on Feb 10, 2020

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

Commits on Feb 12, 2020

  1. refactor(xt3d): accumulate flowja instead of set (MODFLOW-USGS#306)

    This change is required for transport, which accumulates terms in flowja
    langevin-usgs committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    0f2a497 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d750b95 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2020

  1. fix(dis): corrected connection vector error in DIS package (MODFLOW-U…

    …SGS#308)
    
    Code was incorrectly calculating cell center elevations when nozee was .false.  This error would have affected XT3D simulations with unconfined flow and non-zero values specified for ANGLE2 in the NPF Package.  It also would affect dispersive transport with XT3D for unconfined conditions.
    langevin-usgs committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    c39a17d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f345907 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1973d12 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. refactor(maw): refactor MAW conductance calculation for issue 305 (MO…

    …DFLOW-USGS#310)
    
    Add traps to catch 1) skin factors that are <= 0 when using the SKIN
    conductance equation and 2) and negative saturated conductances values.
    
    Closes MODFLOW-USGS#305
    jdhughes-usgs committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    e3f68e6 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2020

  1. feat(tableobj): Add a generic table object for lst file output (MODFL…

    …OW-USGS#303)
    
    Full implementation for SFR package. Partial implementation for LAK, MAW, and UZF packages.
    jdhughes-usgs committed Feb 21, 2020
    Configuration menu
    Copy the full SHA
    e400a8e View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2020

  1. feat(tableobj): update MAW package to use tableobj for data output (M…

    …ODFLOW-USGS#315)
    
    Also fix some budget reporting issues in the MAW package
    jdhughes-usgs committed Feb 24, 2020
    Configuration menu
    Copy the full SHA
    63b2388 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2020

  1. fix(auxmult): auxmult fix when auxmult and bound are in time series (M…

    …ODFLOW-USGS#316)
    
    * change order of time series interpolation so aux is done first in case it is an auxmult column
    * partially addresses MODFLOW-USGS#314
    * updated release notes
    langevin-usgs committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    db11c23 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    38343a9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6872df8 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2020

  1. Configuration menu
    Copy the full SHA
    de9f3cb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3460cfb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5301d5c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    69d08e1 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2020

  1. Configuration menu
    Copy the full SHA
    539a5e7 View commit details
    Browse the repository at this point in the history
  2. fix(lak): revise the way outlet to-mvr flows are stored in budobj (MO…

    …DFLOW-USGS#321)
    
    * fix(lak): revise the way outlet to-mvr flows are stored in budobj
    
    * updated release notes
    langevin-usgs committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    c896047 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cb60f0f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6df171c View commit details
    Browse the repository at this point in the history