Merge branch 'develop' into pv-batt-compare-cases-macro

NREL · Nov 1, 2024 · 4ecacc8 · 4ecacc8
2 parents 4ce0adc + c8bde32
commit 4ecacc8
Show file tree

Hide file tree

Showing 19 changed files with 250 additions and 239 deletions.
diff --git a/deploy/runtime/defaults/Custom Generation Battery_All Equity Partnership Flip.json b/deploy/runtime/defaults/Custom Generation Battery_All Equity Partnership Flip.json
@@ -8861,6 +8861,7 @@
     "batt_discharge_percent_6": 25.0,
     "batt_dispatch_auto_can_charge": 1.0,
     "batt_dispatch_auto_can_clipcharge": 0.0,
+    "batt_dispatch_auto_can_curtailcharge": 0.0,
     "batt_dispatch_auto_can_fuelcellcharge": 0.0,
     "batt_dispatch_auto_can_gridcharge": 0.0,
     "batt_dispatch_choice": 3.0,
@@ -10013,6 +10014,23 @@
     "cost_dev_fee_value": 7901490.0,
     "cost_equity_closing": 300000.0,
     "cost_other_financing": 0.0,
+    "customgen.cost.contingency": 10584000.0,
+    "customgen.cost.contingency_percent": 5.0,
+    "customgen.cost.epc.fixed": 0.0,
+    "customgen.cost.epc.nonfixed": 22226400.0,
+    "customgen.cost.epc.percent": 10.0,
+    "customgen.cost.epc.total": 22226400.0,
+    "customgen.cost.installed_per_capacity": 13.1691,
+    "customgen.cost.per_watt": 6.0,
+    "customgen.cost.plant": 0.0,
+    "customgen.cost.plant_scaled": 120000000.0,
+    "customgen.cost.plm.fixed": 0.0,
+    "customgen.cost.plm.nonfixed": 7779240.0,
+    "customgen.cost.plm.percent": 3.5,
+    "customgen.cost.plm.total": 7779240.0,
+    "customgen.cost.sales_tax.percent": 100.0,
+    "customgen.cost.sales_tax.total": 11113200.0,
+    "customgen.cost.sales_tax.value": 5.0,
     "degradation": [
         0.0
     ],
@@ -20163,23 +20181,6 @@
     "generic_degradation": [
         0.0
     ],
-    "customgen.cost.contingency": 10584000.0,
-    "customgen.cost.contingency_percent": 5.0,
-    "customgen.cost.epc.fixed": 0.0,
-    "customgen.cost.epc.nonfixed": 22226400.0,
-    "customgen.cost.epc.percent": 10.0,
-    "customgen.cost.epc.total": 22226400.0,
-    "customgen.cost.installed_per_capacity": 13.1691,
-    "customgen.cost.per_watt": 6.0,
-    "customgen.cost.plant": 0.0,
-    "customgen.cost.plant_scaled": 120000000.0,
-    "customgen.cost.plm.fixed": 0.0,
-    "customgen.cost.plm.nonfixed": 7779240.0,
-    "customgen.cost.plm.percent": 3.5,
-    "customgen.cost.plm.total": 7779240.0,
-    "customgen.cost.sales_tax.percent": 100.0,
-    "customgen.cost.sales_tax.total": 11113200.0,
-    "customgen.cost.sales_tax.value": 5.0,
     "grid_curtailment": [
         1e38,
         1e38,

diff --git a/deploy/runtime/defaults/Custom Generation Battery_Commercial.json b/deploy/runtime/defaults/Custom Generation Battery_Commercial.json
@@ -8864,6 +8864,7 @@
     "batt_dispatch_auto_btm_can_discharge_to_grid": 0.0,
     "batt_dispatch_auto_can_charge": 1.0,
     "batt_dispatch_auto_can_clipcharge": 0.0,
+    "batt_dispatch_auto_can_curtailcharge": 0.0,
     "batt_dispatch_auto_can_fuelcellcharge": 0.0,
     "batt_dispatch_auto_can_gridcharge": 0.0,
     "batt_dispatch_charge_only_system_exceeds_load": 1.0,
@@ -36281,6 +36282,23 @@
         0.0,
         0.0
     ],
