Skip to content

Commit

Permalink
Add quint linear curve, change water-to-air equationfit coils to refe…
Browse files Browse the repository at this point in the history
…rence curves
  • Loading branch information
yzhou601 committed Jan 19, 2021
1 parent 2bf07f5 commit 97a1447
Show file tree
Hide file tree
Showing 7 changed files with 459 additions and 279 deletions.
221 changes: 146 additions & 75 deletions idd/Energy+.idd.in
Original file line number Diff line number Diff line change
Expand Up @@ -54373,55 +54373,19 @@ Coil:Cooling:WaterToAirHeatPump:EquationFit,
\type real
\units W/W
\minimum> 0.0
N6, \field Total Cooling Capacity Coefficient 1
A6, \field Total Cooling Capacity Curve Name
\required-field
\type real
N7, \field Total Cooling Capacity Coefficient 2
\required-field
\type real
N8, \field Total Cooling Capacity Coefficient 3
\required-field
\type real
N9, \field Total Cooling Capacity Coefficient 4
\required-field
\type real
N10, \field Total Cooling Capacity Coefficient 5
\required-field
\type real
N11, \field Sensible Cooling Capacity Coefficient 1
\required-field
\type real
N12, \field Sensible Cooling Capacity Coefficient 2
\required-field
\type real
N13, \field Sensible Cooling Capacity Coefficient 3
\required-field
\type real
N14, \field Sensible Cooling Capacity Coefficient 4
\required-field
\type real
N15, \field Sensible Cooling Capacity Coefficient 5
\required-field
\type real
N16, \field Sensible Cooling Capacity Coefficient 6
\required-field
\type real
N17, \field Cooling Power Consumption Coefficient 1
\required-field
\type real
N18, \field Cooling Power Consumption Coefficient 2
\required-field
\type real
N19, \field Cooling Power Consumption Coefficient 3
\required-field
\type real
N20, \field Cooling Power Consumption Coefficient 4
\type object-list
\object-list QuadvariateFunctions
A7, \field Sensible Cooling Capacity Curve Name
\required-field
\type real
N21, \field Cooling Power Consumption Coefficient 5
\type object-list
\object-list QuintvariateFunctions
A8, \field Cooling Power Consumption Curve Name
\required-field
\type real
N22, \field Nominal Time for Condensate Removal to Begin
\type object-list
\object-list QuadvariateFunctions
N6, \field Nominal Time for Condensate Removal to Begin
\type real
\units s
\minimum 0.0
Expand All @@ -54432,7 +54396,7 @@ Coil:Cooling:WaterToAirHeatPump:EquationFit,
\note Nominal time is equal to the ratio of the energy of the coil's maximum
\note condensate holding capacity (J) to the coil's steady state latent capacity (W).
\note Suggested value is 1000; zero value means latent degradation model is disabled.
N23; \field Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity
N7; \field Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity
\type real
\units dimensionless
\minimum 0.0
Expand Down Expand Up @@ -55327,36 +55291,14 @@ Coil:Heating:WaterToAirHeatPump:EquationFit,
\type real
\units W/W
\minimum> 0.0
N5, \field Heating Capacity Coefficient 1
\required-field
\type real
N6, \field Heating Capacity Coefficient 2
\required-field
\type real
N7, \field Heating Capacity Coefficient 3
\required-field
\type real
N8, \field Heating Capacity Coefficient 4
\required-field
\type real
N9, \field Heating Capacity Coefficient 5
\required-field
\type real
N10, \field Heating Power Consumption Coefficient 1
\required-field
\type real
N11, \field Heating Power Consumption Coefficient 2
\required-field
\type real
N12, \field Heating Power Consumption Coefficient 3
\required-field
\type real
N13, \field Heating Power Consumption Coefficient 4
A6, \field Heating Capacity Curve Name
\required-field
\type real
N14; \field Heating Power Consumption Coefficient 5
\type object-list
\object-list QuadvariateFunctions
A7; \field Heating Power Consumption Curve Name
\required-field
\type real
\type object-list
\object-list QuadvariateFunctions

