Merge pull request #560 from NREL/develop

Fix /summary endpoint, fix generator cost input, add LCC outputs

Author: Bill-Becker

CHANGELOG.md

@@ -27,6 +27,16 @@ Classify the change according to the following categories:
     ### Patches
 
 
+## v3.3.0
+### Minor Updates
+#### Added 
+- Added the following BAU outputs:  lifecycle_chp_standby_cost_after_tax, lifecycle_elecbill_after_tax, lifecycle_production_incentive_after_tax, lifecycle_outage_cost, lifecycle_MG_upgrade_and_fuel_cost
+### Changed
+- Updated REopt.jl version to 0.39.1 along with updates to other dependencies
+#### Fixed
+- Fixed setting of default Generator `installed_cost_per_kw` so that user inputs are not overridden 
+- Avoid /summary endpoint error with off-grid runs where there is no ElectricTariff
+
 ## v3.2.3
 ### Minor Updates
 ##### Changed

julia_src/highs/Manifest.toml

@@ -790,11 +790,9 @@ 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 = "a56f12eca2b737e9d9210000ee599920001cc303"
-repo-rev = "v0.38.1"
-repo-url = "https://github.com/NREL/REopt.jl.git"
+git-tree-sha1 = "013fc07e92f4b742f09b7adae75d2d63dfbc9237"
 uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"
-version = "0.38.1"
+version = "0.39.0"
 
 [[deps.Random]]
 deps = ["SHA", "Serialization"]

julia_src/xpress/Manifest.toml

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

