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

OutputControl:Files #4059

Merged
merged 12 commits into from
Aug 28, 2020
Merged

OutputControl:Files #4059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
93b9dac
Add output control files to idd.
joseph-robertson Aug 26, 2020
09fc4da
Add and stub model files.
joseph-robertson Aug 26, 2020
b79e187
Add and stub energyplus files.
joseph-robertson Aug 26, 2020
79aa90e
Update idd.
joseph-robertson Aug 26, 2020
98213dc
Fill out moel files.
joseph-robertson Aug 26, 2020
aba92a2
Update ft and rt.
joseph-robertson Aug 26, 2020
7135baa
Small typo in idd.
joseph-robertson Aug 26, 2020
7d481ab
Fill out model tests.
joseph-robertson Aug 26, 2020
dcbd801
Fill out ft and rt tests.
joseph-robertson Aug 26, 2020
88b4843
Update FT and RT tests to really test the fields.
jmarrec Aug 28, 2020
a60a3ec
Minor.
jmarrec Aug 28, 2020
2574c98
Implement a cache-enabled getter in Model for OutputControlFiles.
jmarrec Aug 28, 2020
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
163 changes: 163 additions & 0 deletions resources/model/OpenStudio.idd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30885,6 +30885,169 @@ OS:UtilityBill,

\group OpenStudio Output Requests

OS:OutputControl:Files,
\memo Conditionally turn on/off output from EnergyPlus.
\unique-object
A1, \field Handle
\type handle
\required-field
A2, \field Output CSV
\type choice
\key Yes
\key No
\required-field
jmarrec marked this conversation as resolved.
Show resolved Hide resolved
A3, \field Output MTR
\type choice
\key Yes
\key No
\required-field
A4, \field Output ESO
\type choice
\key Yes
\key No
\required-field
A5, \field Output EIO
\type choice
\key Yes
\key No
\required-field
A6, \field Output Tabular
\type choice
\key Yes
\key No
\required-field
A7, \field Output SQLite
\type choice
\key Yes
\key No
\required-field
A8, \field Output JSON
\type choice
\key Yes
\key No
\required-field
A9, \field Output AUDIT
\type choice
\key Yes
\key No
\required-field
A10, \field Output Zone Sizing
\type choice
\key Yes
\key No
\required-field
A11, \field Output System Sizing
\type choice
\key Yes
\key No
\required-field
A12, \field Output DXF
\type choice
\key Yes
\key No
\required-field
A13, \field Output BND
\type choice
\key Yes
\key No
\required-field
A14, \field Output RDD
\type choice
\key Yes
\key No
\required-field
A15, \field Output MDD
\type choice
\key Yes
\key No
\required-field
A16, \field Output MTD
\type choice
\key Yes
\key No
\required-field
A17, \field Output END
\type choice
\key Yes
\key No
\required-field
A18, \field Output SHD
\type choice
\key Yes
\key No
\required-field
A19, \field Output DFS
\type choice
\key Yes
\key No
\required-field
A20, \field Output GLHE
\type choice
\key Yes
\key No
\required-field
A21, \field Output DelightIn
\type choice
\key Yes
\key No
\required-field
A22, \field Output DelightELdmp
\type choice
\key Yes
\key No
\required-field
A23, \field Output DelightDFdmp
\type choice
\key Yes
\key No
\required-field
A24, \field Output EDD
\type choice
\key Yes
\key No
\required-field
A25, \field Output DBG
\type choice
\key Yes
\key No
\required-field
A26, \field Output PerfLog
\type choice
\key Yes
\key No
\required-field
A27, \field Output SLN
\type choice
\key Yes
\key No
\required-field
A28, \field Output SCI
\type choice
\key Yes
\key No
\required-field
A29, \field Output WRL
\type choice
\key Yes
\key No
\required-field
A30, \field Output Screen
\type choice
\key Yes
\key No
\required-field
A31, \field Output ExtShd
\type choice
\key Yes
\key No
\required-field
A32; \field Output Tarcog
\note Not Implemented Yet
\type choice
\key Yes
\key No
\required-field

