Standardize fuel types, remove input synonyms and other input cleanup #7523
Conversation
…' into RemoveSynonyms-6601PartB
|
|
||
| ## Approach ## | ||
|
|
||
| Once the above decisions are made: |
There was a problem hiding this comment.
This seems straight-forward (except for all the effort needed). Propane, NaturalGas and FuelOilX.
mjwitte
added
the
IDDChange
| get_schema_object(schema, 'GlobalGeometryRules')['properties']['vertex_entry_direction'].pop('enum') | ||
| get_schema_object(schema, 'GlobalGeometryRules')['properties']['coordinate_system'].pop('enum') | ||
| get_schema_object(schema, 'WaterHeater:Mixed')['properties']['heater_fuel_type'].pop('enum') | ||
| get_schema_object(schema, 'Boiler:HotWater')['properties']['fuel_type'].pop('enum') |
There was a problem hiding this comment.
Remove schema modifications which added synonyms or removed the key choice list altogether. This will enforce only the \key choices listed in the IDD.
| @@ -11,3 +11,4 @@ install( FILES "V8-8-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater" ) | |||
| install( FILES "V8-9-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater" ) | |||
| install( FILES "V9-0-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater" ) | |||
| install( FILES "V9-1-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater" ) | |||
| install( FILES "V9-2-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater" ) | |||
There was a problem hiding this comment.
Add this to generate the v9-2-0 idd for transition.
| TEST_F(DataSetFixture, LCCusePriceEscalationDataSet2019) | ||
| { | ||
| ASSERT_TRUE(process_idf(delimited_string(read_lines_in_file(configured_source_directory() + "/datasets/LCCusePriceEscalationDataSet2019.idf")))); | ||
| } |
There was a problem hiding this comment.
These price escalation data sets were never added to the unit test list.
| using namespace EnergyPlus; | ||
| using namespace ObjexxFCL; | ||
|
|
||
| TEST_F(EnergyPlusFixture, DataGlobalConstants_AssignResourceTypeNum) |
There was a problem hiding this comment.
New unit test for resource types. This will change slightly in a few places when we harmonize the output resource types with the input types.
| CONTAINS | ||
|
|
||
| SUBROUTINE SetThisVersionVariables() | ||
| VerString='Conversion 9.2 => 9.3' |
There was a problem hiding this comment.
Add transition code for v9-2-0 to v9-3-0.
| @@ -208,11 +208,11 @@ namespace BoilerSteam { | |||
| { | |||
| auto const SELECT_CASE_var(DataIPShortCuts::cAlphaArgs(2)); | |||
|
|
|||
| if ((SELECT_CASE_var == "ELECTRICITY") || (SELECT_CASE_var == "ELECTRIC") || (SELECT_CASE_var == "ELEC")) { | |||
| if (SELECT_CASE_var == "ELECTRICITY") { | |||
There was a problem hiding this comment.
Remove input synonyms here and many other places. Don't move to standard function yet - save that for a later round of changes. And also keep some "old" output resource types.
| } else if (UtilityRoutines::SameString(AlphArray(iReport), "ABUPS")) { | ||
| displayTabularBEPS = true; | ||
| WriteTabularFiles = true; | ||
| nameFound = true; |
There was a problem hiding this comment.
Remove tabular summary report synonyms, here and below.
| @@ -2210,7 +2210,6 @@ namespace SurfaceGeometry { | |||
| using namespace DataIPShortCuts; | |||
|
|
|||
| // SUBROUTINE PARAMETER DEFINITIONS: | |||
| static Array1D_string const AbCorners(4, {"ULC", "LLC", "LRC", "URC"}); | |||
There was a problem hiding this comment.
Remove geometry synonyms.
|
This is ready for review. |
| OutArgs(1:CurArgs)=InArgs(1:CurArgs) | ||
| IF (CurArgs .GE. 1) THEN | ||
| CALL FixFuelTypes(OutArgs(1), NoDiff) | ||
| ! For fuelfactors, the current IDD choice is Propane, so override that here until #5941 is resolved (standardize fuel types) |
There was a problem hiding this comment.
This will be resolved after the remaining PRs on this issue go in?
There was a problem hiding this comment.
@mitchute Actually, these two lines are old. FixFuelTypes is already setting all propane variants to Propane. I'll delete them to avoid confusion.
|
This all looks pretty straightforward. I went ahead and ran the updated 9.2->9.3 transitions on the 45zonePVAV.idf and it looks good. Let me know when you're ready and I'll merge it in. |
|
@mitchute I've deleted those two lines from the transition code. This is ready to go. |
Pull request overview
NOTE: This is part 2 of 4. This PR includes changes from #7532. That one should be merged first before reviewing this one.
Electricity
NaturalGas
Propane (some objects were using PropaneGas)
Diesel
Gasoline
FuelOilNo1 (changed from FuelOil#1)
FuelOilNo2 (changed from FuelOil#2)
Coal
OtherFuel1
OtherFuel2
Test files are attached here: 6601b-v9.3SynonymsInput.zip
Pull Request Author
Add to this list or remove from it as applicable. This is a simple templated set of guidelines.
Reviewer
This will not be exhaustively relevant to every PR.