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

Conversation

LilyLiu0719
Copy link
Contributor

@LilyLiu0719 LilyLiu0719 commented May 13, 2024

Pull request recommendations:

  • Name your pull request your-development-type/short-description. Ex: feature/gui
  • Link to any relevant issue in the PR description. Ex: Resolves [ENH: Create GUI for easy user input #12]
  • Provide context of changes.
  • Provide relevant tests for your feature or bug fix.
  • Provide or update documentation for any feature added by your pull request.

Thanks for contributing!

Change:

  1. Added classes for desalination and corresponding features (ModularUnit, StaticMixer, ROMembrane, UVSystem)
  2. Added an extended network function in parse_json.py, which allow networks incorporates subnetwork into a node in a existing network

@LilyLiu0719 LilyLiu0719 changed the title Add classes for desalination and extend network function Feature/Add classes for desalination and extend network function May 13, 2024
LilyLiu0719 and others added 25 commits May 13, 2024 21:18
* 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
* 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
* 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
Copy link
Contributor

Closing this as it will be handled in #89

@fletchapin fletchapin closed this Aug 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants