Skip to content

Commit

Permalink
Changed calculation procedure for outlet node values
Browse files Browse the repository at this point in the history
The value is the maximum value between OA and recirculation node
  • Loading branch information
lgu1234 committed Aug 29, 2014
1 parent a6a613e commit 4b56106
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/EnergyPlus/DualDuct.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1908,10 +1908,10 @@ namespace DualDuct {
}
else {
if ( Contaminant.CO2Simulation ) {
Node( OutletNode ).CO2 = Node( OAInletNode ).CO2;
Node( OutletNode ).CO2 = max( Node( OAInletNode ).CO2, Node( RAInletNode ).CO2 );
}
if ( Contaminant.GenericContamSimulation ) {
Node( OutletNode ).GenContam = Node( OAInletNode ).GenContam;
Node( OutletNode ).GenContam = max( Node( OAInletNode ).GenContam, Node( RAInletNode ).GenContam );
}
}

Expand Down

9 comments on commit 4b56106

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

76890548-Review-CO2-and-contaminant-calculations (lgu1234) - x86_64-MacOS-10.9-clang: OK (451 of 451 tests passed)

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.

76890548-Review-CO2-and-contaminant-calculations (lgu1234) - x86_64-MacOS-10.9-clang-Debug: OK (446 of 451 tests passed)

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.

76890548-Review-CO2-and-contaminant-calculations (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (445 of 451 tests passed)

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.

76890548-Review-CO2-and-contaminant-calculations (lgu1234) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

@mjwitte
Copy link
Contributor

Choose a reason for hiding this comment

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

@Myoldmopar @lefticus Just curious why the windows CI reports aren't here yet. Haven't seen any new reports from tik-tok since about 8pm Central on Friday night.

@lefticus
Copy link
Contributor

Choose a reason for hiding this comment

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

@mjwitte the windows bot is currently catching up on some OpenStudio builds.

@mjwitte
Copy link
Contributor

@mjwitte mjwitte commented on 4b56106 Aug 30, 2014 via email

Choose a reason for hiding this comment

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

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

76890548-Review-CO2-and-contaminant-calculations (lgu1234) - i386-Windows-7-VisualStudio-12: OK (451 of 451 tests passed)

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.

76890548-Review-CO2-and-contaminant-calculations (lgu1234) - Win64-Windows-7-VisualStudio-12: OK (451 of 451 tests passed)

Build Badge Test Badge

Please sign in to comment.