Skip to content

Commit

Permalink
Merge branch 'develop' into 10121-Wrong-input-in-the-error-message
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Jul 26, 2023
2 parents d91f061 + a8b7444 commit bd2e221
Show file tree
Hide file tree
Showing 32 changed files with 4,164 additions and 4,156 deletions.
48 changes: 24 additions & 24 deletions datasets/ResidentialACsAndHPsPerfCurves.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@
! , !- Speed 1 Rated COP {W/W}
! , !- Speed 1 Rated Air Flow Rate {m3/s}
! , !- Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}
! ACHighStageCoolingCAPFTemp, !- Speed 1 Total Cooling Capacity Function of Temperature Curve Name
! ACHighStageCoolingCAPFFF, !- Speed 1 Total Cooling Capacity Function of Flow Fraction Curve Name
! ACHighStageCoolingEIRFTemp, !- Speed 1 Energy Input Ratio Function of Temperature Curve Name
! ACHighStageCoolingEIRFFF, !- Speed 1 Energy Input Ratio Function of Flow Fraction Curve Name
! ACLowStageCoolingCAPFTemp, !- Speed 1 Total Cooling Capacity Function of Temperature Curve Name
! ACLowStageCoolingCAPFFF, !- Speed 1 Total Cooling Capacity Function of Flow Fraction Curve Name
! ACLowStageCoolingEIRFTemp, !- Speed 1 Energy Input Ratio Function of Temperature Curve Name
! ACLowStageCoolingEIRFFF, !- Speed 1 Energy Input Ratio Function of Flow Fraction Curve Name
! AC2StageCoolingPLFFPLR, !- Speed 1 Part Load Fraction Correlation Curve Name
! , !- Speed 1 Nominal Time for Condensate Removal to Begin {s}
! , !- Speed 1 Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless}
Expand All @@ -173,10 +173,10 @@
! , !- Speed 2 Rated COP {W/W}
! , !- Speed 2 Rated Air Flow Rate {m3/s}
! , !- Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}
! ACLowStageCoolingCAPFTemp, !- Speed 2 Total Cooling Capacity Function of Temperature Curve Name
! ACLowStageCoolingCAPFFF, !- Speed 2 Total Cooling Capacity Function of Flow Fraction Curve Name
! ACLowStageCoolingEIRFTemp, !- Speed 2 Energy Input Ratio Function of Temperature Curve Name
! ACLowStageCoolingEIRFFF, !- Speed 2 Energy Input Ratio Function of Flow Fraction Curve Name
! ACHighStageCoolingCAPFTemp, !- Speed 2 Total Cooling Capacity Function of Temperature Curve Name
! ACHighStageCoolingCAPFFF, !- Speed 2 Total Cooling Capacity Function of Flow Fraction Curve Name
! ACHighStageCoolingEIRFTemp, !- Speed 2 Energy Input Ratio Function of Temperature Curve Name
! ACHighStageCoolingEIRFFF, !- Speed 2 Energy Input Ratio Function of Flow Fraction Curve Name
! AC2StageCoolingPLFFPLR, !- Speed 2 Part Load Fraction Correlation Curve Name
! , !- Speed 2 Nominal Time for Condensate Removal to Begin {s}
! , !- Speed 2 Ratio of Initial Moisture Evaporation Rate and steady state Latent Capacity {dimensionless}
Expand Down Expand Up @@ -570,10 +570,10 @@
! , !- Speed 1 Rated COP {W/W}
! , !- Speed 1 Rated Air Flow Rate {m3/s}
! , !- Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}
! HPHighStageCoolingCAPFTemp, !- Speed 1 Total Cooling Capacity Function of Temperature Curve Name
! HPHighStageCoolingCAPFFF, !- Speed 1 Total Cooling Capacity Function of Flow Fraction Curve Name
! HPHighStageCoolingEIRFTemp, !- Speed 1 Energy Input Ratio Function of Temperature Curve Name
! HPHighStageCoolingEIRFFF, !- Speed 1 Energy Input Ratio Function of Flow Fraction Curve Name
! HPLowStageCoolingCAPFTemp, !- Speed 1 Total Cooling Capacity Function of Temperature Curve Name
! HPLowStageCoolingCAPFFF, !- Speed 1 Total Cooling Capacity Function of Flow Fraction Curve Name
! HPLowStageCoolingEIRFTemp, !- Speed 1 Energy Input Ratio Function of Temperature Curve Name
! HPLowStageCoolingEIRFFF, !- Speed 1 Energy Input Ratio Function of Flow Fraction Curve Name
! HP2StageCoolingPLFFPLR, !- Speed 1 Part Load Fraction Correlation Curve Name
! , !- Speed 1 Nominal Time for Condensate Removal to Begin {s}
! , !- Speed 1 Ratio of Initial Moisture Evaporation Rate and Steady State Latent Capacity {dimensionless}
Expand All @@ -589,10 +589,10 @@
! , !- Speed 2 Rated COP {W/W}
! , !- Speed 2 Rated Air Flow Rate {m3/s}
! , !- Rated Evaporator Fan Power Per Volume Flow Rate {W/(m3/s)}
! HPLowStageCoolingCAPFTemp, !- Speed 2 Total Cooling Capacity Function of Temperature Curve Name
! HPLowStageCoolingCAPFFF, !- Speed 2 Total Cooling Capacity Function of Flow Fraction Curve Name
! HPLowStageCoolingEIRFTemp, !- Speed 2 Energy Input Ratio Function of Temperature Curve Name
! HPLowStageCoolingEIRFFF, !- Speed 2 Energy Input Ratio Function of Flow Fraction Curve Name
! HPHighStageCoolingCAPFTemp, !- Speed 2 Total Cooling Capacity Function of Temperature Curve Name
! HPHighStageCoolingCAPFFF, !- Speed 2 Total Cooling Capacity Function of Flow Fraction Curve Name
! HPHighStageCoolingEIRFTemp, !- Speed 2 Energy Input Ratio Function of Temperature Curve Name
! HPHighStageCoolingEIRFFF, !- Speed 2 Energy Input Ratio Function of Flow Fraction Curve Name
! HP2StageCoolingPLFFPLR, !- Speed 2 Part Load Fraction Correlation Curve Name
! , !- Speed 2 Nominal Time for Condensate Removal to Begin {s}
! , !- Speed 2 Ratio of Initial Moisture Evaporation Rate and steady state Latent Capacity {dimensionless}
Expand Down Expand Up @@ -762,21 +762,21 @@
! , !- Speed 1 Rated COP {W/W}
! , !- Speed 1 Rated Air Flow Rate {m3/s}
! , !- Speed 1 Rated Supply Air Fan Power Per Volume Flow Rate {W/(m3/s)}
! HPHighStageHeatingCAPFTemp, !- Speed 1 Total Heating Capacity Function of Temperature Curve Name
! HPHighStageHeatingCAPFFF, !- Speed 1 Total Heating Capacity Function of Flow Fraction Curve Name
! HPHighStageHeatingEIRFTemp, !- Speed 1 Energy Input Ratio Function of Temperature Curve Name
! HPHighStageHeatingEIRFFF, !- Speed 1 Energy Input Ratio Function of Flow Fraction Curve Name
! HPLowStageHeatingCAPFTemp, !- Speed 1 Total Heating Capacity Function of Temperature Curve Name
! HPLowStageHeatingCAPFFF, !- Speed 1 Total Heating Capacity Function of Flow Fraction Curve Name
! HPLowStageHeatingEIRFTemp, !- Speed 1 Energy Input Ratio Function of Temperature Curve Name
! HPLowStageHeatingEIRFFF, !- Speed 1 Energy Input Ratio Function of Flow Fraction Curve Name
! HP2StageHeatingPLFFPLR, !- Speed 1 Part Load Fraction Correlation Curve Name
! , !- Speed 1 Rated Waste Heat Fraction of Power Input {dimensionless}
! , !- Speed 1 Waste Heat Function of Temperature Curve Name
! , !- Speed 2 Rated Total Heating Capacity {W}
! , !- Speed 2 Rated COP {W/W}
! , !- Speed 2 Rated Air Flow Rate {m3/s}
! , !- Speed 2 Rated Supply Air Fan Power Per Volume Flow Rate {W/(m3/s)}
! HPLowStageHeatingCAPFTemp, !- Speed 2 Total Heating Capacity Function of Temperature Curve Name
! HPLowStageHeatingCAPFFF, !- Speed 2 Total Heating Capacity Function of Flow Fraction Curve Name
! HPLowStageHeatingEIRFTemp, !- Speed 2 Energy Input Ratio Function of Temperature Curve Name
! HPLowStageHeatingEIRFFF, !- Speed 2 Energy Input Ratio Function of Flow Fraction Curve Name
! HPHighStageHeatingCAPFTemp, !- Speed 2 Total Heating Capacity Function of Temperature Curve Name
! HPHighStageHeatingCAPFFF, !- Speed 2 Total Heating Capacity Function of Flow Fraction Curve Name
! HPHighStageHeatingEIRFTemp, !- Speed 2 Energy Input Ratio Function of Temperature Curve Name
! HPHighStageHeatingEIRFFF, !- Speed 2 Energy Input Ratio Function of Flow Fraction Curve Name
! HP2StageHeatingPLFFPLR, !- Speed 2 Part Load Fraction Correlation Curve Name
! , !- Speed 2 Rated Waste Heat Fraction of Power Input {dimensionless}
! ; !- Speed 2 Waste Heat Function of Temperature Curve Name
Expand Down
2 changes: 1 addition & 1 deletion scripts/dev/check_for_enum_scope_usage.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def run(self):
apparent_enums_in_zero_source_files.append(e.describe())
unique_files_in_usages: Set[str] = set()
# exceptions listed by <FILE>:<ENUM NAME>
exceptions = ["DataGlobalConstants.hh:eFuel", "DataGlobalConstants.hh:ePollutant"]
exceptions = ["DataGlobalConstants.hh:ePollutant"]
if f"{e.file_path.name}:{e.enum_name}" not in exceptions:
for u in e.usages:
unique_files_in_usages.add(u.file_path.name)
Expand Down
3 changes: 1 addition & 2 deletions scripts/dev/check_non_utf8.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@
import io # For Python 2 compat
import sys

