diff --git a/reoptjl/migrations/0053_alter_chpinputs_macrs_bonus_fraction_and_more.py b/reoptjl/migrations/0042_settings_solver_name_and_more.py similarity index 89% rename from reoptjl/migrations/0053_alter_chpinputs_macrs_bonus_fraction_and_more.py rename to reoptjl/migrations/0042_settings_solver_name_and_more.py index 0440df8b9..9a5007d6e 100644 --- a/reoptjl/migrations/0053_alter_chpinputs_macrs_bonus_fraction_and_more.py +++ b/reoptjl/migrations/0042_settings_solver_name_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.7 on 2024-03-04 20:45 +# Generated by Django 4.0.7 on 2024-03-05 22:50 import django.core.validators from django.db import migrations, models @@ -7,10 +7,15 @@ class Migration(migrations.Migration): dependencies = [ - ('reoptjl', '0052_settings_solver_name'), + ('reoptjl', '0041_alter_electricutilityinputs_cambium_scenario'), ] operations = [ + migrations.AddField( + model_name='settings', + name='solver_name', + field=models.TextField(blank=True, choices=[('HiGHS', 'Highs'), ('Cbc', 'Cbc'), ('SCIP', 'Scip'), ('Xpress', 'Xpress')], default='Xpress', help_text='Solver used for REopt.jl. Options include HiGHS, Cbc, SCIP, and Xpress'), + ), migrations.AlterField( model_name='chpinputs', name='macrs_bonus_fraction', diff --git a/reoptjl/migrations/0052_settings_solver_name.py b/reoptjl/migrations/0052_settings_solver_name.py deleted file mode 100644 index e13d23db6..000000000 --- a/reoptjl/migrations/0052_settings_solver_name.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0.7 on 2024-02-12 17:36 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('reoptjl', '0051_financialoutputs_lifecycle_mg_upgrade_and_fuel_cost_bau_and_more'), - ] - - operations = [ - migrations.AddField( - model_name='settings', - name='solver_name', - field=models.TextField(blank=True, choices=[('HiGHS', 'Highs'), ('Cbc', 'Cbc'), ('SCIP', 'Scip'), ('Xpress', 'Xpress')], default='Xpress', help_text='Solver used for REopt.jl. Options include HiGHS, Cbc, SCIP, and Xpress'), - ), - ]