Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/develop' into carroll-mrt
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjwitte
mjwitte committed Dec 6, 2019
2 parents 651f056 + d978a37 commit 2a1ac86
Show file tree
Hide file tree
Showing 130 changed files with 2,453 additions and 791 deletions.
16 changes: 8 additions & 8 deletions datasets/FossilFuelEnvironmentalImpactFactors.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
, !- Nuclear High Level Emission Factor Schedule Name
0; !- Nuclear Low Level Emission Factor {m3/MJ}

!NOTE: EnergyPlus does not yet include LPG as a fuel. Included here for future use.
!NOTE: EnergyPlus does not include LPG as a fuel type, use Propane as the resource name.
!
! USEPA Compilation of Air Pollutant Emission Factors, AP-42, Fifth Edition
! Volume I: Stationary Point and Area Sources
Expand All @@ -162,7 +162,7 @@
!

FuelFactors,
LPG, !- Existing Fuel Resource Name
Propane, !- Existing Fuel Resource Name
kg, !- Units of Measure
, !- Energy per Unit Factor
1, !- Source Energy Factor {J/J}
Expand Down Expand Up @@ -252,7 +252,7 @@
!

FuelFactors,
FuelOil#1, !- Existing Fuel Resource Name
FuelOilNo1, !- Existing Fuel Resource Name
kg, !- Units of Measure
, !- Energy per Unit Factor
1, !- Source Energy Factor {J/J}
Expand Down Expand Up @@ -297,7 +297,7 @@
!

FuelFactors,
FuelOil#2, !- Existing Fuel Resource Name
FuelOilNo2, !- Existing Fuel Resource Name
kg, !- Units of Measure
, !- Energy per Unit Factor
1, !- Source Energy Factor {J/J}
Expand Down Expand Up @@ -334,7 +334,7 @@
, !- Nuclear High Level Emission Factor Schedule Name
0; !- Nuclear Low Level Emission Factor {m3/MJ}

!NOTE: EnergyPlus does not yet include FuelOil#4 as a fuel. Included here for future use.
!NOTE: EnergyPlus does not include FuelOil#4 as a fuel, use OtherFuel1 as the resource name
!
! USEPA Compilation of Air Pollutant Emission Factors, AP-42, Fifth Edition
! Volume I: Stationary Point and Area Sources
Expand All @@ -344,7 +344,7 @@
!

FuelFactors,
FuelOil#4, !- Existing Fuel Resource Name
OtherFuel1, !- Existing Fuel Resource Name
kg, !- Units of Measure
, !- Energy per Unit Factor
1, !- Source Energy Factor {J/J}
Expand Down Expand Up @@ -381,7 +381,7 @@
, !- Nuclear High Level Emission Factor Schedule Name
0; !- Nuclear Low Level Emission Factor {m3/MJ}

!NOTE: EnergyPlus does not yet include FuelOil#6 as a fuel. Included here for future use.
!NOTE: EnergyPlus does not include FuelOil#6 as a fuel, use OtherFuel1 as the resource name
!
! USEPA Compilation of Air Pollutant Emission Factors, AP-42, Fifth Edition
! Volume I: Stationary Point and Area Sources
Expand All @@ -391,7 +391,7 @@
!

FuelFactors,
FuelOil#6, !- Existing Fuel Resource Name
OtherFuel1, !- Existing Fuel Resource Name
kg, !- Units of Measure
, !- Energy per Unit Factor
1, !- Source Energy Factor {J/J}
Expand Down
60 changes: 30 additions & 30 deletions datasets/LCCusePriceEscalationDataSet2012.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

LifeCycleCost:UsePriceEscalation,
NorthEast Residential-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.9631, !- Year 1 Escalation
Expand Down Expand Up @@ -137,7 +137,7 @@

LifeCycleCost:UsePriceEscalation,
NorthEast Residential-LPG, !- Name
PropaneGas, !- Resource
Propane, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8636, !- Year 1 Escalation
Expand Down Expand Up @@ -209,7 +209,7 @@

