Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
3bc7851
create empty CHP inputs and outputs django models
hdunham Jul 19, 2022
a556375
add chp output fields to job/models.py
hdunham Jul 20, 2022
a9885a4
Merge branch 'develop' into chp-v3
zolanaj Sep 19, 2022
fa3e25f
add CHP inputs to models
zolanaj Sep 21, 2022
e18d05b
Add CHPOutputs to process_results.py
zolanaj Sep 21, 2022
83dbb34
add CHPInputs to validators.py
zolanaj Sep 21, 2022
f7ece62
add CHP Tech I/O to views.py
zolanaj Sep 21, 2022
a97f490
Merge branch 'develop' into chp-v3
zolanaj Sep 21, 2022
1363961
add clean functions for CHPInputs, CHPOutputs
zolanaj Sep 22, 2022
1bd8351
update CHP efficiency terms to match Julia package
zolanaj Sep 22, 2022
22978d1
Create chp_defaults_v3.json
zolanaj Sep 22, 2022
10f3a64
update naming to match updates to Julia package
zolanaj Sep 22, 2022
671b99d
rm unused inputs
zolanaj Sep 22, 2022
c684ace
update CHPInputs help text and default values
zolanaj Sep 22, 2022
246878e
update CHP prime_mover, size_class choices to match size classes
zolanaj Sep 22, 2022
2684bf3
populate CHP efficiencies and prime-mover-specific defaults
zolanaj Sep 22, 2022
46925b4
check sizing of CHP is within size class bounds, change max_kw to cla…
zolanaj Sep 22, 2022
716c500
add CHP to validator post, test
zolanaj Sep 22, 2022
4f676d1
only update fields not specified in the post
zolanaj Sep 23, 2022
77cc150
comment size class check against min, max kw
zolanaj Sep 23, 2022
2b0f5e5
Create 0011_chpoutputs_chpinputs.py
zolanaj Sep 23, 2022
f633abf
update CHP validation test
zolanaj Sep 23, 2022
af569a3
add check to update installed costs
zolanaj Sep 23, 2022
439bb5c
Update Changelog for CHP-v3 additions
zolanaj Sep 23, 2022
f446966
blank=True for CHPInputs fields installed_cost_per_kw, tech_sizes_fo…
zolanaj Oct 10, 2022
1035b8a
allow CHP tech_sizes_for_cost_curve to be blank when prime_mover is b…
zolanaj Oct 10, 2022
27ba7d6
Update 0011_chpoutputs_chpinputs.py
zolanaj Oct 10, 2022
62421d0
rm default value from CHPInputs.om_cost_per_kwh
zolanaj Oct 12, 2022
0e3001f
fix prime_mover reference when cleaning CHPInputs
zolanaj Oct 12, 2022
1bb5912
add CHP validation tests
zolanaj Oct 12, 2022
f5bf648
Fix CHP.unavailability_periods assignment
Bill-Becker Oct 13, 2022
a88b7b6
Merge branch 'develop' into chp-v3
Bill-Becker Oct 26, 2022
571e2b6
Update to latest REopt.jl with CHP defaults functions
Bill-Becker Oct 31, 2022
ccda853
Add /chp_defaults endpoint to http.jl
Bill-Becker Oct 31, 2022
f3943e9
Add job/chp_defaults endpoint which calls http.jl chp_defaults
Bill-Becker Oct 31, 2022
564f3ff
Add chp_defaults to job.urls
Bill-Becker Oct 31, 2022
9117554
Add test file for http.jl endpoints
Bill-Becker Oct 31, 2022
c0371ac
Remove time series clean of fuel_cost_per_mmbtu
Bill-Becker Oct 31, 2022
327efe1
Increase max value for CHP.size_class
Bill-Becker Nov 1, 2022
222f08f
Remove reo_views from /job/views
Bill-Becker Nov 1, 2022
42b8635
Add job/simulated_load endpoint
Bill-Becker Nov 9, 2022
abb0e68
Add job/simulated_load URL
Bill-Becker Nov 9, 2022
43a7a93
Add CHP to update_inputs_in_database()
Bill-Becker Nov 9, 2022
f7b4087
Remove CHP defaults logic from models.py
Bill-Becker Nov 9, 2022
97f9ede
Add /simulated_load endpoint to http.jl
Bill-Becker Nov 9, 2022
49afaa2
Use simulated-load branch for REopt.jl
Bill-Becker Nov 9, 2022
220ec23
Update julia_src environment, but still uses REopt#simulated-load
Bill-Becker Nov 10, 2022
7f259d3
Skip test_http_endpoint because not merged into REopt.jl yet
Bill-Becker Nov 10, 2022
d5cf29d
Import skip macro to skip test_http_endpoint
Bill-Becker Nov 10, 2022
02efe57
Skip other test_http_endpoint test (WIP anyway)
Bill-Becker Nov 10, 2022
5c23629
Add more http.jl endpoint tests
Bill-Becker Nov 10, 2022
76bf1e9
Add CHP to inputs dict passed to REopt.jl
Bill-Becker Nov 14, 2022
c37b5de
Update CHP model fields with new defaults logic
Bill-Becker Nov 14, 2022
d49aa9d
Fix error_message check condition
Bill-Becker Nov 14, 2022
3331a4c
Add/update CHP/ExistingBoiler/SteamTurbine outputs based on latest RE…
Bill-Becker Nov 14, 2022
4623f35
Conditionally check for CHP to update CHPInputs from Julia response
Bill-Becker Nov 14, 2022
68b62fa
Remove unneeded chp_defaults_v3
Bill-Becker Nov 14, 2022
903bc92
Change test for CHP defaults, from /reopt Julia instead of validators
Bill-Becker Nov 14, 2022
a3a59cd
Update REopt.jl to latest #simulated-load branch
Bill-Becker Nov 14, 2022
6bba824
Fix test_validator for CHP required input
Bill-Becker Nov 14, 2022
74c9ab0
Update REopt.jl to latest published version
Bill-Becker Nov 21, 2022
4ab141e
Update REopt.jl to v0.22.0
Bill-Becker Nov 21, 2022
386d728
Move new stuff into Develop heading and add more
Bill-Becker Nov 23, 2022
be3e112
Update formatting of CHANGELOG.md additions to Develop
Bill-Becker Nov 23, 2022
74a26ba
add test for catching bad or missing inputs in simulated_load
zolanaj Nov 29, 2022
f595296
Merge branch 'develop' into chp-v3
zolanaj Nov 29, 2022
3082a43
fix format of inputs dictionary value in bad inputs test within test_…
zolanaj Nov 29, 2022
98b151d
fix bad inputs test
zolanaj Nov 29, 2022
94c018d
fix bad inputs test
zolanaj Nov 29, 2022
dc71a2b
Merge branch 'chp-v3' of https://github.com/NREL/REopt_API into chp-v3
zolanaj Nov 29, 2022
0c20a1b
rm test of missing inputs
zolanaj Nov 29, 2022
0013506
Merge pull request #340 from NREL/chp-v3
Bill-Becker Nov 29, 2022
98cfbeb
Label CHANGELOG changes under new version
Bill-Becker Nov 29, 2022
6412e59
Merge branch 'master' into develop
Bill-Becker Nov 29, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,25 @@ Classify the change according to the following categories:
##### Removed
### Patches

