v3.12.1 After Tax Savings and Results Table Spreadsheet Updates

CHANGELOG.md

@@ -26,6 +26,18 @@ Classify the change according to the following categories:
     ##### Removed
     ### Patches
 
+## v3.12.1
+### Minor Updates
+### Added
+- Added the following output fields: `year_one_fuel_cost_after_tax` for `ExistingBoiler`, `CHP`, `Generator`, and `Boiler`; `ElectricTariff`: `year_one_bill_after_tax` and `year_one_export_benefit_after_tax`, `Financial`: `capital_costs_after_non_discounted_incentives`, `year_one_total_operating_cost_savings_before_tax`, `year_one_total_operating_cost_savings_after_tax`, `year_one_total_operating_cost_before_tax`, `year_one_total_operating_cost_after_tax`, `year_one_fuel_cost_before_tax`, `year_one_fuel_cost_after_tax`, `year_one_chp_standby_cost_after_tax`, `year_one_chp_standby_cost_after_tax`, `GHP.avoided_capex_by_ghp_present_value`, and `ElectricUtility.peak_grid_demand_kw`
+- Added a lot of the output fields above to the custom_table_config.py file for the `job/generate_results_table` endpoint for the results table downloadable spreadsheet.
+### Changed
+- Using latest registered REopt.jl version 0.51.1
+- For the results table downloadable spreadsheet, changed some labels to include units and made other improvements, in addition to mostly adding a bunch of the after-tax outputs described above
+### Fixed
+- Fixed a GHP test with the corrected `lifecycle_capital_cost` calculation to include the avoided HVAC cost and GHX residual value
+- Fixed a type issue with the `/simulated_load` endpoing for cooling load with `monthly_fraction` input
+
 ## v3.12.0
 ### Major Updates
 ### Added 

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "2.1"
-
 services:
 
   redis:
@@ -67,7 +65,8 @@ services:
     environment:
       - XPRESS_JL_SKIP_LIB_CHECK=True
       - XPRESS_INSTALLED=False
-    command: julia --project=/opt/julia_src http.jl
+    # command: julia --project=/opt/julia_src http.jl
+    command: julia --project=. -e 'using Pkg; Pkg.instantiate(); include("http.jl")'
     ports:
       - "8081:8081"
     volumes:

julia_src/Manifest.toml

@@ -922,9 +922,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 = "24f902b6f67ed1d4389d21b5d42f820036b182b4"
+git-tree-sha1 = "9946abe774e30d82f786e68296ad1fdf8bb7dba4"
 uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"
-version = "0.51.0"
+version = "0.51.1"
 
 [[deps.Random]]
 deps = ["SHA"]

julia_src/http.jl

@@ -420,7 +420,7 @@ function simulated_load(req::HTTP.Request)
 
     # Convert vectors which come in as Vector{Any} to Vector{Float} (within Vector{<:Real})
     vector_types = ["percent_share", "cooling_pct_share", "monthly_totals_kwh", "monthly_mmbtu", 
-                    "monthly_tonhour", "addressable_load_fraction", "load_profile"]
+                    "monthly_tonhour", "monthly_fraction", "addressable_load_fraction", "load_profile"]
     for key in vector_types
         if key in keys(d) && typeof(d[key]) <: Vector{}
             d[key] = convert(Vector{Real}, d[key])

reoptjl/migrations/0077_boileroutputs_year_one_fuel_cost_after_tax_and_more.py

