-
Notifications
You must be signed in to change notification settings - Fork 461
Fix a few EIO headers and newlines #11126
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -404,7 +404,7 @@ namespace Dayltg { | |
| state.dataDaylightingDevices->ShelfReported = true; | ||
| } | ||
| print(state.files.eio, | ||
| "{},{:.2R},{},{:.2R},{:.2R}\n", | ||
| "Shelf Details,{},{:.2R},{},{:.2R},{:.2R}\n", | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. DaylightingDeviceShelf/eplusout.eio ! <Shelf Details>,Name,View Factor to Outside Shelf,Window Name,Window View Factor to Sky,Window View Factor to Ground
-SHELF,0.29,DAYLIT UPPER WINDOW,0.50,0.21
+Shelf Details,SHELF,0.29,DAYLIT UPPER WINDOW,0.50,0.21 |
||
| state.dataDaylightingDevicesData->Shelf(ShelfNum).Name, | ||
| state.dataDaylightingDevicesData->Shelf(ShelfNum).ViewFactor, | ||
| state.dataSurface->Surface(WinSurf).Name, | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4043,7 +4043,7 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err | |
| static constexpr std::string_view Format_724("! <{} Airflow Stats Nominal>, {}\n"); | ||
| print(state.files.eio, | ||
| Format_724, | ||
| "RefrigerationDoorMixing ", | ||
| "RefrigerationDoorMixing", | ||
|
Comment on lines
4043
to
+4046
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Avoids double space in header RefrigeratedWarehouse/eplusout.eio. -! <RefrigerationDoorMixing Airflow Stats Nominal>, Name, Zone 1 Name,Zone 2 Name,Door Opening Schedule Name,Door Height {m},Door Area {m2},Door Protection Type
+! <RefrigerationDoorMixing Airflow Stats Nominal>, Name, Zone 1 Name,Zone 2 Name,Door Opening Schedule Name,Door Height {m},Door Area {m2},Door Protection Type
RefrigerationDoorMixing Airflow Stats Nominal, FREEZER1_SUBFREEZER1,FREEZER_1,SUBFREEZER,FREEZER1DOORSCHEDA,1.800,2.300,StripCurtain |
||
| "Name, Zone 1 Name,Zone 2 Name,Door Opening Schedule Name,Door Height {m},Door Area {m2},Door Protection Type"); | ||
| for (ZoneNumA = 1; ZoneNumA <= (state.dataGlobal->NumOfZones - 1); ++ZoneNumA) { | ||
| if (!state.dataHeatBal->RefDoorMixing(ZoneNumA).RefDoorMixFlag) { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -380,7 +380,7 @@ namespace PlantPipingSystemsManager { | |
|
|
||
| // Write eio data | ||
| for (auto &thisDomain : state.dataPlantPipingSysMgr->domains) { | ||
| static constexpr std::string_view DomainCellsToEIO("{},{:5},{:5},{:5}\n"); | ||
| static constexpr std::string_view DomainCellsToEIO("Domain Name,{},{:5},{:5},{:5}\n"); | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 5ZoneAirCooledWithCoupledInGradeSlab/eplusout.eio ! <Domain Name>, Total Number of Domain Cells, Total Number of Ground Surface Cells, Total Number of Insulation Cells
-INGRADECOUPLEDSLAB, 3380, 120, 182
+Domain Name,INGRADECOUPLEDSLAB, 3380, 120, 182 |
||
| print(state.files.eio, | ||
| DomainCellsToEIO, | ||
| thisDomain.Name, | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14167,7 +14167,7 @@ void ReportRefrigerationComponents(EnergyPlusData &state) | |
| "! <Refrigeration Air Chiller>,Refrigeration Chiller Number, Refrigeration Chiller Name,Zone Name,Zone " | ||
| "Node #,Zone Node Name,Sensible Capacity (W/C),Sensible Capacity (W),Evaporating Temperature (C),DT1 (C),Fan " | ||
| "Power (W),Heater (W),Defrost (W), Air Flow Rate (m3/s)"); | ||
| static constexpr std::string_view Format_152("! <Air Chiller Load>, Air Chiller Name, Air Chiller Number, Zone Name,"); | ||
| static constexpr std::string_view Format_152("! <Air Chiller Load>, Air Chiller Name, Air Chiller Number, Zone Name"); | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Most parsers (eg pandas) would assume there's an extra unnamed column at the end due to the extra comma. |
||
| static constexpr std::string_view Format_160( | ||
| "! <Refrigeration GasCooler:Air-Cooled>,Gas Cooler Number, Gas Cooler Name, Rated Outlet Pressure " | ||
| "(Pa),Rated Outlet Temperature (C), Rated Approach Temperature (C), Rated Capacity (W), Rated Fan Power (W)"); | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1838,7 +1838,7 @@ namespace SimulationManager { | |
| "Threads, Number of Threads Used (Interior Radiant Exchange), Number Nominal Surfaces, Number " | ||
| "Parallel Sims"); | ||
| print(state.files.eio, "{}\n", ThreadingHeader); | ||
| static constexpr std::string_view ThreadReport("Program Control:Threads/Parallel Sims, {},{}, {}, {}, {}, {}, {}, {}\n"); | ||
| static constexpr std::string_view ThreadReport("Program Control Information:Threads/Parallel Sims, {},{}, {}, {}, {}, {}, {}, {}\n"); | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Align with header. Example 1ZoneUncontrolled/eplusout.eio ! <Program Control Information:Threads/Parallel Sims>, Threading Supported,Maximum Number of Threads, Env Set Threads (OMP_NUM_THREADS), EP Env Set Threads (EP_OMP_NUM_THREADS), IDF Set Threads, Number of Threads Used (Interior Radiant Exchange), Number Nominal Surfaces, Number Parallel Sims
-Program Control:Threads/Parallel Sims, No,1, N/A, N/A, N/A, N/A, N/A, N/A
+Program Control Information:Threads/Parallel Sims, No,1, N/A, N/A, N/A, N/A, N/A, N/A |
||
| if (state.dataSysVars->Threading) { | ||
| if (state.dataSysVars->iEnvSetThreads == 0) { | ||
| cEnvSetThreads = "Not Set"; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4105,7 +4105,7 @@ bool GetWaterThermalTankInput(EnergyPlusData &state) | |
| if (state.dataWaterThermalTanks->numWaterHeaterStratified > 0) { | ||
| print(state.files.eio, Format_722); | ||
| } | ||
| if (state.dataWaterThermalTanks->numChilledWaterMixed > 0) { | ||
| if ((state.dataWaterThermalTanks->numChilledWaterMixed > 0) || (state.dataWaterThermalTanks->numChilledWaterStratified > 0)) { | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
The Chilled Water Tank Information value line is issued, but not the header. $ rg "Chilled Water Tank" 5ZoneVAV-ChilledWaterStorage-Stratified/eplusout.eio
197:! <Chilled Water Tank Stratified Node Information>,Node Number,Height {m},Volume {m3},UA {W/K},Number Of Inlets,Number Of Outlets
399:Chilled Water Tank Stratified Node Information,1,1.3333,8.3333,9.0331,1,1
400:Chilled Water Tank Stratified Node Information,2,1.3333,8.3333,5.9081,0,0
401:Chilled Water Tank Stratified Node Information,3,1.3333,8.3333,5.9081,0,0
402:Chilled Water Tank Stratified Node Information,4,1.3333,8.3333,5.9081,0,0
403:Chilled Water Tank Stratified Node Information,5,1.3333,8.3333,5.9081,0,0
404:Chilled Water Tank Stratified Node Information,6,1.3333,8.3333,9.0331,1,1
416:Chilled Water Tank Information,ThermalStorage:ChilledWater:Stratified,CHILLED WATER STORAGE TANK 1,50.0000,3.0227E-003,5.0000E-003 |
||
| print(state.files.eio, Format_725); | ||
| } | ||
| if (state.dataWaterThermalTanks->numChilledWaterStratified > 0) { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6831,7 +6831,7 @@ namespace Window { | |
| "! <WindowMaterial:Glazing:EquivalentLayer>, Material Name, Optical Data Type, Spectral Data " | ||
| "Set Name, Front Side Beam-Beam Solar Transmittance, Back Side Beam-Beam Solar Transmittance, " | ||
| "Front Side Beam-Beam Solar Reflectance, Back Side Beam-Beam Solar Reflectance, Front Side " | ||
| "Beam-Diffuse Solar Transmittance, Back Side Beam-Diffuse Solar Transmittance, , Front Side " | ||
| "Beam-Diffuse Solar Transmittance, Back Side Beam-Diffuse Solar Transmittance, Front Side " | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. EquivalentLayerWindow/eplusout.eio -! <WindowMaterial:Glazing:EquivalentLayer>, Material Name, Optical Data Type, Spectral Data Set Name, Front Side Beam-Beam Solar Transmittance, Back Side Beam-Beam Solar Transmittance, Front Side Beam-Beam Solar Reflectance, Back Side Beam-Beam Solar Reflectance, Front Side Beam-Diffuse Solar Transmittance, Back Side Beam-Diffuse Solar Transmittance, , Front Side Beam-Diffuse Solar Reflectance, Back Side Beam-Diffuse Solar Reflectance, Diffuse-Diffuse Solar Transmittance, Front Side Diffuse-Diffuse Solar Reflectance, Back Side Diffuse-Diffuse Solar Reflectance, Infrared Transmittance, Front Side Infrared Emissivity, Back Side Infrared Emissivity
+! <WindowMaterial:Glazing:EquivalentLayer>, Material Name, Optical Data Type, Spectral Data Set Name, Front Side Beam-Beam Solar Transmittance, Back Side Beam-Beam Solar Transmittance, Front Side Beam-Beam Solar Reflectance, Back Side Beam-Beam Solar Reflectance, Front Side Beam-Diffuse Solar Transmittance, Back Side Beam-Diffuse Solar Transmittance, Front Side Beam-Diffuse Solar Reflectance, Back Side Beam-Diffuse Solar Reflectance, Diffuse-Diffuse Solar Transmittance, Front Side Diffuse-Diffuse Solar Reflectance, Back Side Diffuse-Diffuse Solar Reflectance, Infrared Transmittance, Front Side Infrared Emissivity, Back Side Infrared EmissivityExtract: -Back Side Beam-Diffuse Solar Transmittance, , Front Side Beam-Diffuse Solar Reflectance
+Back Side Beam-Diffuse Solar Transmittance, Front Side Beam-Diffuse Solar Reflectance |
||
| "Beam-Diffuse Solar Reflectance, Back Side Beam-Diffuse Solar Reflectance, Diffuse-Diffuse " | ||
| "Solar Transmittance, Front Side Diffuse-Diffuse Solar Reflectance, Back Side Diffuse-Diffuse " | ||
| "Solar Reflectance, Infrared Transmittance, Front Side Infrared Emissivity, Back Side Infrared " | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
EMSThermochromicWindow/eplusout.eio