Coil:Heating:WaterToAirHeatPump:VariableSpeedEquationFit,
\memo Direct expansion (DX) heating coil for water-to-air heat pump (includes electric
Expand Down Expand Up @@ -80766,6 +80708,7 @@ EnergyManagementSystem:CurveOrTableIndexVariable,
\object-list BivariateFunctions
\object-list TrivariateFunctions
\object-list QuadvariateFunctions
\object-list QuintvariateFunctions
\object-list MultivariateFunctions
\required-field

Expand Down Expand Up @@ -91354,6 +91297,133 @@ Curve:QuadLinear,
\key VolumetricFlowPerPower
\default Dimensionless

Curve:QuintLinear,
\memo Linear curve with five independent variables.
\memo Input for the linear curve consists of a curve name, the two coefficients, and the
\memo maximum and minimum valid independent variable values. Optional inputs for curve
\memo minimum and maximum may be used to limit the output of the performance curve.
\memo curve = C1 + C2*v + C3*w + C4*x + C5*y + C6*z
A1 , \field Name
\required-field
\type alpha
\reference QuintvariateFunctions
N1 , \field Coefficient1 Constant
\required-field
\type real
N2 , \field Coefficient2 v
\required-field
\type real
N3 , \field Coefficient3 w
\required-field
\type real
N4 , \field Coefficient4 x
\required-field
\type real
N5 , \field Coefficient5 y
\required-field
\type real
N6 , \field Coefficient6 z
\required-field
\type real
N7 , \field Minimum Value of v
\required-field
\type real
\unitsBasedOnField A2
N8 , \field Maximum Value of v
\required-field
\type real
\unitsBasedOnField A2
N9 , \field Minimum Value of w
\required-field
\type real
\unitsBasedOnField A2
N10 , \field Maximum Value of w
\required-field
\type real
\unitsBasedOnField A2
N11 , \field Minimum Value of x
\required-field
\type real
\unitsBasedOnField A3
N12 ,\field Maximum Value of x
\required-field
\type real
\unitsBasedOnField A3
N13 , \field Minimum Value of y
\required-field
\type real
\unitsBasedOnField A4
N14, \field Maximum Value of y
\required-field
\type real
\unitsBasedOnField A4
N15, \field Minimum Value of z
\required-field
\type real
\unitsBasedOnField A5
N16, \field Maximum Value of z
\required-field
\type real
\unitsBasedOnField A5
N17, \field Minimum Curve Output
\type real
\note Specify the minimum value calculated by this curve object
\unitsBasedOnField A4
N18, \field Maximum Curve Output
\type real
\note Specify the maximum value calculated by this curve object
\unitsBasedOnField A4
A2 , \field Input Unit Type for v
\type choice
\key Dimensionless
\key Temperature
\key VolumetricFlow
\key MassFlow
\key Power
\key Distance
\key VolumetricFlowPerPower
\default Dimensionless
A3 , \field Input Unit Type for w
\type choice
\key Dimensionless
\key Temperature
\key VolumetricFlow
\key MassFlow
\key Power
\key Distance
\key VolumetricFlowPerPower
\default Dimensionless
A4 , \field Input Unit Type for x
\type choice
\key Dimensionless
\key Temperature
\key VolumetricFlow
\key MassFlow
\key Power
\key Distance
\key VolumetricFlowPerPower
\default Dimensionless
A5 , \field Input Unit Type for y
\type choice
\key Dimensionless
\key Temperature
\key VolumetricFlow
\key MassFlow
\key Power
\key Distance
\key VolumetricFlowPerPower
\default Dimensionless
A6; \field Input Unit Type for z
\type choice
\key Dimensionless
\key Temperature
\key VolumetricFlow
\key MassFlow
\key Power
\key Distance
\key VolumetricFlowPerPower
\default Dimensionless

Curve:Quadratic,
\memo Quadratic curve with one independent variable.
\memo Input for a quadratic curve consists of the curve name, the three coefficients, and
Expand Down Expand Up @@ -92581,6 +92651,7 @@ Table:Lookup,
\reference BivariateFunctions
\reference TrivariateFunctions
\reference QuadvariateFunctions
\reference QuintvariateFunctions
\reference MultivariateFunctions
\type alpha
A2, \field Independent Variable List Name
Expand Down
Loading

5 comments on commit 97a1447

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

equationfitcoil-curve (yzhou601) - x86_64-MacOS-10.15-clang-11.0.0: OK (2975 of 2991 tests passed, 1 test warnings)

Messages:\n

  • 1 test had: EIO diffs.

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1092
  • Failed: 2

integration Test Summary

  • Passed: 704
  • Failed: 14

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

equationfitcoil-curve (yzhou601) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3014 of 3031 tests passed, 1 test warnings)

Messages:\n

  • 1 test had: EIO diffs.

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1092
  • Failed: 2

integration Test Summary

  • Passed: 707
  • Failed: 14

performance Test Summary

  • Passed: 16
  • Failed: 1

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

equationfitcoil-curve (yzhou601) - Win64-Windows-10-VisualStudio-16: OK (2232 of 2248 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1091
  • Failed: 2

integration Test Summary

  • Passed: 704
  • Failed: 14

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

equationfitcoil-curve (yzhou601) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1555 of 1557 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1092
  • Failed: 2

Build Badge Test Badge Coverage Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

equationfitcoil-curve (yzhou601) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: Coverage Too Low

Failures:\n

integration Test Summary

  • Passed: 707
  • Failed: 14

Build Badge Test Badge Coverage Badge

Please sign in to comment.