reoptjl/api.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.0.7 on 2023-11-30 20:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0050_apimeta_api_key'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='lifecycle_MG_upgrade_and_fuel_cost_bau',
+            field=models.FloatField(blank=True, help_text='BAU Component of lifecycle costs (LCC). This is the cost to upgrade generation and storage technologies to be included in microgridplus present value of microgrid fuel costs.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='lifecycle_chp_standby_cost_after_tax_bau',
+            field=models.FloatField(blank=True, help_text='BAU Component of lifecycle costs (LCC). This value is the present value of all CHP standby charges, after tax.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='lifecycle_elecbill_after_tax_bau',
+            field=models.FloatField(blank=True, help_text='BAU Component of lifecycle costs (LCC). This value is the present value of all electric utility charges, after tax.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='lifecycle_outage_cost_bau',
+            field=models.FloatField(blank=True, help_text='BAU Component of lifecycle costs (LCC). Expected outage cost.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='lifecycle_production_incentive_after_tax_bau',
+            field=models.FloatField(blank=True, help_text='BAU Component of lifecycle costs (LCC). This value is the present value of all production-based incentives, after tax.', null=True),
+        ),
+    ]

reoptjl/migrations/0051_financialoutputs_lifecycle_mg_upgrade_and_fuel_cost_bau_and_more.py

@@ -1019,14 +1019,26 @@ class FinancialOutputs(BaseModel, models.Model):
         null=True, blank=True,
         help_text=("Component of lifecycle costs (LCC). This value is the present value of all CHP standby charges, after tax.")
     )
+    lifecycle_chp_standby_cost_after_tax_bau = models.FloatField(
+        null=True, blank=True,
+        help_text=("BAU Component of lifecycle costs (LCC). This value is the present value of all CHP standby charges, after tax.")
+    )
     lifecycle_elecbill_after_tax = models.FloatField(
         null=True, blank=True,
         help_text=("Component of lifecycle costs (LCC). This value is the present value of all electric utility charges, after tax.")
     )
+    lifecycle_elecbill_after_tax_bau = models.FloatField(
+        null=True, blank=True,
+        help_text=("BAU Component of lifecycle costs (LCC). This value is the present value of all electric utility charges, after tax.")
+    )
     lifecycle_production_incentive_after_tax = models.FloatField(
         null=True, blank=True,
         help_text=("Component of lifecycle costs (LCC). This value is the present value of all production-based incentives, after tax.")
     )
+    lifecycle_production_incentive_after_tax_bau = models.FloatField(
+        null=True, blank=True,
+        help_text=("BAU Component of lifecycle costs (LCC). This value is the present value of all production-based incentives, after tax.")
+    )
     lifecycle_offgrid_other_annual_costs_after_tax = models.FloatField(
         null=True, blank=True,
         help_text=("Component of lifecycle costs (LCC). This value is the present value of offgrid_other_annual_costs over the analysis period, after tax.")
@@ -1040,11 +1052,20 @@ class FinancialOutputs(BaseModel, models.Model):
         null=True, blank=True,
         help_text=("Component of lifecycle costs (LCC). Expected outage cost.")
     )
+    lifecycle_outage_cost_bau = models.FloatField(
+        null=True, blank=True,
+        help_text=("BAU Component of lifecycle costs (LCC). Expected outage cost.")
+    )
     lifecycle_MG_upgrade_and_fuel_cost = models.FloatField(
         null=True, blank=True,
         help_text=("Component of lifecycle costs (LCC). This is the cost to upgrade generation and storage technologies to be included in microgrid"
                     "plus present value of microgrid fuel costs.")
     )
+    lifecycle_MG_upgrade_and_fuel_cost_bau = models.FloatField(
+        null=True, blank=True,
+        help_text=("BAU Component of lifecycle costs (LCC). This is the cost to upgrade generation and storage technologies to be included in microgrid"
+                    "plus present value of microgrid fuel costs.")
+    )
     replacements_future_cost_after_tax = models.FloatField(
         null=True, blank=True,
         help_text="Future cost of replacing storage and/or generator systems, after tax."

reoptjl/models.py

@@ -455,13 +455,16 @@ def update_pv_defaults_offgrid(self, pvmodel):
             if self.models["Generator"].__getattribute__("om_cost_per_kw") == None:
                 if self.models["Settings"].off_grid_flag==False:
                     self.models["Generator"].om_cost_per_kw = 20.0
+                else:
+                    self.models["Generator"].om_cost_per_kw = 10.0
+
+            if self.models["Generator"].__getattribute__("installed_cost_per_kw") == None:
+                if self.models["Settings"].off_grid_flag==False:
                     if self.models["Generator"].only_runs_during_grid_outage:
                         self.models["Generator"].installed_cost_per_kw = 650.0
                     else: 
                         self.models["Generator"].installed_cost_per_kw = 800.0
-                    self.models["Generator"]
-                else:
-                    self.models["Generator"].om_cost_per_kw = 10.0
+                else: 
                     self.models["Generator"].installed_cost_per_kw = 880.0
 
             if self.models["Generator"].__getattribute__("min_turn_down_fraction") == None:

reoptjl/validators.py

@@ -855,7 +855,10 @@ def queryset_for_summary(api_metas,summary_dict:dict):
     )
     if len(tariffOuts) > 0:
         for m in tariffOuts:
-            summary_dict[str(m.meta.run_uuid)]['year_one_savings_us_dollars'] = (m.year_one_energy_cost_before_tax_bau + m.year_one_demand_cost_before_tax_bau + m.year_one_fixed_cost_before_tax_bau + m.year_one_min_charge_adder_before_tax_bau) - (m.year_one_energy_cost_before_tax + m.year_one_demand_cost_before_tax + m.year_one_fixed_cost_before_tax + m.year_one_min_charge_adder_before_tax)
+            if len(tariffInputs) > 0:
+                summary_dict[str(m.meta.run_uuid)]['year_one_savings_us_dollars'] = m.year_one_bill_before_tax_bau - m.year_one_bill_before_tax
+            else:
+                summary_dict[str(m.meta.run_uuid)]['year_one_savings_us_dollars'] = 0.0
 
     load = ElectricLoadInputs.objects.filter(meta__run_uuid__in=run_uuids).only(
         'meta__run_uuid',