LifeCycleCost:UsePriceEscalation,
NorthEast Commercial-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.9011, !- Year 1 Escalation
Expand Down Expand Up @@ -245,7 +245,7 @@

LifeCycleCost:UsePriceEscalation,
NorthEast Commercial-Residual Oil, !- Name
FuelOil#2, !- Resource
FuelOilNo2, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8934, !- Year 1 Escalation
Expand Down Expand Up @@ -389,7 +389,7 @@

LifeCycleCost:UsePriceEscalation,
NorthEast Industrial-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8733, !- Year 1 Escalation
Expand Down Expand Up @@ -425,7 +425,7 @@

LifeCycleCost:UsePriceEscalation,
NorthEast Industrial-Residual Oil, !- Name
FuelOil#2, !- Resource
FuelOilNo2, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.9375, !- Year 1 Escalation
Expand Down Expand Up @@ -569,7 +569,7 @@

LifeCycleCost:UsePriceEscalation,
MidWest Residential-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.9167, !- Year 1 Escalation
Expand Down Expand Up @@ -641,7 +641,7 @@

LifeCycleCost:UsePriceEscalation,
MidWest Residential-LPG,!- Name
PropaneGas, !- Resource
Propane, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
1.0666, !- Year 1 Escalation
Expand Down Expand Up @@ -713,7 +713,7 @@

LifeCycleCost:UsePriceEscalation,
MidWest Commercial-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8496, !- Year 1 Escalation
Expand Down Expand Up @@ -749,7 +749,7 @@

LifeCycleCost:UsePriceEscalation,
MidWest Commercial-Residual Oil, !- Name
FuelOil#2, !- Resource
FuelOilNo2, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
1.2825, !- Year 1 Escalation
Expand Down Expand Up @@ -893,7 +893,7 @@

LifeCycleCost:UsePriceEscalation,
MidWest Industrial-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8451, !- Year 1 Escalation
Expand Down Expand Up @@ -929,7 +929,7 @@

LifeCycleCost:UsePriceEscalation,
MidWest Industrial-Residual Oil, !- Name
FuelOil#2, !- Resource
FuelOilNo2, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
1.3308, !- Year 1 Escalation
Expand Down Expand Up @@ -1073,7 +1073,7 @@

LifeCycleCost:UsePriceEscalation,
South Residential-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.9440, !- Year 1 Escalation
Expand Down Expand Up @@ -1145,7 +1145,7 @@

LifeCycleCost:UsePriceEscalation,
South Residential-LPG, !- Name
PropaneGas, !- Resource
Propane, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
1.0457, !- Year 1 Escalation
Expand Down Expand Up @@ -1217,7 +1217,7 @@

LifeCycleCost:UsePriceEscalation,
South Commercial-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8533, !- Year 1 Escalation
Expand Down Expand Up @@ -1253,7 +1253,7 @@

LifeCycleCost:UsePriceEscalation,
South Commercial-Residual Oil, !- Name
FuelOil#2, !- Resource
FuelOilNo2, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
1.0783, !- Year 1 Escalation
Expand Down Expand Up @@ -1397,7 +1397,7 @@

LifeCycleCost:UsePriceEscalation,
South Industrial-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8629, !- Year 1 Escalation
Expand Down Expand Up @@ -1433,7 +1433,7 @@

LifeCycleCost:UsePriceEscalation,
South Industrial-Residual Oil, !- Name
FuelOil#2, !- Resource
FuelOilNo2, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
1.0914, !- Year 1 Escalation
Expand Down Expand Up @@ -1577,7 +1577,7 @@

LifeCycleCost:UsePriceEscalation,
West Residential-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.9119, !- Year 1 Escalation
Expand Down Expand Up @@ -1649,7 +1649,7 @@

