Merge branch 'develop' into dependabot/pip/oauthlib-3.2.2

.github/disabled_cbc_workflows/push_test_cbc.yml

@@ -1,4 +1,4 @@
-name: Built-in Tests for Push (Cbc in Ubuntu 18.04)
+name: Built-in Tests for Push (Cbc in latest Ubuntu)
 
 on:
 
@@ -9,7 +9,7 @@ on:
 jobs:
 
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/pull_request_tests.yml

@@ -1,4 +1,4 @@
-name: Built-in Tests for Pull Requests (Xpress in Ubuntu 18.04)
+name: Built-in Tests for Pull Requests (Xpress in latest Ubuntu)
 
 on:
 
@@ -14,7 +14,7 @@ on:
 jobs:
 
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2      

.github/workflows/push_tests.yml

@@ -1,4 +1,4 @@
-name: Built-in Tests for Push (Xpress in Ubuntu 18.04)
+name: Built-in Tests for Push (Xpress in latest Ubuntu)
 
 on:
 
@@ -10,7 +10,7 @@ on:
 jobs:
 
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2

.helm/values.production.yaml

@@ -1,11 +1,13 @@
 appEnv: production
 djangoSettingsModule: reopt_api.production_settings
 djangoReplicas: 10
-djangoMemoryRequest: "1400Mi"
-djangoMemoryLimit: "1400Mi"
+djangoMemoryRequest: "2800Mi"
+djangoMemoryLimit: "2800Mi"
 celeryReplicas: 20
 celeryMemoryRequest: "900Mi"
 celeryMemoryLimit: "900Mi"
 juliaReplicas: 20
+juliaCpuRequest: "300m"
+juliaCpuLimit: "4000m"
 juliaMemoryRequest: "8000Mi"
 juliaMemoryLimit: "8000Mi"

.helm/values.staging.yaml

@@ -1,2 +1,2 @@
 appEnv: staging
-djangoSettingsModule: reopt_api.staging_settings
+djangoSettingsModule: reopt_api.staging_settings

.helm/values.yaml

@@ -11,11 +11,11 @@ redisPort: 6379
 djangoReplicas: 2
 djangoCpuRequest: "100m"
 djangoCpuLimit: "4000m"
-djangoMemoryRequest: "800Mi"
-djangoMemoryLimit: "800Mi"
+djangoMemoryRequest: "1600Mi"
+djangoMemoryLimit: "1600Mi"
 celeryReplicas: 2
 celeryCpuRequest: "100m"
-celeryCpuLimit: "4000m"
+celeryCpuLimit: "800m"
 celeryMemoryRequest: "700Mi"
 celeryMemoryLimit: "700Mi"
 juliaReplicas: 2

ghpghx/migrations/0004_ghpghxoutputs_end_of_year_eft_f_and_more.py

@@ -0,0 +1,39 @@
+# Generated by Django 4.0.7 on 2023-03-07 01:46
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ghpghx', '0003_auto_20211222_1817'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='end_of_year_eft_f',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='End of year entering fluid temperature for all years in the last iteration of GHX sizing [degF]', null=True, size=None),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='peak_auxiliary_boiler_mmbtu_per_hour',
+            field=models.FloatField(blank=True, help_text='Peak auxiliary boiler consumption for boiler sizing [MMBtu/hr]', null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='peak_auxiliary_cooling_tower_ton',
+            field=models.FloatField(blank=True, help_text='Peak auxiliary cooling tower consumption for cooling tower sizing [ton]', null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='yearly_auxiliary_boiler_consumption_series_mmbtu_per_hour',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Hourly auxiliary boiler consumption, average across simulation years [MMBtu/hr]', null=True, size=None),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='yearly_auxiliary_cooling_tower_consumption_series_ton',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Hourly auxiliary cooling tower consumption, average across simulation years [ton]', null=True, size=None),
+        ),
+    ]

ghpghx/migrations/0005_remove_ghpghxoutputs_peak_auxiliary_boiler_mmbtu_per_hour_and_more.py