+    "customgen.cost.contingency": 80642.6,
+    "customgen.cost.contingency_percent": 5.0,
+    "customgen.cost.epc.fixed": 403010.0,
+    "customgen.cost.epc.nonfixed": 169349.0,
+    "customgen.cost.epc.percent": 10.0,
+    "customgen.cost.epc.total": 572359.0,
+    "customgen.cost.installed_per_capacity": 11.8779,
+    "customgen.cost.per_watt": 6.0,
+    "customgen.cost.plant": 0.0,
+    "customgen.cost.plant_scaled": 1290000.0,
+    "customgen.cost.plm.fixed": 0.0,
+    "customgen.cost.plm.nonfixed": 203219.0,
+    "customgen.cost.plm.percent": 12.0,
+    "customgen.cost.plm.total": 203219.0,
+    "customgen.cost.sales_tax.percent": 100.0,
+    "customgen.cost.sales_tax.total": 84674.7,
+    "customgen.cost.sales_tax.value": 5.0,
     "debt_fraction": 60.0,
     "debt_message": "",
     "degradation": [
@@ -37002,23 +37020,6 @@
     "generic_degradation": [
         0.0
     ],
-    "customgen.cost.contingency": 80642.6,
-    "customgen.cost.contingency_percent": 5.0,
-    "customgen.cost.epc.fixed": 403010.0,
-    "customgen.cost.epc.nonfixed": 169349.0,
-    "customgen.cost.epc.percent": 10.0,
-    "customgen.cost.epc.total": 572359.0,
-    "customgen.cost.installed_per_capacity": 11.8779,
-    "customgen.cost.per_watt": 6.0,
-    "customgen.cost.plant": 0.0,
-    "customgen.cost.plant_scaled": 1290000.0,
-    "customgen.cost.plm.fixed": 0.0,
-    "customgen.cost.plm.nonfixed": 203219.0,
-    "customgen.cost.plm.percent": 12.0,
-    "customgen.cost.plm.total": 203219.0,
-    "customgen.cost.sales_tax.percent": 100.0,
-    "customgen.cost.sales_tax.total": 84674.7,
-    "customgen.cost.sales_tax.value": 5.0,
     "grid_curtailment": [
         1e38,
         1e38,

diff --git a/deploy/runtime/defaults/Custom Generation Battery_Host Developer.json b/deploy/runtime/defaults/Custom Generation Battery_Host Developer.json
@@ -8864,6 +8864,7 @@
     "batt_dispatch_auto_btm_can_discharge_to_grid": 0.0,
     "batt_dispatch_auto_can_charge": 1.0,
     "batt_dispatch_auto_can_clipcharge": 0.0,
+    "batt_dispatch_auto_can_curtailcharge": 0.0,
     "batt_dispatch_auto_can_fuelcellcharge": 0.0,
     "batt_dispatch_auto_can_gridcharge": 0.0,
     "batt_dispatch_charge_only_system_exceeds_load": 1.0,
@@ -36328,6 +36329,23 @@
         0.0,
         0.0
     ],
+    "customgen.cost.contingency": 27119.5,
+    "customgen.cost.contingency_percent": 8.4,
+    "customgen.cost.epc.fixed": 403010.0,
+    "customgen.cost.epc.nonfixed": 55995.3,
+    "customgen.cost.epc.percent": 16.0,
+    "customgen.cost.epc.total": 459005.0,
+    "customgen.cost.installed_per_capacity": 4.0394,
+    "customgen.cost.per_watt": 0.0,
+    "customgen.cost.plant": 0.0,
+    "customgen.cost.plant_scaled": 0.0,
+    "customgen.cost.plm.fixed": 0.0,
+    "customgen.cost.plm.nonfixed": 41996.5,
+    "customgen.cost.plm.percent": 12.0,
+    "customgen.cost.plm.total": 41996.5,
+    "customgen.cost.sales_tax.percent": 100.0,
+    "customgen.cost.sales_tax.total": 17498.5,
+    "customgen.cost.sales_tax.value": 5.0,
     "debt_message": "",
     "debt_option": 1.0,
     "debt_percent": 60.0,
@@ -46499,23 +46517,6 @@
     "generic_degradation": [
         0.0
     ],
-    "customgen.cost.contingency": 27119.5,
-    "customgen.cost.contingency_percent": 8.4,
-    "customgen.cost.epc.fixed": 403010.0,
-    "customgen.cost.epc.nonfixed": 55995.3,
-    "customgen.cost.epc.percent": 16.0,
-    "customgen.cost.epc.total": 459005.0,
-    "customgen.cost.installed_per_capacity": 4.0394,
-    "customgen.cost.per_watt": 0.0,
-    "customgen.cost.plant": 0.0,
-    "customgen.cost.plant_scaled": 0.0,
-    "customgen.cost.plm.fixed": 0.0,
-    "customgen.cost.plm.nonfixed": 41996.5,
-    "customgen.cost.plm.percent": 12.0,
-    "customgen.cost.plm.total": 41996.5,
-    "customgen.cost.sales_tax.percent": 100.0,
-    "customgen.cost.sales_tax.total": 17498.5,
-    "customgen.cost.sales_tax.value": 5.0,
     "grid_curtailment": [
         1e38,
         1e38,

diff --git a/deploy/runtime/defaults/Custom Generation Battery_Leveraged Partnership Flip.json b/deploy/runtime/defaults/Custom Generation Battery_Leveraged Partnership Flip.json
@@ -8861,6 +8861,7 @@
     "batt_discharge_percent_6": 25.0,
     "batt_dispatch_auto_can_charge": 1.0,
     "batt_dispatch_auto_can_clipcharge": 0.0,
+    "batt_dispatch_auto_can_curtailcharge": 0.0,
     "batt_dispatch_auto_can_fuelcellcharge": 0.0,
     "batt_dispatch_auto_can_gridcharge": 0.0,
     "batt_dispatch_choice": 3.0,
@@ -10015,6 +10016,23 @@
     "cost_dev_fee_value": 7901490.0,
     "cost_equity_closing": 300000.0,
     "cost_other_financing": 0.0,
+    "customgen.cost.contingency": 10584000.0,
+    "customgen.cost.contingency_percent": 5.0,
+    "customgen.cost.epc.fixed": 0.0,
+    "customgen.cost.epc.nonfixed": 22226400.0,
+    "customgen.cost.epc.percent": 10.0,
+    "customgen.cost.epc.total": 22226400.0,
+    "customgen.cost.installed_per_capacity": 13.1691,
+    "customgen.cost.per_watt": 6.0,
+    "customgen.cost.plant": 0.0,
+    "customgen.cost.plant_scaled": 120000000.0,
+    "customgen.cost.plm.fixed": 0.0,
+    "customgen.cost.plm.nonfixed": 7779240.0,
+    "customgen.cost.plm.percent": 3.5,
+    "customgen.cost.plm.total": 7779240.0,
+    "customgen.cost.sales_tax.percent": 100.0,
+    "customgen.cost.sales_tax.total": 11113200.0,
+    "customgen.cost.sales_tax.value": 5.0,
     "debt_message": "",
     "debt_option": 1.0,
     "debt_percent": 60.0,
@@ -20171,23 +20189,6 @@
     "generic_degradation": [
         0.0
     ],
-    "customgen.cost.contingency": 10584000.0,
-    "customgen.cost.contingency_percent": 5.0,
-    "customgen.cost.epc.fixed": 0.0,
-    "customgen.cost.epc.nonfixed": 22226400.0,
-    "customgen.cost.epc.percent": 10.0,
-    "customgen.cost.epc.total": 22226400.0,
-    "customgen.cost.installed_per_capacity": 13.1691,
-    "customgen.cost.per_watt": 6.0,
-    "customgen.cost.plant": 0.0,
-    "customgen.cost.plant_scaled": 120000000.0,
-    "customgen.cost.plm.fixed": 0.0,
-    "customgen.cost.plm.nonfixed": 7779240.0,
-    "customgen.cost.plm.percent": 3.5,
-    "customgen.cost.plm.total": 7779240.0,
-    "customgen.cost.sales_tax.percent": 100.0,
-    "customgen.cost.sales_tax.total": 11113200.0,
-    "customgen.cost.sales_tax.value": 5.0,
     "grid_curtailment": [
         1e38,
         1e38,

diff --git a/deploy/runtime/defaults/Custom Generation Battery_Merchant Plant.json b/deploy/runtime/defaults/Custom Generation Battery_Merchant Plant.json
@@ -8861,6 +8861,7 @@
     "batt_discharge_percent_6": 25.0,
     "batt_dispatch_auto_can_charge": 1.0,
     "batt_dispatch_auto_can_clipcharge": 1.0,
+    "batt_dispatch_auto_can_curtailcharge": 0.0,
     "batt_dispatch_auto_can_fuelcellcharge": 0.0,
     "batt_dispatch_auto_can_gridcharge": 0.0,
     "batt_dispatch_choice": 3.0,
@@ -10029,6 +10030,23 @@
     "cp_capacity_payment_esc": 0.0,
     "cp_capacity_payment_type": 0.0,
     "cp_system_nameplate": 20.0,
+    "customgen.cost.contingency": 10584000.0,
+    "customgen.cost.contingency_percent": 5.0,
+    "customgen.cost.epc.fixed": 0.0,
+    "customgen.cost.epc.nonfixed": 22226400.0,
+    "customgen.cost.epc.percent": 10.0,
+    "customgen.cost.epc.total": 22226400.0,
+    "customgen.cost.installed_per_capacity": 13.1691,
+    "customgen.cost.per_watt": 6.0,
+    "customgen.cost.plant": 0.0,
+    "customgen.cost.plant_scaled": 120000000.0,
+    "customgen.cost.plm.fixed": 0.0,
+    "customgen.cost.plm.nonfixed": 7779240.0,
+    "customgen.cost.plm.percent": 3.5,
+    "customgen.cost.plm.total": 7779240.0,
+    "customgen.cost.sales_tax.percent": 100.0,
+    "customgen.cost.sales_tax.total": 11113200.0,
+    "customgen.cost.sales_tax.value": 5.0,
     "debt_message": "",
     "debt_option": 1.0,
     "debt_percent": 60.0,
@@ -10777,23 +10795,6 @@
     "generic_degradation": [
         0.0
     ],
-    "customgen.cost.contingency": 10584000.0,
-    "customgen.cost.contingency_percent": 5.0,
-    "customgen.cost.epc.fixed": 0.0,
-    "customgen.cost.epc.nonfixed": 22226400.0,
-    "customgen.cost.epc.percent": 10.0,
-    "customgen.cost.epc.total": 22226400.0,
-    "customgen.cost.installed_per_capacity": 13.1691,
-    "customgen.cost.per_watt": 6.0,
-    "customgen.cost.plant": 0.0,
-    "customgen.cost.plant_scaled": 120000000.0,
-    "customgen.cost.plm.fixed": 0.0,
-    "customgen.cost.plm.nonfixed": 7779240.0,
-    "customgen.cost.plm.percent": 3.5,
-    "customgen.cost.plm.total": 7779240.0,
-    "customgen.cost.sales_tax.percent": 100.0,
-    "customgen.cost.sales_tax.total": 11113200.0,
-    "customgen.cost.sales_tax.value": 5.0,
     "grid_curtailment": [
         1e38,
         1e38,

diff --git a/deploy/runtime/defaults/Custom Generation Battery_Residential.json b/deploy/runtime/defaults/Custom Generation Battery_Residential.json
@@ -8864,6 +8864,7 @@
     "batt_dispatch_auto_btm_can_discharge_to_grid": 0.0,
     "batt_dispatch_auto_can_charge": 1.0,
     "batt_dispatch_auto_can_clipcharge": 0.0,
+    "batt_dispatch_auto_can_curtailcharge": 0.0,
     "batt_dispatch_auto_can_fuelcellcharge": 0.0,
     "batt_dispatch_auto_can_gridcharge": 0.0,
     "batt_dispatch_charge_only_system_exceeds_load": 1.0,
@@ -36281,6 +36282,23 @@
         0.0,
         0.0
     ],
+    "customgen.cost.contingency": 1776.57,
+    "customgen.cost.contingency_percent": 5.0,
+    "customgen.cost.epc.fixed": 6549.0,
+    "customgen.cost.epc.nonfixed": 3730.79,
+    "customgen.cost.epc.percent": 10.0,
+    "customgen.cost.epc.total": 10279.8,
+    "customgen.cost.installed_per_capacity": 12.9229,
+    "customgen.cost.per_watt": 6.0,
+    "customgen.cost.plant": 0.0,
+    "customgen.cost.plant_scaled": 24000.0,
+    "customgen.cost.plm.fixed": 0.0,
+    "customgen.cost.plm.nonfixed": 2238.48,
+    "customgen.cost.plm.percent": 6.0,
+    "customgen.cost.plm.total": 2238.48,
+    "customgen.cost.sales_tax.percent": 100.0,
+    "customgen.cost.sales_tax.total": 1865.4,
+    "customgen.cost.sales_tax.value": 5.0,
     "debt_fraction": 50.0,
     "debt_message": "",
     "degradation": [
@@ -36994,23 +37012,6 @@
     "generic_degradation": [
         0.0
     ],
-    "customgen.cost.contingency": 1776.57,
-    "customgen.cost.contingency_percent": 5.0,
-    "customgen.cost.epc.fixed": 6549.0,
-    "customgen.cost.epc.nonfixed": 3730.79,
-    "customgen.cost.epc.percent": 10.0,
-    "customgen.cost.epc.total": 10279.8,
-    "customgen.cost.installed_per_capacity": 12.9229,
-    "customgen.cost.per_watt": 6.0,
-    "customgen.cost.plant": 0.0,
-    "customgen.cost.plant_scaled": 24000.0,
-    "customgen.cost.plm.fixed": 0.0,
-    "customgen.cost.plm.nonfixed": 2238.48,
-    "customgen.cost.plm.percent": 6.0,
-    "customgen.cost.plm.total": 2238.48,
-    "customgen.cost.sales_tax.percent": 100.0,
-    "customgen.cost.sales_tax.total": 1865.4,
-    "customgen.cost.sales_tax.value": 5.0,
     "grid_curtailment": [
         1e38,
         1e38,

diff --git a/deploy/runtime/defaults/Custom Generation Battery_Sale Leaseback.json b/deploy/runtime/defaults/Custom Generation Battery_Sale Leaseback.json
@@ -8861,6 +8861,7 @@
     "batt_discharge_percent_6": 25.0,
     "batt_dispatch_auto_can_charge": 1.0,
     "batt_dispatch_auto_can_clipcharge": 0.0,
+    "batt_dispatch_auto_can_curtailcharge": 0.0,
     "batt_dispatch_auto_can_fuelcellcharge": 0.0,
     "batt_dispatch_auto_can_gridcharge": 0.0,
     "batt_dispatch_choice": 3.0,
@@ -10013,6 +10014,23 @@
     "cost_dev_fee_value": 7901490.0,
     "cost_equity_closing": 300000.0,
     "cost_other_financing": 0.0,
+    "customgen.cost.contingency": 10584000.0,
+    "customgen.cost.contingency_percent": 5.0,
+    "customgen.cost.epc.fixed": 0.0,
+    "customgen.cost.epc.nonfixed": 22226400.0,
+    "customgen.cost.epc.percent": 10.0,
+    "customgen.cost.epc.total": 22226400.0,
+    "customgen.cost.installed_per_capacity": 13.1691,
+    "customgen.cost.per_watt": 6.0,
+    "customgen.cost.plant": 0.0,
+    "customgen.cost.plant_scaled": 120000000.0,
+    "customgen.cost.plm.fixed": 0.0,
+    "customgen.cost.plm.nonfixed": 7779240.0,
+    "customgen.cost.plm.percent": 3.5,
+    "customgen.cost.plm.total": 7779240.0,
+    "customgen.cost.sales_tax.percent": 100.0,
+    "customgen.cost.sales_tax.total": 11113200.0,
+    "customgen.cost.sales_tax.value": 5.0,
     "degradation": [
         0.0
     ],
@@ -20158,23 +20176,6 @@
     "generic_degradation": [
         0.0
     ],
-    "customgen.cost.contingency": 10584000.0,
-    "customgen.cost.contingency_percent": 5.0,
-    "customgen.cost.epc.fixed": 0.0,
-    "customgen.cost.epc.nonfixed": 22226400.0,
-    "customgen.cost.epc.percent": 10.0,
-    "customgen.cost.epc.total": 22226400.0,
-    "customgen.cost.installed_per_capacity": 13.1691,
-    "customgen.cost.per_watt": 6.0,
-    "customgen.cost.plant": 0.0,
-    "customgen.cost.plant_scaled": 120000000.0,
-    "customgen.cost.plm.fixed": 0.0,
-    "customgen.cost.plm.nonfixed": 7779240.0,
-    "customgen.cost.plm.percent": 3.5,
-    "customgen.cost.plm.total": 7779240.0,
-    "customgen.cost.sales_tax.percent": 100.0,
-    "customgen.cost.sales_tax.total": 11113200.0,
-    "customgen.cost.sales_tax.value": 5.0,
     "grid_curtailment": [
         1e38,
         1e38,

diff --git a/deploy/runtime/defaults/Custom Generation Battery_Single Owner.json b/deploy/runtime/defaults/Custom Generation Battery_Single Owner.json
@@ -8861,6 +8861,7 @@
     "batt_discharge_percent_6": 25.0,
     "batt_dispatch_auto_can_charge": 1.0,
     "batt_dispatch_auto_can_clipcharge": 0.0,
+    "batt_dispatch_auto_can_curtailcharge": 0.0,
     "batt_dispatch_auto_can_fuelcellcharge": 0.0,
     "batt_dispatch_auto_can_gridcharge": 0.0,
     "batt_dispatch_choice": 3.0,