## v2.4.0
### Minor Updates
##### Added
- In `job/models.py`:
- add **CHPInputs** model
- add **CHPOutputs** model
- In `job/process_results.py` add **CHPOutputs**
- In `job/validators.py` add new input models
- In `job/views.py`:
- add new input/output models to properly save the inputs/outputs
- add `/chp_defaults` endpoint which calls the http.jl chp_defaults endpoint
- add `/simulated_load` endpoint which calls the http.jl simulated_load endpoint

## v2.3.1
### Minor Updates
##### Fixed
Lookback charge parameters expected from the URDB API call were changed to the non-caplitalized format, so they are now used properly.

## v2.3.0
### Minor Updates
##### Changed
The following name changes were made in the `job/` endpoint and `julia_src/http.jl`:
- Change "_pct" to "_rate_fraction" for input and output names containing "discount", "escalation", and "tax_pct" (financial terms)
Expand Down
101 changes: 101 additions & 0 deletions job/migrations/0011_chpoutputs_chpinputs.py

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions job/migrations/0012_alter_chpinputs_size_class.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 4.0.6 on 2022-11-01 14:22

import django.core.validators
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('job', '0011_chpoutputs_chpinputs'),
]

operations = [
migrations.AlterField(
model_name='chpinputs',
name='size_class',
field=models.IntegerField(blank=True, default=1, help_text='CHP size class. Must be a strictly positive integer value', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(7)]),
),
]
29 changes: 29 additions & 0 deletions job/migrations/0013_alter_chpinputs_om_cost_per_kw_and_more.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Generated by Django 4.0.6 on 2022-11-10 22:29

import django.core.validators
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('job', '0012_alter_chpinputs_size_class'),
]

operations = [
migrations.AlterField(
model_name='chpinputs',
name='om_cost_per_kw',
field=models.FloatField(blank=True, default=0.0, help_text='Annual CHP fixed operations and maintenance costs in $/kW', null=True, validators=[django.core.validators.MinValueValidator(0.0), django.core.validators.MaxValueValidator(1000.0)]),
),
migrations.AlterField(
model_name='chpinputs',
name='prime_mover',
field=models.TextField(blank=True, choices=[('recip_engine', 'Recip Engine'), ('micro_turbine', 'Micro Turbine'), ('combustion_turbine', 'Combustion Turbine'), ('fuel_cell', 'Fuel Cell')], help_text='CHP prime mover, one of recip_engine, micro_turbine, combustion_turbine, fuel_cell', null=True),
),
migrations.AlterField(
model_name='chpinputs',
name='size_class',
field=models.IntegerField(blank=True, help_text='CHP size class. Must be a strictly positive integer value', null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(7)]),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Generated by Django 4.0.6 on 2022-11-14 04:47

import django.contrib.postgres.fields
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('job', '0013_alter_chpinputs_om_cost_per_kw_and_more'),
]

operations = [
migrations.RenameField(
model_name='existingboileroutputs',
old_name='thermal_to_tes_series_mmbtu_per_hour',
new_name='year_one_fuel_consumption_series_mmbtu_per_hour',
),
migrations.RenameField(
model_name='existingboileroutputs',
old_name='year_one_fuel_consumption_mmbtu_per_hour',
new_name='year_one_thermal_production_series_mmbtu_per_hour',
),
migrations.RenameField(
model_name='existingboileroutputs',
old_name='year_one_thermal_production_mmbtu_per_hour',
new_name='year_one_thermal_to_steamturbine_series_mmbtu_per_hour',
),
migrations.AddField(
model_name='chpoutputs',
name='year_one_thermal_to_steamturbine_series_mmbtu_per_hour',
field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Thermal power to TES time-series array [MMBtu/hr]', size=None),
),
migrations.AddField(
model_name='existingboileroutputs',
name='year_one_thermal_to_tes_series_mmbtu_per_hour',
field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), default=list, size=None),
),
]
Loading