@@ -0,0 +1,75 @@
+# Generated by Django 4.0.7 on 2023-03-10 02:48
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ghpghx', '0004_ghpghxoutputs_end_of_year_eft_f_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ghpghxoutputs',
+            name='peak_auxiliary_boiler_mmbtu_per_hour',
+        ),
+        migrations.RemoveField(
+            model_name='ghpghxoutputs',
+            name='peak_auxiliary_cooling_tower_ton',
+        ),
+        migrations.RemoveField(
+            model_name='ghpghxoutputs',
+            name='yearly_auxiliary_boiler_consumption_series_mmbtu_per_hour',
+        ),
+        migrations.RemoveField(
+            model_name='ghpghxoutputs',
+            name='yearly_auxiliary_cooling_tower_consumption_series_ton',
+        ),
+        migrations.AddField(
+            model_name='ghpghxinputs',
+            name='is_hybrid_ghx',
+            field=models.BooleanField(blank=True, default=True, help_text='If the GHP system uses a hybrid GHX with auxiliary heater or cooler', null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='annual_aux_cooler_electric_consumption_kwh',
+            field=models.FloatField(blank=True, help_text='Annual auxiliary cooler electrical consumption [kWh]', null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='annual_aux_heater_electric_consumption_kwh',
+            field=models.FloatField(blank=True, help_text='Annual auxiliary heater electrical consumption [kWh]', null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='peak_aux_cooler_thermal_production_ton',
+            field=models.FloatField(blank=True, help_text='Peak auxiliary cooler thermal production for cooler sizing [ton]', null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='peak_aux_heater_thermal_production_mmbtu_per_hour',
+            field=models.FloatField(blank=True, help_text='Peak auxiliary heater thermal production for heater sizing [MMBtu/hr]', null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='yearly_aux_cooler_electric_consumption_series_kw',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Hourly auxiliary cooler electrical consumption, average across simulation years [kW]', null=True, size=None),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='yearly_aux_cooler_thermal_production_series_kwt',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Hourly auxiliary cooler thermal production, average across simulation years [kW-thermal]', null=True, size=None),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='yearly_aux_heater_electric_consumption_series_kw',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Hourly auxiliary heater electrical consumption, average across simulation years [kW]', null=True, size=None),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='yearly_aux_heater_thermal_production_series_mmbtu_per_hour',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Hourly auxiliary heater thermal production, average across simulation years [MMBtu/hr]', null=True, size=None),
+        ),
+    ]

ghpghx/migrations/0006_alter_ghpghxinputs_is_hybrid_ghx.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.7 on 2023-03-10 05:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ghpghx', '0005_remove_ghpghxoutputs_peak_auxiliary_boiler_mmbtu_per_hour_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ghpghxinputs',
+            name='is_hybrid_ghx',
+            field=models.BooleanField(blank=True, help_text='If the GHP system uses a hybrid GHX with auxiliary heater or cooler', null=True),
+        ),
+    ]

ghpghx/migrations/0007_ghpghxoutputs_aux_heat_exchange_unit_type_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.0.7 on 2023-03-10 07:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ghpghx', '0006_alter_ghpghxinputs_is_hybrid_ghx'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='aux_heat_exchange_unit_type',
+            field=models.TextField(blank=True, help_text='Specifies if the auxiliary heat exchange unit is a heater or cooler', null=True),
+        ),
+        migrations.AlterField(
+            model_name='ghpghxinputs',
+            name='is_hybrid_ghx',
+            field=models.BooleanField(blank=True, default=True, help_text='If the GHP system uses a hybrid GHX with auxiliary heater or cooler', null=True),
+        ),
+    ]

ghpghx/migrations/0008_ghpghxinputs_aux_cooler_energy_use_intensity_kwe_per_kwt_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.0.7 on 2023-03-12 04:18
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ghpghx', '0007_ghpghxoutputs_aux_heat_exchange_unit_type_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ghpghxinputs',
+            name='aux_cooler_energy_use_intensity_kwe_per_kwt',
+            field=models.FloatField(blank=True, default=0.2, help_text='The energy use intensity of the auxiliary cooler [kWe/kWt]', null=True, validators=[django.core.validators.MinValueValidator(0.001), django.core.validators.MaxValueValidator(10.0)]),
+        ),
+        migrations.AddField(
+            model_name='ghpghxinputs',
+            name='aux_heater_thermal_efficiency',
+            field=models.FloatField(blank=True, default=0.98, help_text='The thermal efficiency (thermal_out/fuel_in) of the auxiliary heater', null=True, validators=[django.core.validators.MinValueValidator(0.001), django.core.validators.MaxValueValidator(10.0)]),
+        ),
+    ]