@@ -0,0 +1,93 @@
+# Generated by Django 4.0.7 on 2025-02-19 05:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0076_ashpspaceheaterinputs_force_dispatch_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='boileroutputs',
+            name='year_one_fuel_cost_after_tax',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='chpoutputs',
+            name='year_one_fuel_cost_after_tax',
+            field=models.FloatField(blank=True, help_text='Cost of fuel consumed by the CHP system in year one, after tax [\\$]', null=True),
+        ),
+        migrations.AddField(
+            model_name='chpoutputs',
+            name='year_one_standby_cost_after_tax',
+            field=models.FloatField(blank=True, help_text='CHP standby charges in year one, after tax [\\$]', null=True),
+        ),
+        migrations.AddField(
+            model_name='electrictariffoutputs',
+            name='year_one_bill_after_tax',
+            field=models.FloatField(blank=True, help_text='Optimal year one utility bill, after tax', null=True),
+        ),
+        migrations.AddField(
+            model_name='electrictariffoutputs',
+            name='year_one_bill_after_tax_bau',
+            field=models.FloatField(blank=True, help_text='Business as usual year one utility bill, after tax', null=True),
+        ),
+        migrations.AddField(
+            model_name='electrictariffoutputs',
+            name='year_one_export_benefit_after_tax',
+            field=models.FloatField(blank=True, help_text='Optimal year one value of exported energy, after tax. A positive value indicates a benefit.', null=True),
+        ),
+        migrations.AddField(
+            model_name='electrictariffoutputs',
+            name='year_one_export_benefit_after_tax_bau',
+            field=models.FloatField(blank=True, help_text='Business as usual year one value of exported energy, after tax. A positive value indicates a benefit.', null=True),
+        ),
+        migrations.AddField(
+            model_name='existingboileroutputs',
+            name='year_one_fuel_cost_after_tax',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='existingboileroutputs',
+            name='year_one_fuel_cost_after_tax_bau',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='capital_costs_after_non_discounted_incentives',
+            field=models.FloatField(blank=True, help_text='Capital costs for all technologies, in present value, after all non-discounted incentives including MACRS, including present value of replacement costs', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_fuel_cost_after_tax',
+            field=models.FloatField(blank=True, help_text='Year one fuel cost of all combined fuel-burning techs, after tax.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_fuel_cost_after_tax_bau',
+            field=models.FloatField(blank=True, help_text='Year one fuel cost of all combined fuel-burning techs, after tax in the BAU case.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_fuel_cost_before_tax',
+            field=models.FloatField(blank=True, help_text='Year one fuel cost of all combined fuel-burning techs, before tax.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_fuel_cost_before_tax_bau',
+            field=models.FloatField(blank=True, help_text='Year one fuel cost of all combined fuel-burning techs, before tax in the BAU case.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_om_costs_after_tax_bau',
+            field=models.FloatField(blank=True, help_text='Year one operations and maintenance cost after tax in the BAU case.', null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpoutputs',
+            name='avoided_capex_by_ghp_present_value',
+            field=models.FloatField(blank=True, null=True),
+        ),
+    ]

reoptjl/migrations/0078_generatoroutputs_year_one_fuel_cost_after_tax_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.0.7 on 2025-02-19 14:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0077_boileroutputs_year_one_fuel_cost_after_tax_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='generatoroutputs',
+            name='year_one_fuel_cost_after_tax',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='generatoroutputs',
+            name='year_one_fuel_cost_after_tax_bau',
+            field=models.FloatField(blank=True, null=True),
+        ),
+    ]

reoptjl/migrations/0079_remove_financialoutputs_initial_capital_costs_after_incentives_without_macrs_and_more.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.0.7 on 2025-02-28 23:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0078_generatoroutputs_year_one_fuel_cost_after_tax_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='financialoutputs',
+            name='initial_capital_costs_after_incentives_without_macrs',
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='capital_costs_after_incentives_without_macrs',
+            field=models.FloatField(blank=True, help_text='Capital costs for all technologies, including present value of replacement costs and incentives except for MACRS.', null=True),
+        ),
+        migrations.AlterField(
+            model_name='financialoutputs',
+            name='capital_costs_after_non_discounted_incentives',
+            field=models.FloatField(blank=True, help_text='Capital costs for all technologies, including present value of replacement costs and all non-discounted incentives including MACRS.', null=True),
+        ),
+    ]

reoptjl/migrations/0080_financialoutputs_year_one_chp_standby_cost_after_tax_and_more.py

@@ -0,0 +1,53 @@
+# Generated by Django 4.0.7 on 2025-03-03 17:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0079_remove_financialoutputs_initial_capital_costs_after_incentives_without_macrs_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_chp_standby_cost_after_tax',
+            field=models.FloatField(blank=True, help_text='Year one CHP standby charges, after tax.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_chp_standby_cost_before_tax',
+            field=models.FloatField(blank=True, help_text='Year one CHP standby charges, before tax.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_total_cost_after_tax',
+            field=models.FloatField(blank=True, help_text='Year one total operating (electricity, fuel, O&M) costs, after tax.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_total_cost_after_tax_bau',
+            field=models.FloatField(blank=True, help_text='Year one total operating (electricity, fuel, O&M) costs, after tax in the BAU case.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_total_cost_before_tax',
+            field=models.FloatField(blank=True, help_text='Year one total operating (electricity, fuel, O&M) costs, before tax.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_total_cost_before_tax_bau',
+            field=models.FloatField(blank=True, help_text='Year one total operating (electricity, fuel, O&M) costs, before tax in the BAU case.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_total_cost_savings_after_tax',
+            field=models.FloatField(blank=True, help_text='Year one total operating (electricity, fuel, O&M) cost savings compared to BAU case, after tax.', null=True),
+        ),
+        migrations.AddField(
+            model_name='financialoutputs',
+            name='year_one_total_cost_savings_before_tax',
+            field=models.FloatField(blank=True, help_text='Year one total operating (electricity, fuel, O&M) cost savings compared to BAU case, before tax.', null=True),
+        ),
+    ]

reoptjl/migrations/0081_merge_20250303_1743.py

@@ -0,0 +1,14 @@
+# Generated by Django 4.0.7 on 2025-03-03 17:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0080_electricloadoutputs_annual_electric_load_with_thermal_conversions_kwh_and_more'),
+        ('reoptjl', '0080_financialoutputs_year_one_chp_standby_cost_after_tax_and_more'),
+    ]
+
+    operations = [
+    ]

reoptjl/migrations/0082_rename_capital_costs_after_incentives_without_macrs_financialoutputs_capital_costs_after_non_discoun.py

@@ -0,0 +1,48 @@
+# Generated by Django 4.0.7 on 2025-03-12 03:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0081_merge_20250303_1743'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='financialoutputs',
+            old_name='capital_costs_after_incentives_without_macrs',
+            new_name='capital_costs_after_non_discounted_incentives_without_macrs',
+        ),
+        migrations.RenameField(
+            model_name='financialoutputs',
+            old_name='year_one_total_cost_after_tax',
+            new_name='year_one_total_operating_cost_after_tax',
+        ),
+        migrations.RenameField(
+            model_name='financialoutputs',
+            old_name='year_one_total_cost_after_tax_bau',
+            new_name='year_one_total_operating_cost_after_tax_bau',
+        ),
+        migrations.RenameField(
+            model_name='financialoutputs',
+            old_name='year_one_total_cost_before_tax',
+            new_name='year_one_total_operating_cost_before_tax',
+        ),
+        migrations.RenameField(
+            model_name='financialoutputs',
+            old_name='year_one_total_cost_before_tax_bau',
+            new_name='year_one_total_operating_cost_before_tax_bau',
+        ),
+        migrations.RenameField(
+            model_name='financialoutputs',
+            old_name='year_one_total_cost_savings_after_tax',
+            new_name='year_one_total_operating_cost_savings_after_tax',
+        ),
+        migrations.RenameField(
+            model_name='financialoutputs',
+            old_name='year_one_total_cost_savings_before_tax',
+            new_name='year_one_total_operating_cost_savings_before_tax',
+        ),
+    ]

reoptjl/migrations/0083_electricutilityoutputs_peak_grid_demand_kw_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.0.7 on 2025-04-18 21:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0082_rename_capital_costs_after_incentives_without_macrs_financialoutputs_capital_costs_after_non_discoun'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='electricutilityoutputs',
+            name='peak_grid_demand_kw',
+            field=models.FloatField(blank=True, help_text='Maximum grid demand calculated as the maximum of (electric_to_load_series_kw .+ electric_to_storage_series_kw).', null=True),
+        ),
+        migrations.AddField(
+            model_name='electricutilityoutputs',
+            name='peak_grid_demand_kw_bau',
+            field=models.FloatField(blank=True, help_text='Maximum grid demand in the BAU case calculated as the maximum of electric_to_load_series_kw.', null=True),
+        ),
+    ]