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

Feature/Add classes for desalination and extend network function #88

Closed
wants to merge 29 commits into from

Commits on Apr 12, 2024

  1. add classes for desal

    LilyLiu0719 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    e6537cd View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

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

Commits on Apr 29, 2024

  1. add verbose

    LilyLiu0719 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    1508cff View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

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

Commits on May 14, 2024

  1. Configuration menu
    Copy the full SHA
    54e8271 View commit details
    Browse the repository at this point in the history
  2. fix tank num_units issue

    LilyLiu0719 committed May 14, 2024
    Configuration menu
    Copy the full SHA
    a439528 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. complete merge

    LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    f04aa8d View commit details
    Browse the repository at this point in the history
  2. Docs/hello world (#80)

    * First skeleton of hello world docs
    
    * Working on JSON description
    
    * progress on documentation
    
    * WIP on docs'
    
    * Fixed typo in sample.json
    
    * Updated advanced.rst
    
    * More progress on docs
    
    * WIP on updating tests
    
    * Only a few tests still failing
    
    * All tests now passing
    
    * Finished hello.rst
    
    * Updated theme to sphinx-rtd-theme
    
    * First draft of docs is done
    
    * Passes flake8
    fletchapin authored and LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    07dc95f View commit details
    Browse the repository at this point in the history
  3. Hotfix/net num units (#81)

    * Changing name of network.units to network.num_units
    
    * Updated tests to account for name change
    
    * Fixed a couple corrupted pickle files
    
    * Fixed flake8 whitespace error
    
    * Reformatted with black
    fletchapin authored and LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    3cbb8a7 View commit details
    Browse the repository at this point in the history
  4. Added CIFE acknowledgement (#85)

    fletchapin authored and LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    7bb9d58 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    dab0d04 View commit details
    Browse the repository at this point in the history
  6. Feature/battery-attributes (#87)

    * Added charge rate and RTE attributes to battery
    
    * Added ContentsType for chemical dosing
    
    * Tweak to Speed units
    
    * Added hertz to unit processing
    
    * Removed units from capacity, charge, and discharge rate
    
    * Implemented FutureWarning for old syntax
    
    * Added backwards compatability with getters/setters
    
    * test_get_capacities completed
    
    * Created get_efficiencies function
    
    * Autoreformatted with black
    
    * Trying to fix getter and setter for backwards compatability
    
    * Fixed test_get_efficiencies
    
    * Still trying to figure out back compat
    
    * Forgot to import warnings, duh
    
    * Removed flake8 warnings
    
    * trying to break circular dependency
    
    * Typos in energy_capacity
    
    * Trying to avoid infinite recursion
    
    * Finally fixed the getter/setters
    
    * Fixed backwards compat with charge_rate
    
    * Typo in del_charge_rate
    
    * Added RTE getter/setter
    
    * Forgot getter/setter for leakage
    
    * Adding verbose flag
    
    * Missed variable assignment in parse_json
    
    * WIP updating flow rate logic
    
    * Reworked flow rate and pressure representation
    
    * fixed test_get_capacities
    
    * Typo in CAPACITY_ATTRS
    
    * Fixed to_json bug with capacities
    
    * Fixed line too long linter error
    
    * Extending tests to DeprecationWarnings
    
    * Fixed unused import linter error
    fletchapin authored and LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    97f1a00 View commit details
    Browse the repository at this point in the history
  7. Bump version: 0.5.0 → 0.5.1

    fletchapin authored and LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    6423138 View commit details
    Browse the repository at this point in the history
  8. add classes for desal

    LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    a68152e View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    36b748c View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    d87ea03 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    1e12086 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    09b0f20 View commit details
    Browse the repository at this point in the history
  13. update extend node

    LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    a6c8cbd View commit details
    Browse the repository at this point in the history
  14. complete merge

    LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    b58714e View commit details
    Browse the repository at this point in the history
  15. remove duplicated

    LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    ec6100e View commit details
    Browse the repository at this point in the history
  16. update parse_json

    LilyLiu0719 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    73dbe9a View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. update plot data function

    LilyLiu0719 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    f3a57eb View commit details
    Browse the repository at this point in the history
  2. fix formatting issue

    LilyLiu0719 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    78e90e5 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Configuration menu
    Copy the full SHA
    46776a3 View commit details
    Browse the repository at this point in the history
  2. remove sb data from git

    LilyLiu0719 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    91fd2fa View commit details
    Browse the repository at this point in the history
  3. remove sb vis from git

    LilyLiu0719 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    7dc19e7 View commit details
    Browse the repository at this point in the history
  4. merge test_to_json

    LilyLiu0719 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    4a4f832 View commit details
    Browse the repository at this point in the history
  5. formating

    LilyLiu0719 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    f69fb9c View commit details
    Browse the repository at this point in the history