Skip to content

Commit

Permalink
fix Gas and Electric in /datasets and /performance_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
dareumnam committed Sep 25, 2020
1 parent b1c7a5b commit 94d6f2f
Show file tree
Hide file tree
Showing 19 changed files with 220 additions and 220 deletions.
74 changes: 37 additions & 37 deletions datasets/Macro/UtilityTariffObjects.imf
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@

UtilityCost:Tariff,
CT_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -1058,7 +1058,7 @@

UtilityCost:Tariff,
ME_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -2166,7 +2166,7 @@

UtilityCost:Tariff,
MA_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -2415,7 +2415,7 @@

UtilityCost:Tariff,
NY_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -2686,7 +2686,7 @@

UtilityCost:Tariff,
PA_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -3028,7 +3028,7 @@

UtilityCost:Tariff,
NY_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -3541,7 +3541,7 @@

UtilityCost:Tariff,
NJ_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -3911,7 +3911,7 @@

UtilityCost:Tariff,
IN_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -4203,7 +4203,7 @@

UtilityCost:Tariff,
OH_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -4800,7 +4800,7 @@

UtilityCost:Tariff,
WI_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -5042,7 +5042,7 @@

UtilityCost:Tariff,
MI_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -5343,7 +5343,7 @@

UtilityCost:Tariff,
MO_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -5720,7 +5720,7 @@

UtilityCost:Tariff,
NE_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -6043,7 +6043,7 @@

UtilityCost:Tariff,
IA_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -6312,7 +6312,7 @@

UtilityCost:Tariff,
MN_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -6734,7 +6734,7 @@

UtilityCost:Tariff,
FL_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -6926,7 +6926,7 @@

UtilityCost:Tariff,
NC_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -7378,7 +7378,7 @@

UtilityCost:Tariff,
VA_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -7901,7 +7901,7 @@

UtilityCost:Tariff,
DE_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -8209,7 +8209,7 @@

UtilityCost:Tariff,
WV_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -8543,7 +8543,7 @@

UtilityCost:Tariff,
TN_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -8882,7 +8882,7 @@

UtilityCost:Tariff,
AL_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -9212,7 +9212,7 @@

UtilityCost:Tariff,
AR_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -9488,7 +9488,7 @@

UtilityCost:Tariff,
MS_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -10104,7 +10104,7 @@

UtilityCost:Tariff,
LA_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -10434,7 +10434,7 @@

UtilityCost:Tariff,
TX_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -10718,7 +10718,7 @@

UtilityCost:Tariff,
AZ_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -10987,7 +10987,7 @@

UtilityCost:Tariff,
CO_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -11539,7 +11539,7 @@

UtilityCost:Tariff,
NV_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -12010,7 +12010,7 @@

UtilityCost:Tariff,
ID_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -12894,7 +12894,7 @@

UtilityCost:Tariff,
OR_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -13200,7 +13200,7 @@

UtilityCost:Tariff,
MT_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -13653,7 +13653,7 @@

UtilityCost:Tariff,
CA_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -14079,7 +14079,7 @@

UtilityCost:Tariff,
CA_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -14408,7 +14408,7 @@

UtilityCost:Tariff,
HI_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -14643,7 +14643,7 @@

UtilityCost:Tariff,
AK_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down Expand Up @@ -15006,7 +15006,7 @@

UtilityCost:Tariff,
WA_EIAMonthlyRateGas, !- Name
Gas:Facility, !- Output Meter Name
NaturalGas:Facility, !- Output Meter Name
MCF, !- Conversion Factor Choice
, !- Energy Conversion Factor
, !- Demand Conversion Factor
Expand Down
4 changes: 2 additions & 2 deletions datasets/PerfCurves.idf
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
HXDesPerf1, !- Name
1.32, !- Nominal Air Flow Rate {m3/s}
2.54, !- Nominal Air Face Velocity {m/s}
50.0, !- Nominal Electric Power {W}
50.0, !- Nominal Electricity Rate {W}
-7.18302E+00, !- Temperature Equation Coefficient 1
-1.84967E+02, !- Temperature Equation Coefficient 2
1.00051E+00, !- Temperature Equation Coefficient 3
Expand Down Expand Up @@ -274,7 +274,7 @@
HXDesPerf2, !- Name
1.32, !- Nominal Air Flow Rate {m3/s}
4.064, !- Nominal Air Face Velocity {m/s}
50.0, !- Nominal Electric Power {W}
50.0, !- Nominal Electricity Rate {W}
-2.53636E+00, !- Temperature Equation Coefficient 1
2.13247E+01, !- Temperature Equation Coefficient 2
9.23308E-01, !- Temperature Equation Coefficient 3
Expand Down
Loading

0 comments on commit 94d6f2f

Please sign in to comment.