Skip to content

Commit

Permalink
IDD typos/renames
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmarrec
jmarrec committed Aug 26, 2022
1 parent b6754bf commit c3425ca
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 19 deletions.
10 changes: 5 additions & 5 deletions src/energyplus/ForwardTranslator/ForwardTranslateThermalZone.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,7 @@ namespace energyplus {
if (!allPeople.empty()) {
auto& zoneVentilation = m_idfObjects.emplace_back(IddObjectType::ZoneVentilation_DesignFlowRate);
zoneVentilation.setName(tzName + " Ventilation per Person");
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ZoneorZoneListName, tzName);
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ZoneorZoneListorSpaceorSpaceListName, tzName);
if (peopleSchedule) {
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ScheduleName, peopleSchedule->nameString());
}
Expand All @@ -1111,16 +1111,16 @@ namespace energyplus {
if (zvRateForArea > 0) {
auto& zoneVentilation = m_idfObjects.emplace_back(IddObjectType::ZoneVentilation_DesignFlowRate);
zoneVentilation.setName(tzName + " Ventilation per Floor Area");
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ZoneorZoneListName, tzName);
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ZoneorZoneListorSpaceorSpaceListName, tzName);
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ScheduleName, this->alwaysOnSchedule().nameString());
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::DesignFlowRateCalculationMethod, "Flow/Area");
zoneVentilation.setDouble(ZoneVentilation_DesignFlowRateFields::FlowRateperZoneFloorArea, zvRateForArea / modelObject.floorArea());
zoneVentilation.setDouble(ZoneVentilation_DesignFlowRateFields::FlowRateperFloorArea, zvRateForArea / modelObject.floorArea());
}