OS:OutputControl:ReportingTolerances,
\memo Calculations of the time that setpoints are not met use a tolerance of 0.2C.
\memo This object allows changing the tolerance used to determine when setpoints are being met.
Expand Down
3 changes: 3 additions & 0 deletions src/energyplus/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ set(${target_name}_src
ForwardTranslator/ForwardTranslateNode.cpp
ForwardTranslator/ForwardTranslateOtherEquipment.cpp
ForwardTranslator/ForwardTranslateOutsideSurfaceConvectionAlgorithm.cpp
ForwardTranslator/ForwardTranslateOutputControlFiles.cpp
jmarrec marked this conversation as resolved.
Show resolved Hide resolved
ForwardTranslator/ForwardTranslateOutputControlReportingTolerances.cpp
ForwardTranslator/ForwardTranslateOutputMeter.cpp
ForwardTranslator/ForwardTranslateOutputVariable.cpp
Expand Down Expand Up @@ -485,6 +486,7 @@ set(${target_name}_src
ReverseTranslator/ReverseTranslateMeterCustom.cpp
ReverseTranslator/ReverseTranslateMeterCustomDecrement.cpp
ReverseTranslator/ReverseTranslateOtherEquipment.cpp
ReverseTranslator/ReverseTranslateOutputControlFiles.cpp
ReverseTranslator/ReverseTranslateOutputDebuggingData.cpp
ReverseTranslator/ReverseTranslateOutputDiagnostics.cpp
ReverseTranslator/ReverseTranslateOutputEnergyManagementSystem.cpp
Expand Down Expand Up @@ -633,6 +635,7 @@ set(${target_name}_test_src
Test/Lights_GTest.cpp
Test/Luminaire_GTest.cpp
Test/Meter_GTest.cpp
Test/OutputControlFiles_GTest.cpp
Test/OutputDebuggingData_GTest.cpp
Test/OutputDiagnostics_GTest.cpp
Test/OutputJSON_GTest.cpp
Expand Down
11 changes: 9 additions & 2 deletions src/energyplus/ForwardTranslator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2438,10 +2438,16 @@ boost::optional<IdfObject> ForwardTranslator::translateAndMapModelObject(ModelOb
retVal = translatePumpVariableSpeed(pump);
break;
}
case openstudio::IddObjectType::OS_OutputControl_Files :
{
model::OutputControlFiles outputControlFiles = modelObject.cast<OutputControlFiles>();
retVal = translateOutputControlFiles(outputControlFiles);
break;
}
case openstudio::IddObjectType::OS_OutputControl_ReportingTolerances :
{
model::OutputControlReportingTolerances outputControl = modelObject.cast<OutputControlReportingTolerances>();
retVal = translateOutputControlReportingTolerances(outputControl);
model::OutputControlReportingTolerances outputControlReportingTolerances = modelObject.cast<OutputControlReportingTolerances>();
retVal = translateOutputControlReportingTolerances(outputControlReportingTolerances);
break;
}
case openstudio::IddObjectType::OS_Output_DebuggingData :
Expand Down Expand Up @@ -3530,6 +3536,7 @@ std::vector<IddObjectType> ForwardTranslator::iddObjectsToTranslateInitializer()
result.push_back(IddObjectType::OS_ZoneAirHeatBalanceAlgorithm);
result.push_back(IddObjectType::OS_ZoneAirMassFlowConservation);
result.push_back(IddObjectType::OS_ZoneCapacitanceMultiplier_ResearchSpecial);
result.push_back(IddObjectType::OS_OutputControl_Files);
jmarrec marked this conversation as resolved.
Show resolved Hide resolved
result.push_back(IddObjectType::OS_OutputControl_ReportingTolerances);
result.push_back(IddObjectType::OS_Output_DebuggingData);
result.push_back(IddObjectType::OS_Output_Diagnostics);
Expand Down
3 changes: 3 additions & 0 deletions src/energyplus/ForwardTranslator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ class MeterCustomDecrement;
class Node;
class OtherEquipment;
class OutsideSurfaceConvectionAlgorithm;
class OutputControlFiles;
class OutputControlReportingTolerances;
class OutputDebuggingData;
class OutputDiagnostics;
Expand Down Expand Up @@ -1016,6 +1017,8 @@ class ENERGYPLUS_API ForwardTranslator {

boost::optional<IdfObject> translateOutsideSurfaceConvectionAlgorithm( model::OutsideSurfaceConvectionAlgorithm & modelObject );

boost::optional<IdfObject> translateOutputControlFiles( model::OutputControlFiles & modelObject );
jmarrec marked this conversation as resolved.
Show resolved Hide resolved

boost::optional<IdfObject> translateOutputControlReportingTolerances( model::OutputControlReportingTolerances & modelObject );

boost::optional<IdfObject> translateOutputDebuggingData( model::OutputDebuggingData & modelObject );
Expand Down
Loading