Merge pull request #382 from NREL/develop

Add CHP, /chp_defaults, and /simulated_load end to /dev for v3

CHANGELOG.md

@@ -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)

job/migrations/0012_alter_chpinputs_size_class.py

@@ -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)]),
+        ),
+    ]

job/migrations/0013_alter_chpinputs_om_cost_per_kw_and_more.py

@@ -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)]),
+        ),
+    ]

job/migrations/0014_rename_thermal_to_tes_series_mmbtu_per_hour_existingboileroutputs_year_one_fuel_consumption_series_m.py

@@ -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),
+        ),
+    ]