Skip to content

Commit

Permalink
functions to members
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitchute
mitchute committed Nov 12, 2019
1 parent c77ead6 commit ce50b27
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 68 deletions.
110 changes: 54 additions & 56 deletions src/EnergyPlus/FuelCellElectricGenerator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1817,8 +1817,7 @@ namespace FuelCellElectricGenerator {
Par(2) = tmpTotProdGasEnthalpy;
Par(3) = this->FCPM.NdotProdGas;
Real64 tmpTprodGas = this->FCPM.TprodGasLeavingFCPM;
auto boundFunc = std::bind(&FCDataStruct::FuelCellProductGasEnthResidual, this, std::placeholders::_1, std::placeholders::_2);
General::SolveRoot(Acc, MaxIter, SolverFlag, tmpTprodGas, boundFunc, DataGenerators::MinProductGasTemp, DataGenerators::MaxProductGasTemp, Par);
General::SolveRoot(Acc, MaxIter, SolverFlag, tmpTprodGas, this->FuelCellProductGasEnthResidual, DataGenerators::MinProductGasTemp, DataGenerators::MaxProductGasTemp, Par);

if (SolverFlag == -2) {

Expand All @@ -1838,7 +1837,7 @@ namespace FuelCellElectricGenerator {
// How much power is really going into inverter?
Real64 PintoInverter = Pel + Pstorage; // Back out so we can reapply
bool ConstrainedStorage;
ManageElectStorInteractions(GeneratorNum, Pdemand, PpcuLosses, ConstrainedStorage, Pstorage, PgridExtra);
this->ManageElectStorInteractions(Pdemand, PpcuLosses, ConstrainedStorage, Pstorage, PgridExtra);
PintoInverter = Pel - Pstorage;
// refine power conditioning losses with more current power production

Expand Down Expand Up @@ -1876,8 +1875,7 @@ namespace FuelCellElectricGenerator {
this->FCPM.RegulaFalsiIter = SolverFlag;
}

void ManageElectStorInteractions(int const Num, // Generator number, index for structure
Real64 const Pdemand,
void FCDataStruct::ManageElectStorInteractions(Real64 const Pdemand,
Real64 const EP_UNUSED(PpcuLosses),
bool &Constrained,
Real64 &Pstorage,
Expand All @@ -1902,61 +1900,61 @@ namespace FuelCellElectricGenerator {

// step 1 figure out what is desired of electrical storage system

if (FuelCell(Num).FCPM.Pel < (Pdemand)) {
if (this->FCPM.Pel < (Pdemand)) {
// draw from storage
tmpPdraw = (Pdemand)-FuelCell(Num).FCPM.Pel;
tmpPdraw = (Pdemand)-this->FCPM.Pel;
drawing = true;
}

if (FuelCell(Num).FCPM.Pel > (Pdemand)) {
if (this->FCPM.Pel > (Pdemand)) {
// add to storage
tmpPcharge = FuelCell(Num).FCPM.Pel - (Pdemand);
tmpPcharge = this->FCPM.Pel - (Pdemand);
charging = true;
}

// step 2, figure out what is possible for electrical storage draws/charges

if (charging) {

if (FuelCell(Num).ElecStorage.StorageModelMode == DataGenerators::SimpleEffConstraints) {
if (this->ElecStorage.StorageModelMode == DataGenerators::SimpleEffConstraints) {

if (FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge >= FuelCell(Num).ElecStorage.NominalEnergyCapacity) {
if (this->ElecStorage.LastTimeStepStateOfCharge >= this->ElecStorage.NominalEnergyCapacity) {
// storage full! no more allowed!
PgridOverage = tmpPcharge;
tmpPcharge = 0.0;
Constrained = true;
}
if (tmpPcharge > FuelCell(Num).ElecStorage.MaxPowerStore) {
PgridOverage = tmpPcharge - FuelCell(Num).ElecStorage.MaxPowerStore;
tmpPcharge = FuelCell(Num).ElecStorage.MaxPowerStore;
if (tmpPcharge > this->ElecStorage.MaxPowerStore) {
PgridOverage = tmpPcharge - this->ElecStorage.MaxPowerStore;
tmpPcharge = this->ElecStorage.MaxPowerStore;
Constrained = true;
}

// now add energy to storage from charging
if ((FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge +
tmpPcharge * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour * FuelCell(Num).ElecStorage.EnergeticEfficCharge) <
FuelCell(Num).ElecStorage.NominalEnergyCapacity) {
if ((this->ElecStorage.LastTimeStepStateOfCharge +
tmpPcharge * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour * this->ElecStorage.EnergeticEfficCharge) <
this->ElecStorage.NominalEnergyCapacity) {

FuelCell(Num).ElecStorage.ThisTimeStepStateOfCharge =
FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge +
tmpPcharge * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour * FuelCell(Num).ElecStorage.EnergeticEfficCharge;
this->ElecStorage.ThisTimeStepStateOfCharge =
this->ElecStorage.LastTimeStepStateOfCharge +
tmpPcharge * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour * this->ElecStorage.EnergeticEfficCharge;
} else { // would over charge this time step

tmpPcharge = (FuelCell(Num).ElecStorage.NominalEnergyCapacity - FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge) /
(DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour * FuelCell(Num).ElecStorage.EnergeticEfficCharge);
tmpPcharge = (this->ElecStorage.NominalEnergyCapacity - this->ElecStorage.LastTimeStepStateOfCharge) /
(DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour * this->ElecStorage.EnergeticEfficCharge);
Constrained = true;
FuelCell(Num).ElecStorage.ThisTimeStepStateOfCharge =
FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge +
tmpPcharge * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour * FuelCell(Num).ElecStorage.EnergeticEfficCharge;
this->ElecStorage.ThisTimeStepStateOfCharge =
this->ElecStorage.LastTimeStepStateOfCharge +
tmpPcharge * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour * this->ElecStorage.EnergeticEfficCharge;
}

// losses go into QairIntake
FuelCell(Num).ElecStorage.QairIntake = tmpPcharge * (1.0 - FuelCell(Num).ElecStorage.EnergeticEfficCharge);
this->ElecStorage.QairIntake = tmpPcharge * (1.0 - this->ElecStorage.EnergeticEfficCharge);

} else if (FuelCell(Num).ElecStorage.StorageModelMode == DataGenerators::LeadAcidBatterManwellMcGowan) {
} else if (this->ElecStorage.StorageModelMode == DataGenerators::LeadAcidBatterManwellMcGowan) {
ShowWarningError("ManageElectStorInteractions: Not yet implemented: Lead Acid Battery By Manwell and McGowan 1993 ");

} else if (FuelCell(Num).ElecStorage.StorageModelMode == DataGenerators::LeadAcidBatterySaupe) {
} else if (this->ElecStorage.StorageModelMode == DataGenerators::LeadAcidBatterySaupe) {
ShowWarningError("ManageElectStorInteractions: Not yet implemented: Lead Acid Battery By Saupe 1993 ");

} else {
Expand All @@ -1969,41 +1967,41 @@ namespace FuelCellElectricGenerator {
} // charging

if (drawing) {
if (FuelCell(Num).ElecStorage.StorageModelMode == DataGenerators::SimpleEffConstraints) {
if (this->ElecStorage.StorageModelMode == DataGenerators::SimpleEffConstraints) {

if (FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge <= 0.0) {
if (this->ElecStorage.LastTimeStepStateOfCharge <= 0.0) {
// storage empty no more allowed!
tmpPdraw = 0.0;
Constrained = true;
drawing = false;
}
if (tmpPdraw > FuelCell(Num).ElecStorage.MaxPowerDraw) {
tmpPdraw = FuelCell(Num).ElecStorage.MaxPowerDraw;
if (tmpPdraw > this->ElecStorage.MaxPowerDraw) {
tmpPdraw = this->ElecStorage.MaxPowerDraw;
Constrained = true;
}

// now take energy from storage by drawing (amplified by energetic effic)
if ((FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge -
tmpPdraw * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour / FuelCell(Num).ElecStorage.EnergeticEfficDischarge) > 0.0) {
if ((this->ElecStorage.LastTimeStepStateOfCharge -
tmpPdraw * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour / this->ElecStorage.EnergeticEfficDischarge) > 0.0) {

FuelCell(Num).ElecStorage.ThisTimeStepStateOfCharge =
FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge -
tmpPdraw * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour / FuelCell(Num).ElecStorage.EnergeticEfficDischarge;
this->ElecStorage.ThisTimeStepStateOfCharge =
this->ElecStorage.LastTimeStepStateOfCharge -
tmpPdraw * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour / this->ElecStorage.EnergeticEfficDischarge;
} else { // would over drain storage this timestep so reduce tmpPdraw
tmpPdraw = FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge * FuelCell(Num).ElecStorage.EnergeticEfficDischarge /
tmpPdraw = this->ElecStorage.LastTimeStepStateOfCharge * this->ElecStorage.EnergeticEfficDischarge /
(DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour);
FuelCell(Num).ElecStorage.ThisTimeStepStateOfCharge =
FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge -
tmpPdraw * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour / FuelCell(Num).ElecStorage.EnergeticEfficDischarge;
this->ElecStorage.ThisTimeStepStateOfCharge =
this->ElecStorage.LastTimeStepStateOfCharge -
tmpPdraw * DataHVACGlobals::TimeStepSys * DataGlobals::SecInHour / this->ElecStorage.EnergeticEfficDischarge;

Constrained = true;
}
// losses go into QairIntake
FuelCell(Num).ElecStorage.QairIntake = tmpPdraw * (1.0 / FuelCell(Num).ElecStorage.EnergeticEfficDischarge - 1.0);
} else if (FuelCell(Num).ElecStorage.StorageModelMode == DataGenerators::LeadAcidBatterManwellMcGowan) {
this->ElecStorage.QairIntake = tmpPdraw * (1.0 / this->ElecStorage.EnergeticEfficDischarge - 1.0);
} else if (this->ElecStorage.StorageModelMode == DataGenerators::LeadAcidBatterManwellMcGowan) {
ShowWarningError("ManageElectStorInteractions: Not yet implemented: Lead Acid Battery By Manwell and McGowan 1993 ");

} else if (FuelCell(Num).ElecStorage.StorageModelMode == DataGenerators::LeadAcidBatterySaupe) {
} else if (this->ElecStorage.StorageModelMode == DataGenerators::LeadAcidBatterySaupe) {
ShowWarningError("ManageElectStorInteractions: Not yet implemented: Lead Acid Battery By Saupe 1993 ");

} else {
Expand All @@ -2017,21 +2015,21 @@ namespace FuelCellElectricGenerator {

if ((!charging) && (!drawing)) {

FuelCell(Num).ElecStorage.ThisTimeStepStateOfCharge = FuelCell(Num).ElecStorage.LastTimeStepStateOfCharge;
FuelCell(Num).ElecStorage.PelNeedFromStorage = 0.0;
FuelCell(Num).ElecStorage.PelFromStorage = 0.0;
FuelCell(Num).ElecStorage.QairIntake = 0.0;
this->ElecStorage.ThisTimeStepStateOfCharge = this->ElecStorage.LastTimeStepStateOfCharge;
this->ElecStorage.PelNeedFromStorage = 0.0;
this->ElecStorage.PelFromStorage = 0.0;
this->ElecStorage.QairIntake = 0.0;
}

if (Pstorage >= 0.0) {

FuelCell(Num).ElecStorage.PelIntoStorage = Pstorage;
FuelCell(Num).ElecStorage.PelFromStorage = 0.0;
this->ElecStorage.PelIntoStorage = Pstorage;
this->ElecStorage.PelFromStorage = 0.0;
}
if (Pstorage < 0.0) {

FuelCell(Num).ElecStorage.PelIntoStorage = 0.0;
FuelCell(Num).ElecStorage.PelFromStorage = -Pstorage;
this->ElecStorage.PelIntoStorage = 0.0;
this->ElecStorage.PelFromStorage = -Pstorage;
}
}

Expand Down Expand Up @@ -2610,7 +2608,7 @@ namespace FuelCellElectricGenerator {

// PURPOSE OF THIS SUBROUTINE:
// calculate Enthalpy from Shomate equations for gaseous water
// No ethalphy of formation in this one.
// No enthalpy of formation in this one.

// REFERENCES:
// NIST Webbook on gas phase thermochemistry
Expand Down Expand Up @@ -3298,8 +3296,8 @@ namespace FuelCellElectricGenerator {
}

// using and elapsed time method rather than FirstHVACIteration here
Real64 TimeElapsed = DataGlobals::HourOfDay + DataGlobals::TimeStep * DataGlobals::TimeStepZone + DataHVACGlobals::SysTimeElapsed;
if (this->TimeElapsed != TimeElapsed) {
Real64 timeElapsed = DataGlobals::HourOfDay + DataGlobals::TimeStep * DataGlobals::TimeStepZone + DataHVACGlobals::SysTimeElapsed;
if (this->TimeElapsed != timeElapsed) {

this->ElecStorage.LastTimeStepStateOfCharge = this->ElecStorage.ThisTimeStepStateOfCharge;
this->FCPM.PelLastTimeStep = this->FCPM.Pel;
Expand All @@ -3317,7 +3315,7 @@ namespace FuelCellElectricGenerator {

this->ExhaustHX.WaterMassFlowRate = mdot;
this->ExhaustHX.WaterInletTemp = DataLoopNode::Node(this->ExhaustHX.WaterInNode).Temp;
this->TimeElapsed = TimeElapsed;
this->TimeElapsed = timeElapsed;
} else {

PlantUtilities::SetComponentFlowRate(this->ExhaustHX.WaterMassFlowRate,
Expand Down
23 changes: 11 additions & 12 deletions src/EnergyPlus/FuelCellElectricGenerator.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,13 +578,13 @@ namespace FuelCellElectricGenerator {
Real64 &PelDiff // if constrained then this is the difference, positive
);

Real64 FuelCellProductGasEnthResidual(Real64 TprodGas, Array1<Real64> const &Par);
static Real64 FuelCellProductGasEnthResidual(Real64 TprodGas, Array1<Real64> const &Par);

void FigureGaseousWaterEnthalpy(Real64 FluidTemp, Real64 &HGasWater);
static void FigureGaseousWaterEnthalpy(Real64 FluidTemp, Real64 &HGasWater);

void FigureLiquidWaterEnthalpy(Real64 FluidTemp, Real64 &HLiqWater);
static void FigureLiquidWaterEnthalpy(Real64 FluidTemp, Real64 &HLiqWater);

void FigureLiquidWaterHeatCap(Real64 FluidTemp, Real64 &Cp);
static void FigureLiquidWaterHeatCap(Real64 FluidTemp, Real64 &Cp);

void CalcFuelCellAuxHeater();

Expand All @@ -594,6 +594,13 @@ namespace FuelCellElectricGenerator {

void CalcUpdateHeatRecovery(bool FirstHVACIteration);

void ManageElectStorInteractions(Real64 Pdemand,
Real64 PpcuLosses,
bool &Constrained, // TODO: This one is never used anywhere in the code
Real64 &Pstorage,
Real64 &PgridOverage // electricity that can't be stored and needs to go out
);

void UpdateFuelCellGeneratorRecords();
};

Expand All @@ -608,14 +615,6 @@ namespace FuelCellElectricGenerator {

void GetFuelCellGeneratorInput();

void ManageElectStorInteractions(int Num, // Generator number, index for structure
Real64 Pdemand,
Real64 PpcuLosses,
bool &Constrained, // TODO: This one is never used anywhere in the code
Real64 &Pstorage,
Real64 &PgridOverage // electricity that can't be stored and needs to go out
);

void SimFuelCellPlantHeatRecovery(std::string const &CompType,
std::string const &CompName,
int CompTypeNum,
Expand Down

7 comments on commit ce50b27

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

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

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

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 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-gcc-7.4: OK (2619 of 2619 tests passed, 0 test warnings)

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.

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1239 of 1239 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 (2579 of 2579 tests passed, 0 test warnings)

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-IntegrationCoverage-Debug: OK (674 of 674 tests passed, 0 test warnings)

Build Badge Test Badge Coverage 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 (2579 of 2579 tests passed, 2 test warnings)

Messages:\n

  • 2 tests had: BND diffs.

Build Badge Test Badge

Please sign in to comment.