LifeCycleCost:UsePriceEscalation,
West Residential-LPG, !- Name
PropaneGas, !- Resource
Propane, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
1.0132, !- Year 1 Escalation
Expand Down Expand Up @@ -1721,7 +1721,7 @@

LifeCycleCost:UsePriceEscalation,
West Commercial-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8629, !- Year 1 Escalation
Expand Down Expand Up @@ -1757,7 +1757,7 @@

LifeCycleCost:UsePriceEscalation,
West Commercial-Residual Oil, !- Name
FuelOil#2, !- Resource
FuelOilNo2, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.9170, !- Year 1 Escalation
Expand Down Expand Up @@ -1901,7 +1901,7 @@

LifeCycleCost:UsePriceEscalation,
West Industrial-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8745, !- Year 1 Escalation
Expand Down Expand Up @@ -1937,7 +1937,7 @@

LifeCycleCost:UsePriceEscalation,
West Industrial-Residual Oil, !- Name
FuelOil#2, !- Resource
FuelOilNo2, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.9610, !- Year 1 Escalation
Expand Down Expand Up @@ -2081,7 +2081,7 @@

LifeCycleCost:UsePriceEscalation,
U.S. Avg Residential-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.9570, !- Year 1 Escalation
Expand Down Expand Up @@ -2153,7 +2153,7 @@

LifeCycleCost:UsePriceEscalation,
U.S. Avg Residential-LPG, !- Name
PropaneGas, !- Resource
Propane, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
1.0184, !- Year 1 Escalation
Expand Down Expand Up @@ -2225,7 +2225,7 @@

LifeCycleCost:UsePriceEscalation,
U.S. Avg Commercial-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8743, !- Year 1 Escalation
Expand Down Expand Up @@ -2261,7 +2261,7 @@

LifeCycleCost:UsePriceEscalation,
U.S. Avg Commercial-Residual Oil, !- Name
FuelOil#2, !- Resource
FuelOilNo2, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.9044, !- Year 1 Escalation
Expand Down Expand Up @@ -2405,7 +2405,7 @@

LifeCycleCost:UsePriceEscalation,
U.S. Avg Industrial-Distillate Oil, !- Name
FuelOil#1, !- Resource
FuelOilNo1, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
0.8607, !- Year 1 Escalation
Expand Down Expand Up @@ -2441,7 +2441,7 @@

LifeCycleCost:UsePriceEscalation,
U.S. Avg Industrial-Residual Oil, !- Name
FuelOil#2, !- Resource
FuelOilNo2, !- Resource
2012, !- Escalation Start Year
January, !- Escalation Start Month
1.0724, !- Year 1 Escalation
Expand Down
Loading

7 comments on commit 2a1ac86

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

carroll-mrt (mjwitte) - Win64-Windows-10-VisualStudio-16: OK (2594 of 2594 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.

carroll-mrt (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2634 of 2634 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.

carroll-mrt (mjwitte) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

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

carroll-mrt (mjwitte) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 tests passed, 0 test warnings)

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

carroll-mrt (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1250 of 1250 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.

carroll-mrt (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (676 of 676 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.

carroll-mrt (mjwitte) - x86_64-MacOS-10.13-clang: Tests Failed (2044 of 2594 tests passed, 120 test warnings)

Messages:\n

  • 670 tests had: EIO diffs.
  • 548 tests had: Table big diffs.
  • 93 tests had: MTD diffs.
  • 91 tests had: RDD diffs.
  • 94 tests had: BND diffs.
  • 88 tests had: MDD diffs.
  • 2 tests had: AUD diffs.
  • 5 tests had: ESO small diffs.
  • 6 tests had: MTR small diffs.
  • 5 tests had: ESO big diffs.
  • 1 test had: JSON big diffs.
  • 2 tests had: MTR big diffs.
  • 2 tests had: ERR diffs.
  • 1 test had: SSZ big diffs.

Failures:\n

regression Test Summary

  • Passed: 121
  • Failed: 550

Build Badge Test Badge

Please sign in to comment.