Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into vrfFluidCtrlFixCoo…
Browse files Browse the repository at this point in the history 
…lingCycling
  • Loading branch information
Yujie Xu authored and Yujie Xu committed Jan 31, 2024
2 parents 7bb2e4b + dae5a77 commit d23a27a
Show file tree
Hide file tree
Showing 246 changed files with 19,400 additions and 25,007 deletions.
8 changes: 5 additions & 3 deletions scripts/dev/check_for_malformed_enums.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def process_enum_str(input_str: str, file_name: str, line_no: int, print_errors:
# check for "unknown" in names
if "UNKNOWN" in keys_uc:
# exceptions listed by <FILE>:<ENUM NAME>
exceptions = ["OutputProcessor.hh:Unit"]
exceptions = ["DataGlobalConstants.hh:Units"]
if f"{file_name}:{name}" not in exceptions:
error_str += "\tUNKNOWN in enum names\n"

Expand All @@ -162,12 +162,14 @@ def process_enum_str(input_str: str, file_name: str, line_no: int, print_errors:

if any([str(x[0]).islower() for x in keys]):
# exceptions listed by <FILE>:<ENUM NAME>
exceptions = ["FileSystem.hh:FileTypes", "OutputProcessor.hh:Unit"]
exceptions = ["FileSystem.hh:FileTypes", "DataGlobalConstants.hh:Units"]
if f"{file_name}:{name}" not in exceptions:
error_str += "\tenum keys must begin with upper case letter\n"

if difflib.get_close_matches(name, keys, cutoff=0.7):
error_str += "\tenum keys are too similar to enum name\n"
exceptions = ["DataGlobalConstants.hh:HeatOrCool"]
if f"{file_name}:{name}" not in exceptions:
error_str += "\tenum keys are too similar to enum name\n"

# # check for non-allowed enum values
# if any([x != -1 for x in values if type(x) == int]):
Expand Down
302 changes: 147 additions & 155 deletions src/EnergyPlus/AirflowNetwork/src/Solver.cpp
View file

Large diffs are not rendered by default.

22 changes: 10 additions & 12 deletions src/EnergyPlus/BaseboardElectric.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,41 +346,39 @@ namespace BaseboardElectric {
auto &thisBaseboard = baseboard->baseboards(BaseboardNum);
SetupOutputVariable(state,
"Baseboard Total Heating Energy",
OutputProcessor::Unit::J,
Constant::Units::J,
thisBaseboard.Energy,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
thisBaseboard.EquipName,
Constant::eResource::EnergyTransfer,
OutputProcessor::SOVEndUseCat::Baseboard,
{},
eResourceSOV::EnergyTransfer,
EndUseCatSOV::Baseboard,
{},
GroupSOV::HVAC); // "System");
OutputProcessor::SOVGroup::HVAC); // "System");

SetupOutputVariable(state,
"Baseboard Total Heating Rate",
OutputProcessor::Unit::W,
Constant::Units::W,
thisBaseboard.Power,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
thisBaseboard.EquipName);

SetupOutputVariable(state,
"Baseboard Electricity Energy",
OutputProcessor::Unit::J,
Constant::Units::J,
thisBaseboard.ElecUseLoad,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
thisBaseboard.EquipName,
Constant::eResource::Electricity,
OutputProcessor::SOVEndUseCat::Heating,
{},
eResourceSOV::Electricity,
EndUseCatSOV::Heating,
{},
GroupSOV::HVAC); // "System");
OutputProcessor::SOVGroup::HVAC); // "System");

SetupOutputVariable(state,
"Baseboard Electricity Rate",
OutputProcessor::Unit::W,
Constant::Units::W,
thisBaseboard.ElecUseRate,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
Expand Down
32 changes: 15 additions & 17 deletions src/EnergyPlus/BaseboardRadiator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,81 +432,79 @@ namespace BaseboardRadiator {
auto &thisBaseboard = state.dataBaseboardRadiator->baseboards(BaseboardNum);
SetupOutputVariable(state,
"Baseboard Total Heating Energy",
OutputProcessor::Unit::J,
Constant::Units::J,
thisBaseboard.Energy,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
thisBaseboard.EquipID,
Constant::eResource::EnergyTransfer,
OutputProcessor::SOVEndUseCat::Baseboard,
{},
eResourceSOV::EnergyTransfer,
EndUseCatSOV::Baseboard,
{},
GroupSOV::HVAC); // "System");
OutputProcessor::SOVGroup::HVAC); // "System");

SetupOutputVariable(state,
"Baseboard Hot Water Energy",
OutputProcessor::Unit::J,
Constant::Units::J,
thisBaseboard.Energy,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
thisBaseboard.EquipID,
Constant::eResource::PlantLoopHeatingDemand,
OutputProcessor::SOVEndUseCat::Baseboard,
{},
eResourceSOV::PlantLoopHeatingDemand,
EndUseCatSOV::Baseboard,
{},
GroupSOV::HVAC); // "System");
OutputProcessor::SOVGroup::HVAC); // "System");

SetupOutputVariable(state,
"Baseboard Total Heating Rate",
OutputProcessor::Unit::W,
Constant::Units::W,
thisBaseboard.Power,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Hot Water Mass Flow Rate",
OutputProcessor::Unit::kg_s,
Constant::Units::kg_s,
thisBaseboard.WaterMassFlowRate,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Air Mass Flow Rate",
OutputProcessor::Unit::kg_s,
Constant::Units::kg_s,
thisBaseboard.AirMassFlowRate,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Air Inlet Temperature",
OutputProcessor::Unit::C,
Constant::Units::C,
thisBaseboard.AirInletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Air Outlet Temperature",
OutputProcessor::Unit::C,
Constant::Units::C,
thisBaseboard.AirOutletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Water Inlet Temperature",
OutputProcessor::Unit::C,
Constant::Units::C,
thisBaseboard.WaterInletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Water Outlet Temperature",
OutputProcessor::Unit::C,
Constant::Units::C,
thisBaseboard.WaterOutletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
Expand Down
31 changes: 15 additions & 16 deletions src/EnergyPlus/BoilerSteam.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,66 +410,65 @@ namespace BoilerSteam {
std::string_view sFuelType = Constant::eFuelNames[static_cast<int>(this->FuelType)];
SetupOutputVariable(state,
"Boiler Heating Rate",
OutputProcessor::Unit::W,
Constant::Units::W,
this->BoilerLoad,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
this->Name);

SetupOutputVariable(state,
"Boiler Heating Energy",
OutputProcessor::Unit::J,
Constant::Units::J,
this->BoilerEnergy,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
this->Name,
Constant::eResource::EnergyTransfer,
OutputProcessor::SOVEndUseCat::Boilers,
{},
"ENERGYTRANSFER",
"BOILERS",
{},
"Plant");
OutputProcessor::SOVGroup::Plant);
SetupOutputVariable(state,
format("Boiler {} Rate", sFuelType),
OutputProcessor::Unit::W,
Constant::Units::W,
this->FuelUsed,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
this->Name);
SetupOutputVariable(state,
format("Boiler {} Energy", sFuelType),
OutputProcessor::Unit::J,
Constant::Units::J,
this->FuelConsumed,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
this->Name,
{},
sFuelType,
"Heating",
Constant::eFuel2eResource[(int)this->FuelType],
OutputProcessor::SOVEndUseCat::Heating,
this->EndUseSubcategory,
"Plant");
OutputProcessor::SOVGroup::Plant);
SetupOutputVariable(state,
"Boiler Steam Efficiency",
OutputProcessor::Unit::None,
Constant::Units::None,
this->BoilerEff,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
this->Name);
SetupOutputVariable(state,
"Boiler Steam Inlet Temperature",
OutputProcessor::Unit::C,
Constant::Units::C,
this->BoilerInletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
this->Name);
SetupOutputVariable(state,
"Boiler Steam Outlet Temperature",
OutputProcessor::Unit::C,
Constant::Units::C,
this->BoilerOutletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
this->Name);
SetupOutputVariable(state,
"Boiler Steam Mass Flow Rate",
OutputProcessor::Unit::kg_s,
Constant::Units::kg_s,
this->BoilerMassFlowRate,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
Expand Down
Loading

5 comments on commit d23a27a

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

vrfFluidCtrlFixCoolingCycling (Unknown) - Win64-Windows-10-VisualStudio-16: OK (2758 of 2758 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.

vrfFluidCtrlFixCoolingCycling (Unknown) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3582 of 3586 tests passed, 0 test warnings)

Messages:\n

  • 4 tests had: EIO diffs.
  • 3 tests had: ERR diffs.
  • 4 tests had: ESO big diffs.
  • 4 tests had: Table big diffs.
  • 2 tests had: MTR big diffs.

Failures:\n

regression Test Summary

  • Passed: 802
  • Failed: 4

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

vrfFluidCtrlFixCoolingCycling (Unknown) - x86_64-MacOS-10.18-clang-15.0.0: OK (3540 of 3545 tests passed, 0 test warnings)

Messages:\n

  • 4 tests had: EIO diffs.
  • 3 tests had: ERR diffs.
  • 4 tests had: ESO big diffs.
  • 4 tests had: Table big diffs.
  • 2 tests had: MTR big diffs.

Failures:\n

regression Test Summary

  • Passed: 782
  • Failed: 4

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.

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

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

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

Build Badge Test Badge Coverage Badge

Please sign in to comment.