if (zvRate > 0) {
auto& zoneVentilation = m_idfObjects.emplace_back(IddObjectType::ZoneVentilation_DesignFlowRate);
zoneVentilation.setName(tzName + " Ventilation Rate");
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ZoneorZoneListName, tzName);
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ZoneorZoneListorSpaceorSpaceListName, tzName);
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ScheduleName, this->alwaysOnSchedule().nameString());
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::DesignFlowRateCalculationMethod, "Flow/Zone");
zoneVentilation.setDouble(ZoneVentilation_DesignFlowRateFields::DesignFlowRate, zvRate);
Expand All @@ -1129,7 +1129,7 @@ namespace energyplus {
if (zvRateForVolume > 0) {
auto& zoneVentilation = m_idfObjects.emplace_back(IddObjectType::ZoneVentilation_DesignFlowRate);
zoneVentilation.setName(tzName + " Ventilation Air Changes per Hour");
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ZoneorZoneListName, tzName);
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ZoneorZoneListorSpaceorSpaceListName, tzName);
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::ScheduleName, this->alwaysOnSchedule().nameString());
zoneVentilation.setString(ZoneVentilation_DesignFlowRateFields::DesignFlowRateCalculationMethod, "AirChanges/Hour");
zoneVentilation.setDouble(ZoneVentilation_DesignFlowRateFields::AirChangesperHour, 3600.0 * zvRateForVolume / totVolume);
Expand Down
2 changes: 1 addition & 1 deletion src/energyplus/ForwardTranslator/ForwardTranslateZoneMixing.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ namespace energyplus {
optSchedule = modelObject.minimumZoneTemperatureSchedule();
if (optSchedule) {
translateAndMapModelObject(*optSchedule);
idfObject.setString(ZoneMixingFields::MinimumReceivigTemperatureScheduleName, optSchedule->name().get());
idfObject.setString(ZoneMixingFields::MinimumReceivingTemperatureScheduleName, optSchedule->name().get());
}

// MaximumReceivingTemperatureScheduleName
Expand Down
14 changes: 7 additions & 7 deletions src/energyplus/ReverseTranslator/ReverseTranslateZoneCrossMixing.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace energyplus {
return boost::none;
}

OptionalWorkspaceObject target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::ZoneName);
OptionalWorkspaceObject target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::ZoneorSpaceName);
OptionalThermalZone zone;
if (target) {
OptionalModelObject modelObject = translateAndMapWorkspaceObject(*target);
Expand All @@ -67,7 +67,7 @@ namespace energyplus {
return boost::none;
}

target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::SourceZoneName);
target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::SourceZoneorSpaceName);
OptionalThermalZone sourceZone;
if (target) {
OptionalModelObject modelObject = translateAndMapWorkspaceObject(*target);
Expand Down Expand Up @@ -119,7 +119,7 @@ namespace energyplus {
LOG(Error, "Flow/Zone value not found for workspace object " << workspaceObject);
}
} else if (istringEqual("Flow/Area", *s)) {
d = workspaceObject.getDouble(openstudio::ZoneCrossMixingFields::FlowRateperZoneFloorArea);
d = workspaceObject.getDouble(openstudio::ZoneCrossMixingFields::FlowRateperFloor);
if (d) {
mixing.setFlowRateperZoneFloorArea(*d);
reverseMixing.setFlowRateperZoneFloorArea(*d);
Expand Down Expand Up @@ -163,7 +163,7 @@ namespace energyplus {
}
}

target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::MinimumZoneTemperatureScheduleName);
target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::MinimumReceivingTemperatureScheduleName);
if (target) {
OptionalModelObject modelObject = translateAndMapWorkspaceObject(*target);
if (modelObject) {
Expand All @@ -174,7 +174,7 @@ namespace energyplus {
}
}

target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::MaximumZoneTemperatureScheduleName);
target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::MaximumReceivingTemperatureScheduleName);
if (target) {
OptionalModelObject modelObject = translateAndMapWorkspaceObject(*target);
if (modelObject) {
Expand All @@ -185,7 +185,7 @@ namespace energyplus {
}
}

target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::MinimumSourceZoneTemperatureScheduleName);
target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::MinimumSourceTemperatureScheduleName);
if (target) {
OptionalModelObject modelObject = translateAndMapWorkspaceObject(*target);
if (modelObject) {
Expand All @@ -196,7 +196,7 @@ namespace energyplus {
}
}

target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::MaximumSourceZoneTemperatureScheduleName);
target = workspaceObject.getTarget(openstudio::ZoneCrossMixingFields::MaximumSourceTemperatureScheduleName);
if (target) {
OptionalModelObject modelObject = translateAndMapWorkspaceObject(*target);
if (modelObject) {
Expand Down
9 changes: 5 additions & 4 deletions src/energyplus/ReverseTranslator/ReverseTranslateZoneInfiltrationDesignFlowRate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ namespace energyplus {
infiltration.setName(*s);
}

OptionalWorkspaceObject target = workspaceObject.getTarget(openstudio::ZoneInfiltration_DesignFlowRateFields::ZoneorZoneListName);
OptionalWorkspaceObject target =
workspaceObject.getTarget(openstudio::ZoneInfiltration_DesignFlowRateFields::ZoneorZoneListorSpaceorSpaceListName);
if (target) {
OptionalModelObject modelObject = translateAndMapWorkspaceObject(*target);
if (modelObject) {
Expand Down Expand Up @@ -98,21 +99,21 @@ namespace energyplus {
LOG(Error, "Flow/Zone value not found for workspace object " << workspaceObject);
}
} else if (istringEqual("Flow/Area", *s)) {
d = workspaceObject.getDouble(openstudio::ZoneInfiltration_DesignFlowRateFields::FlowperZoneFloorArea);
d = workspaceObject.getDouble(openstudio::ZoneInfiltration_DesignFlowRateFields::FlowRateperFloorArea);
if (d) {
infiltration.setFlowperSpaceFloorArea(*d);
} else {
LOG(Error, "Flow/Area value not found for workspace object " << workspaceObject);
}
} else if (istringEqual("Flow/ExteriorArea", *s)) {
d = workspaceObject.getDouble(openstudio::ZoneInfiltration_DesignFlowRateFields::FlowperExteriorSurfaceArea);
d = workspaceObject.getDouble(openstudio::ZoneInfiltration_DesignFlowRateFields::FlowRateperExteriorSurfaceArea);
if (d) {
infiltration.setFlowperExteriorSurfaceArea(*d);
} else {
LOG(Error, "Flow/ExteriorArea value not found for workspace object " << workspaceObject);
}
} else if (istringEqual("Flow/ExteriorWallArea", *s)) {
d = workspaceObject.getDouble(openstudio::ZoneInfiltration_DesignFlowRateFields::FlowperExteriorSurfaceArea);
d = workspaceObject.getDouble(openstudio::ZoneInfiltration_DesignFlowRateFields::FlowRateperExteriorSurfaceArea);
if (d) {
infiltration.setFlowperExteriorWallArea(*d);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/energyplus/ReverseTranslator/ReverseTranslateZoneInfiltrationEffectiveLeakageArea.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ namespace energyplus {
spaceInfiltrationEffectiveLeakageArea.setName(*s);
}

OptionalWorkspaceObject target = workspaceObject.getTarget(ZoneInfiltration_EffectiveLeakageAreaFields::ZoneName);
OptionalWorkspaceObject target = workspaceObject.getTarget(ZoneInfiltration_EffectiveLeakageAreaFields::ZoneorSpaceName);
if (target) {
OptionalModelObject modelObject = translateAndMapWorkspaceObject(*target);
if (modelObject) {
Expand Down
2 changes: 1 addition & 1 deletion src/energyplus/ReverseTranslator/ReverseTranslateZoneInfiltrationFlowCoefficient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ namespace energyplus {
return boost::none;
}

OptionalWorkspaceObject zoneTarget = workspaceObject.getTarget(ZoneInfiltration_FlowCoefficientFields::ZoneName);
OptionalWorkspaceObject zoneTarget = workspaceObject.getTarget(ZoneInfiltration_FlowCoefficientFields::ZoneorSpaceName);
if (!zoneTarget) {
LOG(Error, "WorkspaceObject " << workspaceObject.briefDescription() << " has no Zone Name assigned, not ReverseTranslating it.");
return boost::none;
Expand Down

0 comments on commit c3425ca

Please sign in to comment.