Skip to content

Commit

Permalink
Clean up after solving conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Sep 14, 2015
1 parent 30dc797 commit 4742ab5
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/EnergyPlus/DXCoils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4101,11 +4101,6 @@ namespace DXCoils {
ShowWarningError( RoutineName + CurrentModuleObject + "=\"" + DXCoil( DXCoilNum ).Name + "\", invalid" );
ShowContinueError( "...not found " + cAlphaFields( 18 + ( I - 1 ) * 6 ) + "=\"" + Alphas( 18 + ( I - 1 ) * 6 ) + "\"." );
}
<<<<<<< .mine
// ErrorsFound = true;
=======
ErrorsFound = true;
>>>>>>> .theirs
} else {
// Verify Curve Object, only legal types are BiQuadratic
{ auto const SELECT_CASE_var( GetCurveType( DXCoil( DXCoilNum ).MSWasteHeat( I ) ) );
Expand Down

10 comments on commit 4742ab5

@lgu1234
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mjwitte I cleaned up some remaining issues after solving conflicts. However, when I ran unit test, release failed the pass in SQLiteFixture, OutputProcessor_getCustomMeterInput in the OutputProcessor: error: Value of NumEnergyMeters. When I ran debug for this specific section, it passed. Hope CI machine will tell me what happens.

@mjwitte
Copy link
Contributor

Choose a reason for hiding this comment

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

@lgu1234 That unit test failure crept into develop, so it's not your problem. It only happens when you run locally as a group.

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - x86_64-MacOS-10.9-clang: OK (1862 of 1862 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.

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - i386-Windows-7-VisualStudio-12: OK (0 of 0 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.

Unhandled Fundamental Failure

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (1868 of 1868 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.

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

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

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (798 of 798 tests passed)

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

102497980-Improve-waste-heat-function-handling-for-CoilCoolingDXMultiSpeed-and-CoilHeatingDXMultiSpeed-#5162 (lgu1234) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1334 of 1334 tests passed)

Build Badge Test Badge Coverage Badge

@lgu1234
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mjwitte Thanks for letting me know that it is not my problem. Since CI machine results show green, I am going to merge it in develop.

Please sign in to comment.