migrations and updated help text

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

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/...tions/0079_alter_siteinputs_include_grid_renewable_fraction_in_re_constraints_and_more.py b/...tions/0079_alter_siteinputs_include_grid_renewable_fraction_in_re_constraints_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.0.7 on 2025-02-05 18:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0078_merge_20250128_1541'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='siteinputs',
+            name='include_grid_renewable_fraction_in_RE_constraints',
+            field=models.BooleanField(blank=True, default=False, help_text='If True, then the renewable energy content of energy from the grid is included in any min or max renewable energy requirements.'),
+        ),
+        migrations.AlterField(
+            model_name='siteoutputs',
+            name='onsite_and_grid_renewable_electricity_fraction_of_elec_load_bau',
+            field=models.FloatField(blank=True, help_text='Calculation is the same as onsite_renewable_electricity_fraction_of_elec_load_bau, but additionally includes the renewable energycontent of grid-purchased electricity, accounting for any battery efficiency losses.', null=True),
+        ),
+        migrations.AlterField(
+            model_name='siteoutputs',
+            name='onsite_and_grid_renewable_energy_fraction_of_total_load_bau',
+            field=models.FloatField(blank=True, help_text='Calculation is the same as onsite_renewable_energy_fraction_of_total_load_bau, but additionally includes the renewable energycontent of grid-purchased electricity, accounting for any battery efficiency losses.', null=True),
+        ),
+    ]
diff --git a/reoptjl/models.py b/reoptjl/models.py
@@ -451,7 +451,6 @@ class SiteOutputs(BaseModel, models.Model):
                   "Calculated as total annual RE electric generation, minus storage losses and curtailment, with the user selecting whether exported renewable generation is included). "
                   )
     )
-    # TODO: I think "incl. electric heating/cooling loads" is not currently true
     onsite_renewable_electricity_fraction_of_elec_load = models.FloatField(
         null=True, blank=True,
         help_text=(
@@ -578,14 +577,14 @@ class SiteOutputs(BaseModel, models.Model):
     onsite_and_grid_renewable_electricity_fraction_of_elec_load_bau = models.FloatField(
         null=True, blank=True,
         help_text=(
-                  "Calculation is the same as onsite_renewable_electricity_fraction_of_elec_load, but additionally includes the renewable energy"
+                  "Calculation is the same as onsite_renewable_electricity_fraction_of_elec_load_bau, but additionally includes the renewable energy"
                   "content of grid-purchased electricity, accounting for any battery efficiency losses."
                   )
     )
     onsite_and_grid_renewable_energy_fraction_of_total_load_bau = models.FloatField(
         null=True, blank=True,
         help_text=(
-                  "Calculation is the same as onsite_renewable_energy_fraction_of_total_load, but additionally includes the renewable energy"
+                  "Calculation is the same as onsite_renewable_energy_fraction_of_total_load_bau, but additionally includes the renewable energy"
                   "content of grid-purchased electricity, accounting for any battery efficiency losses."
                   )
     )