Skip to content

Commit

Permalink
stay under 63 char limit
Browse files Browse the repository at this point in the history
  • Loading branch information
adfarth committed Dec 12, 2024
1 parent 0f30a79 commit bf8bdab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Classify the change according to the following categories:
- Added the following outputs:
- ElectricUtility **annual_renewable_electricity_supplied_kwh**
- Site **onsite_and_grid_renewable_electricity_fraction_of_elec_load**
- Site **onsite_and_grid_renewable_energy_fraction_of_elec_and_thermal_load**
- Site **onsite_and_grid_renewable_energy_fraction_of_total_load**
- Added input option optimize_soc_init_fraction (defaults to false) to ElectricStorage, which makes the optimization choose the inital SOC (equal to final SOC) instead of using soc_init_fraction. The initial SOC is also constrained to equal the final SOC, which eliminates the "free energy" issue. We currently do not fix SOC when soc_init_fraction is used because this has caused infeasibility.
### Changed
- Changed name of the following inputs:
Expand Down
4 changes: 2 additions & 2 deletions reoptjl/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ class SiteOutputs(BaseModel, models.Model):
"content of grid-purchased electricity, accounting for any battery efficiency losses."
)
)
onsite_and_grid_renewable_energy_fraction_of_elec_and_thermal_load = models.FloatField(
onsite_and_grid_renewable_energy_fraction_of_total_load = models.FloatField(
null=True, blank=True,
help_text=(
"Calculation is the same as onsite_renewable_energy_fraction_of_elec_and_thermal_load, but additionally includes the renewable energy"
Expand Down Expand Up @@ -582,7 +582,7 @@ class SiteOutputs(BaseModel, models.Model):
"content of grid-purchased electricity, accounting for any battery efficiency losses."
)
)
onsite_and_grid_renewable_energy_fraction_of_elec_and_thermal_load_bau = models.FloatField(
onsite_and_grid_renewable_energy_fraction_of_total_load_bau = models.FloatField(
null=True, blank=True,
help_text=(
"Calculation is the same as onsite_renewable_energy_fraction_of_elec_and_thermal_load, but additionally includes the renewable energy"
Expand Down

0 comments on commit bf8bdab

Please sign in to comment.