add to all_inputs_test.json and fix default

NREL · Feb 5, 2025 · fefcfd4 · fefcfd4
1 parent e64adb3
commit fefcfd4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/reoptjl/models.py b/reoptjl/models.py
@@ -408,7 +408,7 @@ class SiteInputs(BaseModel, models.Model):
     )
 
     include_grid_renewable_fraction_in_RE_constraints = models.BooleanField(
-        default=True,
+        default=False,
         blank=True,
         help_text=("If True, then the renewable energy content of energy from the grid is included in any min or max renewable energy requirements.")
     )

diff --git a/reoptjl/test/posts/all_inputs_test.json b/reoptjl/test/posts/all_inputs_test.json
@@ -55,7 +55,8 @@
         "renewable_electricity_max_fraction": null,
         "include_exported_elec_emissions_in_total": true,
         "include_exported_renewable_electricity_in_total": true,
-        "min_resil_time_steps": 100
+        "min_resil_time_steps": 100,
+        "include_grid_renewable_fraction_in_RE_constraints": false
     },
     "Settings": {
         "timeout_seconds": 420,
@@ -146,7 +147,9 @@
         "emissions_factor_NOx_decrease_fraction": 0.01174,
         "emissions_factor_SO2_decrease_fraction": 0.01174,
         "emissions_factor_PM25_decrease_fraction": 0.01174,
-        "cambium_co2_metric": "lrmer_co2e"
+        "cambium_co2_metric": "lrmer_co2e",
+        "cambium_cef_metric": "cef_load",
+        "renewable_energy_fraction_series": []
     },
     "ElectricStorage": {
         "min_kw": 100.0,
@@ -173,7 +176,8 @@
         "macrs_itc_reduction": 0.5,
         "total_itc_fraction": 0.0,
         "total_rebate_per_kw": 0.0,
-        "total_rebate_per_kwh": 0.0
+        "total_rebate_per_kwh": 0.0,
+        "optimize_soc_init_fraction": false
     },
     "Generator": {
         "existing_kw": 0.0,