Skip to content

Commit

Permalink
fix output vars
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitchute
mitchute committed Nov 19, 2019
1 parent 5188f93 commit cd8c96c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 19 deletions.
16 changes: 12 additions & 4 deletions src/EnergyPlus/ElectricPowerServiceManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2107,8 +2107,12 @@ void GeneratorController::simGeneratorGetPowerOutput(bool const runFlag,
dynamic_cast<ICEngineElectricGenerator::ICEngineGeneratorSpecs*> (thisICE)->InitICEngineGenerators(runFlag, FirstHVACIteration);
dynamic_cast<ICEngineElectricGenerator::ICEngineGeneratorSpecs*> (thisICE)->CalcICEngineGeneratorModel(runFlag, tempLoad);
dynamic_cast<ICEngineElectricGenerator::ICEngineGeneratorSpecs*> (thisICE)->update();
electricPowerOutput = dynamic_cast<ICEngineElectricGenerator::ICEngineGeneratorSpecs*> (thisICE)->ElecPowerGenerated;
thermalPowerOutput = dynamic_cast<ICEngineElectricGenerator::ICEngineGeneratorSpecs*> (thisICE)->QTotalHeatRecovered;
electProdRate = dynamic_cast<ICEngineElectricGenerator::ICEngineGeneratorSpecs*> (thisICE)->ElecPowerGenerated;
electricityProd = dynamic_cast<ICEngineElectricGenerator::ICEngineGeneratorSpecs*> (thisICE)->ElecEnergyGenerated;
thermProdRate = dynamic_cast<ICEngineElectricGenerator::ICEngineGeneratorSpecs*> (thisICE)->QTotalHeatRecovered;
thermalProd = dynamic_cast<ICEngineElectricGenerator::ICEngineGeneratorSpecs*> (thisICE)->TotalHeatEnergyRec;
electricPowerOutput = electProdRate;
thermalPowerOutput = thermProdRate;
break;
}
case GeneratorType::combTurbine: {
Expand All @@ -2122,8 +2126,12 @@ void GeneratorController::simGeneratorGetPowerOutput(bool const runFlag,
thisCTE->simulate(L, FirstHVACIteration, tempLoad, runFlag);
dynamic_cast<CTElectricGenerator::CTGeneratorData*> (thisCTE)->InitCTGenerators(runFlag, FirstHVACIteration);
dynamic_cast<CTElectricGenerator::CTGeneratorData*> (thisCTE)->CalcCTGeneratorModel(runFlag, tempLoad, FirstHVACIteration);
electricPowerOutput = dynamic_cast<CTElectricGenerator::CTGeneratorData*> (thisCTE)->ElecPowerGenerated;
thermalPowerOutput = dynamic_cast<CTElectricGenerator::CTGeneratorData*> (thisCTE)->QTotalHeatRecovered;
electProdRate = dynamic_cast<CTElectricGenerator::CTGeneratorData*> (thisCTE)->ElecPowerGenerated;
electricityProd = dynamic_cast<CTElectricGenerator::CTGeneratorData*> (thisCTE)->ElecEnergyGenerated;
thermProdRate = dynamic_cast<CTElectricGenerator::CTGeneratorData*> (thisCTE)->QTotalHeatRecovered;
thermalProd = dynamic_cast<CTElectricGenerator::CTGeneratorData*> (thisCTE)->TotalHeatEnergyRec;
electricPowerOutput = electProdRate;
thermalPowerOutput = thermProdRate;
break;
}
case GeneratorType::pV: {
Expand Down
15 changes: 0 additions & 15 deletions src/EnergyPlus/FuelCellElectricGenerator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3341,21 +3341,6 @@ namespace FuelCellElectricGenerator {
}
}

void getFuelCellGeneratorHeatRecoveryInfo(std::string const &GeneratorName, // user specified name of Generator
std::string &heatRecoveryCompName)
{

if (getFuelCellInputFlag) {
getFuelCellInput();
getFuelCellInputFlag = false;
}

int thisFuelCell = UtilityRoutines::FindItemInList(GeneratorName, FuelCell);
if (thisFuelCell > 0) {
heatRecoveryCompName = FuelCell(thisFuelCell).ExhaustHX.Name;
}
}

void FigureFuelCellZoneGains()
{

Expand Down

7 comments on commit cd8c96c

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 tests passed, 0 test warnings)

Build Badge

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

fuelCellGenPlantCompRefactor (mitchute) - x86_64-MacOS-10.13-clang: OK (2580 of 2581 tests passed, 1 test warnings)

Messages:\n

  • 2 tests had: BND diffs.
  • 2 tests had: EIO diffs.
  • 1 test had: ESO small diffs.
  • 2 tests had: MDD diffs.
  • 2 tests had: MTD diffs.
  • 1 test had: MTR small diffs.
  • 2 tests had: RDD diffs.
  • 1 test had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 668
  • Failed: 1

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.

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2620 of 2621 tests passed, 1 test warnings)

Messages:\n

  • 2 tests had: BND diffs.
  • 2 tests had: EIO diffs.
  • 1 test had: ESO small diffs.
  • 2 tests had: MDD diffs.
  • 2 tests had: MTD diffs.
  • 1 test had: MTR small diffs.
  • 2 tests had: RDD diffs.
  • 1 test had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 688
  • Failed: 1

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1241 of 1241 tests passed, 0 test warnings)

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.

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (674 of 674 tests passed, 0 test warnings)

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.

fuelCellGenPlantCompRefactor (mitchute) - Win64-Windows-10-VisualStudio-16: OK (2580 of 2581 tests passed, 1 test warnings)

Messages:\n

  • 2 tests had: BND diffs.
  • 2 tests had: EIO diffs.
  • 1 test had: ESO small diffs.
  • 2 tests had: MDD diffs.
  • 2 tests had: MTD diffs.
  • 1 test had: MTR small diffs.
  • 2 tests had: RDD diffs.
  • 1 test had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 668
  • Failed: 1

Build Badge Test Badge

Please sign in to comment.