Skip to content

Commit

Permalink
clang-format, note in idd and md
Browse files Browse the repository at this point in the history
  • Loading branch information
Yujie Xu committed Nov 7, 2023
1 parent ed0ca9c commit f2d1738
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
8 changes: 4 additions & 4 deletions design/FY2024/NFP-labHeatExchangerHR.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,25 +226,25 @@ nominal HX supply air volume flow rate." will be removed too.
A11,\field Sensible Effectiveness of Heating Air Flow Curve Name
\note optional
\note if this field has value, then the sensivle effectiveness for heating
\note will be the value in N2 multiplied this curve value
\note will be the value in N2 multiplied by this curve value
\type object-list
\object-list UnivariateFunctions
A12,\field Latent Effectiveness of Heating Air Flow Curve Name
\note optional
\note if this field has value, then the latent effectiveness for heating
\note will be the value in N3 multiplied this curve value
\note will be the value in N3 multiplied by this curve value
\type object-list
\object-list UnivariateFunctions
A13,\field Sensible Effectiveness of Cooling Air Flow Curve Name
\note optional
\note if this field has value, then the sensivle effectiveness for cooling
\note will be the value in N4 multiplied this curve value
\note will be the value in N4 multiplied by this curve value
\type object-list
\object-list UnivariateFunctions
A14;\field Latent Effectiveness of Cooling Air Flow Curve Name
\note optional
\note if this field has value, then the latent effectiveness for cooling
\note will be the value in N5 multiplied this curve value
\note will be the value in N5 multiplied by this curve value
\type object-list
\object-list UnivariateFunctions

Expand Down
8 changes: 4 additions & 4 deletions idd/Energy+.idd.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62696,25 +62696,25 @@ HeatExchanger:AirToAir:SensibleAndLatent,
A11,\field Sensible Effectiveness of Heating Air Flow Curve Name
\note optional
\note if this field has value, then the sensivle effectiveness for heating
\note will be the value in N2 multiplied this curve value
\note will be the value in N2 multiplied by this curve value
\type object-list
\object-list UnivariateFunctions
A12,\field Latent Effectiveness of Heating Air Flow Curve Name
\note optional
\note if this field has value, then the latent effectiveness for heating
\note will be the value in N3 multiplied this curve value
\note will be the value in N3 multiplied by this curve value
\type object-list
\object-list UnivariateFunctions
A13,\field Sensible Effectiveness of Cooling Air Flow Curve Name
\note optional
\note if this field has value, then the sensivle effectiveness for cooling
\note will be the value in N4 multiplied this curve value
\note will be the value in N4 multiplied by this curve value
\type object-list
\object-list UnivariateFunctions
A14;\field Latent Effectiveness of Cooling Air Flow Curve Name
\note optional
\note if this field has value, then the latent effectiveness for cooling
\note will be the value in N5 multiplied this curve value
\note will be the value in N5 multiplied by this curve value
\type object-list
\object-list UnivariateFunctions

Expand Down
12 changes: 8 additions & 4 deletions src/EnergyPlus/HeatRecovery.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,10 +514,14 @@ namespace HeatRecovery {
}

// yujie: read new curves here
thisExchanger.HeatEffectSensibleCurveIndex = Curve::GetCurveIndex(state, state.dataIPShortCut->cAlphaArgs(11)); // convert curve name to number
thisExchanger.HeatEffectLatentCurveIndex = Curve::GetCurveIndex(state, state.dataIPShortCut->cAlphaArgs(12)); // convert curve name to number
thisExchanger.CoolEffectSensibleCurveIndex = Curve::GetCurveIndex(state, state.dataIPShortCut->cAlphaArgs(13)); // convert curve name to number
thisExchanger.CoolEffectLatentCurveIndex = Curve::GetCurveIndex(state, state.dataIPShortCut->cAlphaArgs(14)); // convert curve name to number
thisExchanger.HeatEffectSensibleCurveIndex =
Curve::GetCurveIndex(state, state.dataIPShortCut->cAlphaArgs(11)); // convert curve name to number
thisExchanger.HeatEffectLatentCurveIndex =
Curve::GetCurveIndex(state, state.dataIPShortCut->cAlphaArgs(12)); // convert curve name to number
thisExchanger.CoolEffectSensibleCurveIndex =
Curve::GetCurveIndex(state, state.dataIPShortCut->cAlphaArgs(13)); // convert curve name to number
thisExchanger.CoolEffectLatentCurveIndex =
Curve::GetCurveIndex(state, state.dataIPShortCut->cAlphaArgs(14)); // convert curve name to number

BranchNodeConnections::TestCompSet(state,
DataHVACGlobals::cHXTypes(thisExchanger.ExchType),
Expand Down

4 comments on commit f2d1738

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

labHeatExchangerNFP (Unknown) - Win64-Windows-10-VisualStudio-16: OK (2716 of 2753 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1471
  • Failed: 7

integration Test Summary

  • Passed: 759
  • Failed: 30

Build Badge Test 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.

labHeatExchangerNFP (Unknown) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3542 of 3581 tests passed, 0 test warnings)

Messages:\n

  • 1 test had: AUD diffs.
  • 1 test had: EIO diffs.
  • 1 test had: ERR diffs.
  • 1 test had: ESO big diffs.
  • 2 tests had: Table big diffs.

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1473
  • Failed: 6
  • SEGFAULT: 1

integration Test Summary

  • Passed: 762
  • Failed: 30

regression Test Summary

  • Passed: 804
  • Failed: 2

Build Badge Test 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.

labHeatExchangerNFP (Unknown) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1959 of 1966 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1473
  • Failed: 7

Build Badge Test Badge Coverage 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.

labHeatExchangerNFP (Unknown) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (760 of 790 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 760
  • Failed: 30

Build Badge Test Badge Coverage Badge

Please sign in to comment.