# note I am skipping docs for right now; I want to do those files
DIRS_TO_SKIP = [
'.git', 'build', 'builds', 'cmake-build-debug',
'cmake-build-release', 'design', 'doc', 'release', 'third_party'
'cmake-build-release', 'design', 'release',
]

# these CC files purposefully have bad characters
Expand Down
26 changes: 13 additions & 13 deletions src/EnergyPlus/OutputReportTabular.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2872,7 +2872,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
// + gatherTotalsBEPS(5)*sourceFactorSteam & !steam
// ) / largeConversionFactor

GetFuelFactorInfo(state, "NaturalGas", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::NaturalGas, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->sourceFactorNaturalGas = curSourceFactor;
ort->fuelfactorsused(2) = true;
Expand All @@ -2885,7 +2885,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(2) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "FuelOilNo2", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::FuelOilNo2, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->sourceFactorFuelOil2 = curSourceFactor;
ort->fuelfactorsused(7) = true;
Expand All @@ -2898,7 +2898,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(11) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "FuelOilNo1", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::FuelOilNo1, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->sourceFactorFuelOil1 = curSourceFactor;
ort->fuelfactorsused(6) = true;
Expand All @@ -2911,7 +2911,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(10) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "Coal", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::Coal, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->sourceFactorCoal = curSourceFactor;
ort->fuelfactorsused(5) = true;
Expand All @@ -2924,7 +2924,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(9) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "Electricity", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::Electricity, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->sourceFactorElectric = curSourceFactor;
ort->fuelfactorsused(1) = true;
Expand All @@ -2937,7 +2937,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(1) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "Gasoline", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::Gasoline, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->sourceFactorGasoline = curSourceFactor;
ort->fuelfactorsused(3) = true;
Expand All @@ -2950,7 +2950,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(6) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "Propane", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::Propane, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->sourceFactorPropane = curSourceFactor;
ort->fuelfactorsused(8) = true;
Expand All @@ -2963,7 +2963,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(12) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "Diesel", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::Diesel, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->sourceFactorDiesel = curSourceFactor;
ort->fuelfactorsused(4) = true;
Expand All @@ -2976,7 +2976,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(8) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "DistrictCooling", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::DistrictCooling, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->ffUsed(3) = true;
}
Expand All @@ -2986,7 +2986,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(3) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "DistrictHeating", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::DistrictHeating, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->ffUsed(4) = true;
}
Expand All @@ -2996,7 +2996,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(4) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "Steam", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::Steam, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->ffUsed(5) = true;
}
Expand All @@ -3006,7 +3006,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(5) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "OtherFuel1", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::OtherFuel1, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->sourceFactorOtherFuel1 = curSourceFactor;
ort->fuelfactorsused(11) = true; // should be source number
Expand All @@ -3019,7 +3019,7 @@ void GetInputFuelAndPollutionFactors(EnergyPlusData &state)
ort->ffSchedIndex(13) = ffScheduleIndex;
}

GetFuelFactorInfo(state, "OtherFuel2", fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
GetFuelFactorInfo(state, Constant::eFuel::OtherFuel2, fuelFactorUsed, curSourceFactor, fFScheduleUsed, ffScheduleIndex);
if (fuelFactorUsed) {
ort->sourceFactorOtherFuel2 = curSourceFactor;
ort->fuelfactorsused(12) = true; // should be source number
Expand Down
Loading

5 comments on commit bd2e221

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

10121-Wrong-input-in-the-error-message (lgu1234) - Win64-Windows-10-VisualStudio-16: OK (2669 of 2669 tests passed, 0 test warnings)

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.

10121-Wrong-input-in-the-error-message (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.3: OK (3483 of 3483 tests passed, 0 test warnings)

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.

10121-Wrong-input-in-the-error-message (lgu1234) - x86_64-MacOS-10.17-clang-13.0.0: OK (3442 of 3442 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.

10121-Wrong-input-in-the-error-message (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.3-UnitTestsCoverage-Debug: OK (1896 of 1896 tests passed, 0 test warnings)

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

10121-Wrong-input-in-the-error-message (lgu1234) - x86_64-Linux-Ubuntu-22.04-gcc-11.3-IntegrationCoverage-Debug: OK (776 of 776 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.