Skip to content

PR 257 AMO/CHP and GTO/GHP additions#266

Merged
Bill-Becker merged 241 commits into
masterfrom
develop
Sep 29, 2021
Merged

PR 257 AMO/CHP and GTO/GHP additions#266
Bill-Becker merged 241 commits into
masterfrom
develop

Conversation

@Bill-Becker
Copy link
Copy Markdown
Collaborator

Merge the content of PR 257 AMO/CHP and GTO/GHP additions from develop into master.

Add sections in reopt.jl and process_results
Now only create this dV if SteamTurbineTechs is not empty
Previously these were hard-coded and not properly handled in *.jl
The previous expected SOC value was changing while objective function was the same when there were changes to the model

The main purpose of this test is to check if the soc_incentive=True causes a higher SOC than if soc_incentive=False
Bill-Becker and others added 26 commits September 21, 2021 08:12
Without this, dvSupplementaryFiringCHPSize can be zero and still get y-int amount of heat extra
Div by Zero error when default total elec load is zero
Move from load_profile, and make DRY using this in BuiltInProfile.city property
Also move the default data into ghpghx/models.py
Unneeded separate classes with how they were used
…p_uuid in the reo GHP inputs

Before, this data was being stored in both /ghpghx models and /reo models inside of GHP.ghpghx_response.
Issue caused by changing heating load data locations
Bumps [django](https://github.com/django/django) from 3.1.12 to 3.1.13.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.1.12...3.1.13)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Ghp updates to address NLaws review comments
conda activate base
erge branch 'develop' into ghp
GTO (GHP) and AMO (CHP) FY21 Deliverables
@Bill-Becker Bill-Becker requested a review from NLaws September 29, 2021 14:45
Bump version to 1.7.0 with these new additions
@Bill-Becker Bill-Becker merged commit 990786a into master Sep 29, 2021
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.

3 participants