Skip to content

Commit

Permalink
Merge branch 'reoptjl-v050' of https://github.com/NREL/REopt_API into…
Browse files Browse the repository at this point in the history
… reoptjl-v050
  • Loading branch information
Bill-Becker committed Jan 22, 2025
2 parents f96e037 + ade3ec7 commit 9a80b58
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='ashpspaceheaterinputs',
name='force_dispatch',
field=models.BooleanField(default=True, help_text='Boolean indicator if ASHP space heater is forced to its maximize output if true', null=True),
field=models.BooleanField(default=True, help_text='Boolean indicator that ASHP space heater outputs either maximum capacity or site load if true', null=True),
),
migrations.AddField(
model_name='ashpwaterheaterinputs',
name='force_dispatch',
field=models.BooleanField(default=True, help_text='Boolean indicator if ASHP water heater is forced to its maximize output if true', null=True),
field=models.BooleanField(default=True, help_text='Boolean indicator that ASHP water heater outputs either maximum capacity or site load if true', null=True),
),
migrations.AlterField(
model_name='ashpwaterheaterinputs',
Expand Down
4 changes: 2 additions & 2 deletions reoptjl/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5480,7 +5480,7 @@ class ASHPSpaceHeaterInputs(BaseModel, models.Model):
force_dispatch = models.BooleanField(
null=True,
default=True,
help_text="Boolean indicator if ASHP space heater is forced to its maximize output if true"
help_text="Boolean indicator that ASHP space heater outputs either maximum capacity or site load if true"
)

avoided_capex_by_ashp_present_value = models.FloatField(
Expand Down Expand Up @@ -5775,7 +5775,7 @@ class ASHPWaterHeaterInputs(BaseModel, models.Model):
force_dispatch = models.BooleanField(
null=True,
default=True,
help_text="Boolean indicator if ASHP water heater is forced to its maximize output if true"
help_text="Boolean indicator that ASHP water heater outputs either maximum capacity or site load if true"
)

def clean(self):
Expand Down

0 comments on commit 9a80b58

Please sign in to comment.