ghpghx/migrations/0009_ghpghxinputs_hybrid_sizing_flag_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.0.7 on 2023-03-13 16:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ghpghx', '0008_ghpghxinputs_aux_cooler_energy_use_intensity_kwe_per_kwt_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ghpghxinputs',
+            name='hybrid_sizing_flag',
+            field=models.FloatField(blank=True, default=1.0, help_text='Possible values: -2 (size for heating), -1.0 (size for cooling), 1.0 (non-hybrid), value between 0-1 (fraction of full GHE size)', null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpghxinputs',
+            name='is_heating_electric',
+            field=models.BooleanField(blank=True, default=True, help_text='Set to True if heating is electric, false otherwise', null=True),
+        ),
+    ]

ghpghx/migrations/0010_remove_ghpghxoutputs_end_of_year_eft_f_and_more.py

@@ -0,0 +1,59 @@
+# Generated by Django 4.0.7 on 2023-03-20 17:02
+
+import django.contrib.postgres.fields
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ghpghx', '0009_ghpghxinputs_hybrid_sizing_flag_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ghpghxoutputs',
+            name='end_of_year_eft_f',
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='end_of_year_ghx_lft_f',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='End of year GHX leaving fluid temperature for all years in the last iteration of GHX sizing [degF]', null=True, size=None),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='ghx_soln_number_of_iterations',
+            field=models.IntegerField(blank=True, help_text='The number of iterations taken to get GHX sizing', null=True),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='max_yearly_ghx_lft_f',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Maximum GHX leaving fluid temperature for all years in the last iteration of GHX sizing [degF]', null=True, size=None),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='min_yearly_ghx_lft_f',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Minimum GHX leaving fluid temperature for all years in the last iteration of GHX sizing [degF]', null=True, size=None),
+        ),
+        migrations.AddField(
+            model_name='ghpghxoutputs',
+            name='yearly_ghx_lft_series_f',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(blank=True, null=True), blank=True, default=list, help_text='Hourly GHX leaving fluid temperature (lft), average across simulation years [kW]', null=True, size=None),
+        ),
+        migrations.AlterField(
+            model_name='ghpghxinputs',
+            name='aux_cooler_energy_use_intensity_kwe_per_kwt',
+            field=models.FloatField(blank=True, default=0.02, help_text='The energy use intensity of the auxiliary cooler [kWe/kWt]', null=True, validators=[django.core.validators.MinValueValidator(0.001), django.core.validators.MaxValueValidator(1.0)]),
+        ),
+        migrations.AlterField(
+            model_name='ghpghxinputs',
+            name='aux_heater_thermal_efficiency',
+            field=models.FloatField(blank=True, default=0.98, help_text='The thermal efficiency (thermal_out/fuel_in) of the auxiliary heater', null=True, validators=[django.core.validators.MinValueValidator(0.001), django.core.validators.MaxValueValidator(1.0)]),
+        ),
+        migrations.AlterField(
+            model_name='ghpghxinputs',
+            name='hybrid_sizing_flag',
+            field=models.FloatField(blank=True, default=1.0, help_text='Possible values: -2 (size for heating), -1.0 (size for cooling), 1.0 (non-hybrid), value between 0-1 (fraction of full GHX size)', null=True),
+        ),
+    ]

ghpghx/migrations/0011_ghpghxinputs_hybrid_ghx_sizing_fraction_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.0.7 on 2023-03-22 03:34
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ghpghx', '0010_remove_ghpghxoutputs_end_of_year_eft_f_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ghpghxinputs',
+            name='hybrid_ghx_sizing_fraction',
+            field=models.FloatField(blank=True, default=0.6, help_text='Applies fraction to full GHX size for hybrid sizing (value between 0.1 - 1.0)', null=True, validators=[django.core.validators.MinValueValidator(0.1), django.core.validators.MaxValueValidator(1.0)]),
+        ),
+        migrations.AddField(
+            model_name='ghpghxinputs',
+            name='hybrid_ghx_sizing_method',
+            field=models.TextField(blank=True, default='None', help_text="Possible values: 'Fractional' (user inputs fraction of full GHX size), 'Automatic' (REopt determines based on the smaller heating or cooling load), 'None' (non-hybrid)", null=True),
+        ),
+    ]

ghpghx/migrations/0012_remove_ghpghxinputs_is_hybrid_ghx.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.0.7 on 2023-03-23 21:53
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ghpghx', '0011_ghpghxinputs_hybrid_ghx_sizing_fraction_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ghpghxinputs',
+            name='is_hybrid_ghx',
+        ),
+    ]