From 61377ff9a985b8d55c477d3aff624beb0b309217 Mon Sep 17 00:00:00 2001 From: adfarth Date: Tue, 4 Mar 2025 09:21:01 -0700 Subject: [PATCH 1/6] add pv density inputs --- reoptjl/models.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/reoptjl/models.py b/reoptjl/models.py index 47d088f7a..ae16bab83 100644 --- a/reoptjl/models.py +++ b/reoptjl/models.py @@ -2895,6 +2895,26 @@ class PV_LOCATION_CHOICES(models.TextChoices): blank=True, help_text="Where PV can be deployed. One of [roof, ground, both] with default as both." ) + kw_per_square_foot = models.FloatField( + default=0.01, + validators=[ + MinValueValidator(0), + MaxValueValidator(10) + ], + blank=True, + help_text=("The installed power density for rooftop PV systems in kW per square foot, accounting for setbacks, row spacing, etc. The recommended PV system size is constrained " + "based on the sum of land area available, assuming the specified ground-mount power density, and roofspace available, assuming the rooftop power density specified here.") + ) + acres_per_kw = models.FloatField( + default=0.006, + validators=[ + MinValueValidator(0), + MaxValueValidator(10) + ], + blank=True, + help_text=("The acres per kW-DC for ground-mount PV systems in acres per kW, accounting for setbacks, row spacing, etc. The recommended PV system size is constrained " + "based on the sum of land area available, assuming the ground-mount power density specified here, and roofspace available, assuming the specified rooftop power density.") + ) production_factor_series = ArrayField( models.FloatField( blank=True From ce1785dd3514f01c459675213bf2bde99aac5c8a Mon Sep 17 00:00:00 2001 From: adfarth Date: Tue, 4 Mar 2025 09:40:49 -0700 Subject: [PATCH 2/6] Create 0081_pvinputs_acres_per_kw_pvinputs_kw_per_square_foot.py --- ...cres_per_kw_pvinputs_kw_per_square_foot.py | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 reoptjl/migrations/0081_pvinputs_acres_per_kw_pvinputs_kw_per_square_foot.py diff --git a/reoptjl/migrations/0081_pvinputs_acres_per_kw_pvinputs_kw_per_square_foot.py b/reoptjl/migrations/0081_pvinputs_acres_per_kw_pvinputs_kw_per_square_foot.py new file mode 100644 index 000000000..a3069968c --- /dev/null +++ b/reoptjl/migrations/0081_pvinputs_acres_per_kw_pvinputs_kw_per_square_foot.py @@ -0,0 +1,24 @@ +# Generated by Django 4.0.7 on 2025-03-04 16:40 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('reoptjl', '0080_electricloadoutputs_annual_electric_load_with_thermal_conversions_kwh_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='pvinputs', + name='acres_per_kw', + field=models.FloatField(blank=True, default=0.006, help_text='The acres per kW-DC for ground-mount PV systems in acres per kW, accounting for setbacks, row spacing, etc. The recommended PV system size is constrained based on the sum of land area available, assuming the ground-mount power density specified here, and roofspace available, assuming the specified rooftop power density.', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(10)]), + ), + migrations.AddField( + model_name='pvinputs', + name='kw_per_square_foot', + field=models.FloatField(blank=True, default=0.01, help_text='The installed power density for rooftop PV systems in kW per square foot, accounting for setbacks, row spacing, etc. The recommended PV system size is constrained based on the sum of land area available, assuming the specified ground-mount power density, and roofspace available, assuming the rooftop power density specified here.', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(10)]), + ), + ] From a7b29b3b799d0fff84987a88428fc2729705e531 Mon Sep 17 00:00:00 2001 From: adfarth Date: Tue, 4 Mar 2025 09:41:42 -0700 Subject: [PATCH 3/6] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02fd96a46..a388481b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,11 @@ Classify the change according to the following categories: ##### Removed ### Patches +## add-pvdensity +### Minor Updates +### Added +- Add inputs: **PV.acres_per_kw** and **PV.kw_per_square_footw** + ## v3.12.0 ### Major Updates ### Added From 3d01a0c4cb7182bdd55c54641a2ef19a914008c8 Mon Sep 17 00:00:00 2001 From: adfarth Date: Thu, 24 Apr 2025 09:59:25 -0600 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac755f2c8..d22fa460a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ Classify the change according to the following categories: ## add-pvdensity ### Minor Updates ### Added -- Add inputs: **PV.acres_per_kw** and **PV.kw_per_square_footw** +- Add inputs: **PV.acres_per_kw** and **PV.kw_per_square_foot** ## v3.12.2 ### Patches From e6b215faf7448ec979eab5d956f082b088e6c60a Mon Sep 17 00:00:00 2001 From: bill-becker Date: Thu, 24 Apr 2025 12:15:30 -0600 Subject: [PATCH 5/6] Merge migrations after merging develop --- reoptjl/migrations/0084_merge_20250424_1814.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 reoptjl/migrations/0084_merge_20250424_1814.py diff --git a/reoptjl/migrations/0084_merge_20250424_1814.py b/reoptjl/migrations/0084_merge_20250424_1814.py new file mode 100644 index 000000000..1b5c69acd --- /dev/null +++ b/reoptjl/migrations/0084_merge_20250424_1814.py @@ -0,0 +1,14 @@ +# Generated by Django 4.0.7 on 2025-04-24 18:14 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('reoptjl', '0081_pvinputs_acres_per_kw_pvinputs_kw_per_square_foot'), + ('reoptjl', '0083_electricutilityoutputs_peak_grid_demand_kw_and_more'), + ] + + operations = [ + ] From 14a1f36dc9658970d82e75472c8d196a2b2a631f Mon Sep 17 00:00:00 2001 From: adfarth Date: Fri, 25 Apr 2025 11:11:54 -0600 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d22fa460a..3abbbb7fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ Classify the change according to the following categories: ##### Removed ### Patches -## add-pvdensity +## v3.12.3 ### Minor Updates ### Added - Add inputs: **PV.acres_per_kw** and **PV.kw_per_square_foot**