Merge pull request #521 from NREL/ghp-thermal-updates

Add GHP proforma metrics and BAU thermal results Redo

julia_src/Manifest.toml

@@ -717,7 +717,7 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[deps.REopt]]
 deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"]
-git-tree-sha1 = "c7c00b10cfc323646d66a42228e0b65c96931b6d"
+git-tree-sha1 = "413b5cbf443cbfe03c94bab45e84a6bd4ad81b97"
 repo-rev = "master"
 repo-url = "https://github.com/NREL/REopt.jl.git"
 uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"

reoptjl/api.py

@@ -96,7 +96,7 @@ def obj_create(self, bundle, **kwargs):
         meta = {
             "run_uuid": run_uuid,
             "api_version": 3,
-            "reopt_version": "0.32.7",
+            "reopt_version": "0.35.0",
             "status": "Validating..."
         }
         bundle.data.update({"APIMeta": meta})

reoptjl/migrations/0047_existingboileroutputs_annual_thermal_production_mmbtu_bau_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.0.7 on 2023-10-03 22:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0046_ghpinputs_aux_cooler_installed_cost_per_ton_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='existingboileroutputs',
+            name='annual_thermal_production_mmbtu_bau',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='existingboileroutputs',
+            name='year_one_fuel_cost_before_tax_bau',
+            field=models.FloatField(blank=True, null=True),
+        ),
+    ]

reoptjl/migrations/0048_existingboileroutputs_annual_fuel_consumption_mmbtu_bau_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.0.7 on 2023-10-04 02:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0047_existingboileroutputs_annual_thermal_production_mmbtu_bau_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='existingboileroutputs',
+            name='annual_fuel_consumption_mmbtu_bau',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='existingchilleroutputs',
+            name='annual_electric_consumption_kwh_bau',
+            field=models.FloatField(blank=True, help_text='Annual chiller electric consumption for BAU case [kWh]', null=True),
+        ),
+        migrations.AddField(
+            model_name='existingchilleroutputs',
+            name='annual_thermal_production_tonhour_bau',
+            field=models.FloatField(blank=True, help_text='Annual chiller thermal production for BAU case [Ton Hour]', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='lifecycle_fuel_costs_after_tax_bau',
+            field=models.FloatField(blank=True, help_text='Component of lifecycle costs (LCC). This value is the present value of all fuel costs over the analysis period, after tax in the BAU case.', null=True),
+        ),
+        migrations.AlterField(
+            model_name='existingchilleroutputs',
+            name='annual_thermal_production_tonhour',
+            field=models.FloatField(blank=True, help_text='Annual chiller thermal production [Ton Hour]', null=True),
+        ),
+    ]

reoptjl/models.py

@@ -1005,6 +1005,11 @@ class FinancialOutputs(BaseModel, models.Model):
         help_text=("Component of lifecycle costs (LCC). This value is the present value of all fuel costs over the analysis period, after tax.")
     )
 
+    lifecycle_fuel_costs_after_tax_bau = models.FloatField(
+        null=True, blank=True,
+        help_text=("Component of lifecycle costs (LCC). This value is the present value of all fuel costs over the analysis period, after tax in the BAU case.")
+    )
+
     lifecycle_chp_standby_cost_after_tax = models.FloatField(
         null=True, blank=True,
         help_text=("Component of lifecycle costs (LCC). This value is the present value of all CHP standby charges, after tax.")
@@ -4626,12 +4631,24 @@ class ExistingChillerOutputs(BaseModel, models.Model):
         help_text=("Annual chiller electric consumption [kWh]")
     )
 
+    annual_electric_consumption_kwh_bau = models.FloatField(
+        null=True,
+        blank=True,
+        help_text=("Annual chiller electric consumption for BAU case [kWh]")
+    )    
+
     annual_thermal_production_tonhour = models.FloatField(
         null=True,
         blank=True,
-        help_text=("Annual chiller thermal production [Ton Hour")
+        help_text=("Annual chiller thermal production [Ton Hour]")
     )
 
+    annual_thermal_production_tonhour_bau = models.FloatField(
+        null=True,
+        blank=True,
+        help_text=("Annual chiller thermal production for BAU case [Ton Hour]")
+    )        
+
     def clean(self):
         pass
 
@@ -4803,6 +4820,7 @@ class ExistingBoilerOutputs(BaseModel, models.Model):
     )
 
     annual_fuel_consumption_mmbtu = models.FloatField(null=True, blank=True)
+    annual_fuel_consumption_mmbtu_bau = models.FloatField(null=True, blank=True)
 
     fuel_consumption_series_mmbtu_per_hour = ArrayField(
         models.FloatField(null=True, blank=True),
@@ -4812,7 +4830,9 @@ class ExistingBoilerOutputs(BaseModel, models.Model):
     lifecycle_fuel_cost_after_tax = models.FloatField(null=True, blank=True)
     lifecycle_fuel_cost_after_tax_bau = models.FloatField(null=True, blank=True)
     annual_thermal_production_mmbtu = models.FloatField(null=True, blank=True)
+    annual_thermal_production_mmbtu_bau = models.FloatField(null=True, blank=True)
     year_one_fuel_cost_before_tax = models.FloatField(null=True, blank=True)
+    year_one_fuel_cost_before_tax_bau = models.FloatField(null=True, blank=True)
 
     thermal_to_storage_series_mmbtu_per_hour = ArrayField(
         models.FloatField(null=True, blank=True),