Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize fuel types, remove input synonyms and other input cleanup #7523

Merged
merged 58 commits into from
Dec 5, 2019
Merged

Standardize fuel types, remove input synonyms and other input cleanup #7523

Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
a60e169
Remove input synonyms - flow mode and fuel type
mjwitte Sep 23, 2019
e737ee4
Remove input synonyms - zone air heat balance and outside convection
mjwitte Sep 23, 2019
ab6d7d2
Remove input synonyms - wind turbine
mjwitte Sep 23, 2019
6c3e113
Remove input synonyms - globalgeometryrules
mjwitte Sep 23, 2019
474506b
Remove input synonyms - design days and output constructions
mjwitte Sep 23, 2019
dd13815
Remove input synonyms - clean up testfiles
mjwitte Sep 23, 2019
36ecec2
Remove input synonyms - more code cleanup
mjwitte Sep 23, 2019
9154056
Remove input synonyms - transition rules and code
mjwitte Sep 23, 2019
b666752
Remove input synonyms - add keys to IDD and remove special schema rules
mjwitte Sep 23, 2019
a0fb069
Merge remote-tracking branch 'remotes/origin/develop' into RemoveSyno…
mjwitte Sep 23, 2019
ae2613f
Remove input synonyms - cleanup performance_tests
mjwitte Sep 23, 2019
488afa4
Remove input synonyms - missed one on the steam boiler
mjwitte Sep 23, 2019
58747f1
Remove input synonyms - fix transition errors
mjwitte Sep 23, 2019
a41ef05
Remove input synonyms - fix unit tests
mjwitte Sep 23, 2019
5b18ca1
Remove input synonyms - use Propane if that's what's in IDD
mjwitte Sep 23, 2019
3b57d83
Remove input synonyms - more fix unit tests
mjwitte Sep 24, 2019
4151477
Remove input synonyms - more code cleanup
mjwitte Sep 24, 2019
f69173a
Remove input synonyms - more testfiles cleanup
mjwitte Sep 24, 2019
55fbb00
Remove input synonyms - don't remove anything from idd yet
mjwitte Sep 24, 2019
104b97a
Remove input synonyms - even more fix unit tests
mjwitte Sep 24, 2019
bc17053
Remove input synonyms - yet another testfile cleanup
mjwitte Sep 24, 2019
da4b77f
Merge remote-tracking branch 'remotes/origin/develop' into RemoveSyno…
mjwitte Sep 27, 2019
2ebf95e
Preliminary version change to 9-2-1/9-3-0'ish for testing
mjwitte Sep 27, 2019
65e1096
Remove input synonyms - move relevant changes to transition 9-3-0
mjwitte Sep 27, 2019
15811a3
Merge remote-tracking branch 'remotes/origin/develop' into RemoveSyno…
mjwitte Oct 1, 2019
2b5d946
Merge remote-tracking branch 'remotes/origin/RemoveSynonyms-6601PartA…
mjwitte Oct 1, 2019
31fc2b3
Standardize fuel types - design discussion doc
mjwitte Oct 1, 2019
214c7be
Merge remote-tracking branch 'remotes/origin/develop' into RemoveSyno…
mjwitte Oct 28, 2019
23a200d
Standardize fuel types - undo patch version change
mjwitte Oct 28, 2019
ea623a8
Standardize fuel types - IDD changes
mjwitte Oct 28, 2019
c007d18
Standardize fuel types - fuel type inputs only FuelOil1 FuelOil2 Propane
mjwitte Oct 28, 2019
cb73e71
Standardize fuel types - transition FuelOil1 FuelOil2 Propane
mjwitte Oct 28, 2019
2015125
Standardize fuel types - testfiles FuelOil1 FuelOil2 Propane inputs only
mjwitte Oct 28, 2019
795acfc
Standardize fuel types - unit tests FuelOil1 FuelOil2 Propane inputs …
mjwitte Oct 28, 2019
3cefb29
Standardize fuel types - datasets FuelOil1 FuelOil2 Propane inputs only
mjwitte Oct 28, 2019
2d3e954
Standardize fuel types - unit test cleanup
mjwitte Oct 29, 2019
79de2ae
Standardize fuel types - test failure cleanup
mjwitte Oct 29, 2019
e4272f1
Standardize fuel types - doc changes - inputs
mjwitte Oct 29, 2019
66285aa
Standardize fuel types - more transitions and other synonym cleanup
mjwitte Oct 29, 2019
d26cd6f
Standardize fuel types - more transition code
mjwitte Oct 31, 2019
58ded6a
Standardize fuel types - move from FuelOil1 to FuelOilNo1 and 2
mjwitte Oct 31, 2019
c150d7e
Standardize fuel types - move from FuelOil1 to FuelOilNo1 and 2 datasets
mjwitte Oct 31, 2019
576b71d
Add unit tests for LCC datasets 2017-2019
mjwitte Oct 31, 2019
b9009d2
Standardize fuel types - cleanup modify_schema.py
mjwitte Nov 1, 2019
dd5fff2
Standardize fuel types - fix transition version nums
mjwitte Nov 1, 2019
876a751
Standardize fuel types - move from FuelOil1 to FuelOilNo1 and 2 more
mjwitte Nov 1, 2019
5c56afd
Standardize fuel types - clean up a few lingering PropaneGas
mjwitte Nov 1, 2019
3589f70
Standardize fuel types - cleanup modify_schema.py more
mjwitte Nov 1, 2019
5a43b7e
Standardize fuel types - add resource type unit tests
mjwitte Nov 1, 2019
42b59e5
Standardize fuel types - cleanup lingering PropaneGas in docs
mjwitte Nov 1, 2019
67bef3f
Standardize fuel types - move from FuelOil1 to FuelOilNo1 and 2 testf…
mjwitte Nov 1, 2019
dbd76a5
Standardize fuel types - fix transition build warnings
mjwitte Nov 1, 2019
1e9a25a
Standardize fuel types - cleanup lingering testfile errors
mjwitte Nov 1, 2019
a060a8f
Merge remote-tracking branch 'remotes/origin/develop' into RemoveSyno…
mjwitte Dec 3, 2019
733392e
Merge remote-tracking branch 'remotes/origin/develop' into RemoveSyno…
mjwitte Dec 3, 2019
81a0855
Remove synonyms - revert ZoneTempPredictorCorrector exp underflow pro…
mjwitte Dec 3, 2019
67ea049
Remove synonyms - fix epJSON test file
mjwitte Dec 4, 2019
1f2a6ca
Remove synonyms - fuelfactors transition cleanup
mjwitte Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions datasets/FossilFuelEnvironmentalImpactFactors.idf
View file
Open in desktop
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
Open in desktop
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