Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
123 changes: 102 additions & 21 deletions datasets/RooftopPackagedHeatPump.idf

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion idd/Energy+.idd.in
Original file line number Diff line number Diff line change
Expand Up @@ -35256,7 +35256,7 @@ OutputControl:Sizing:Style,
\group Zone HVAC Controls and Thermostats

ZoneControl:Humidistat,
\memo Specifies zone relative humidity setpoint schedules for humidifying and dehumidifying.
\memo Specifies zone relative humidity setpoint schedules for humidifying and dehumidifying.
\min-fields 3
A1 , \field Name
\required-field
Expand Down
45,105 changes: 23,625 additions & 21,480 deletions performance_tests/10x_incr_100zones1win10overhangsFullExIn.idf

Large diffs are not rendered by default.

5,352 changes: 2,506 additions & 2,846 deletions performance_tests/Inactive/10zone1vav.idf

Large diffs are not rendered by default.

10,648 changes: 4,980 additions & 5,668 deletions performance_tests/Inactive/20zone1vav.idf

Large diffs are not rendered by default.

15,944 changes: 7,454 additions & 8,490 deletions performance_tests/Inactive/30zone1vav.idf

Large diffs are not rendered by default.

21,244 changes: 9,930 additions & 11,314 deletions performance_tests/Inactive/40zone1vav.idf

Large diffs are not rendered by default.

26,538 changes: 12,403 additions & 14,135 deletions performance_tests/Inactive/50zone1vav.idf

Large diffs are not rendered by default.

31,810 changes: 14,860 additions & 16,950 deletions performance_tests/Inactive/60Zone1PVAV.idf

Large diffs are not rendered by default.

31,838 changes: 14,879 additions & 16,959 deletions performance_tests/Inactive/60Zone1VAV.idf

Large diffs are not rendered by default.

31,820 changes: 14,862 additions & 16,958 deletions performance_tests/Inactive/60zone2PVAV.idf

Large diffs are not rendered by default.

31,830 changes: 14,864 additions & 16,966 deletions performance_tests/Inactive/60zone3PVAV.idf

Large diffs are not rendered by default.

31,844 changes: 14,862 additions & 16,982 deletions performance_tests/Inactive/60zone6PVAV.idf

Large diffs are not rendered by default.

Large diffs are not rendered by default.

51 changes: 28 additions & 23 deletions scripts/dev/make_pretty.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ def _prepare_temp_dir_for_transition(idd_path: Path, old_idd_path: Path | None =
return temp_dir


def _cleanup_transition_artifacts(idf_path: Path) -> None:
for suffix in {".VCpErr", ".idfnew", ".idfold", ".imfnew", ".imfold"}:
artifact = idf_path.with_suffix(suffix)
if artifact.is_file():
artifact.unlink()


def translate_file_parallelizable(
idf_path: Path, formatter_only_exe: Path, idd_path: Path, old_idd_path: Path | None = None
) -> int:
Expand All @@ -100,29 +107,27 @@ def translate_file_parallelizable(
cwd=temp_dir,
)

if r.returncode == 0:
# Keep only the new files and remove the old ones
for x in ["idf", "rvi", "mvi", "imf"]:
new_file = idf_path.with_suffix(f".{x}new")
if x == "idf":
assert new_file.is_file(), f"Could not find {new_file}, {temp_dir=}"
if new_file.is_file():
shutil.move(new_file, idf_path.with_suffix(f".{x}"))

old_file = idf_path.with_suffix(f".{x}old")
if old_file.is_file():
old_file.unlink()

for suffix in {".VCpErr"}:
old_file = idf_path.with_suffix(suffix)
if old_file.is_file():
old_file.unlink()

# print('Done for {}.idf - {}'.format(eplus_file, path))
else:
print(f"Error for {idf_path}: {temp_dir=}")
print(r.stdout)
print(r.stderr)
try:
if r.returncode == 0:
# Keep only the new files and remove the old ones
for x in ["idf", "rvi", "mvi", "imf"]:
new_file = idf_path.with_suffix(f".{x}new")
if x == "idf":
assert new_file.is_file(), f"Could not find {new_file}, {temp_dir=}"
if new_file.is_file():
shutil.move(new_file, idf_path.with_suffix(f".{x}"))

old_file = idf_path.with_suffix(f".{x}old")
if old_file.is_file():
old_file.unlink()

# print('Done for {}.idf - {}'.format(eplus_file, path))
else:
print(f"Error for {idf_path}: {temp_dir=}")
print(r.stdout)
print(r.stderr)
finally:
_cleanup_transition_artifacts(idf_path)

# https://github.com/NatLabRockies/EnergyPlus/issues/9590
# Remove weird extra comments. E.g.,
Expand Down
459 changes: 206 additions & 253 deletions src/Basement/basementexample_out.idf

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions src/Slab/SlabExample.idf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
!-NOTE: All comments with '!-' are ignored by the IDFEditor and are generated automatically.
!- Use '!' comments if they need to be retained when using the IDFEditor.


!- =========== ALL OBJECTS IN CLASS: MATERIALS ===========

Materials,
Expand All @@ -20,7 +19,6 @@ Materials,
6.13, !- HIN: Indoor HConv: Downward Flow {W/m2-K}
9.26; !- HIN: Indoor HConv: Upward {W/m2-K}


!- =========== ALL OBJECTS IN CLASS: MATLPROPS ===========

MatlProps,
Expand All @@ -31,7 +29,6 @@ MatlProps,
0.93, !- TCON: Slab k {W/m-K}
1; !- TCON: Soil k {W/m-K}


!- =========== ALL OBJECTS IN CLASS: BOUNDCONDS ===========

BoundConds,
Expand Down Expand Up @@ -62,7 +59,6 @@ BldgProps,
0, !- TINAmp: Daily sine wave variation amplitude {C}
0.10; !- ConvTol: Convergence Tolerance


!- =========== ALL OBJECTS IN CLASS: INSULATION ===========

Insulation,
Expand All @@ -72,7 +68,6 @@ Insulation,
2.0, !- ZVINS: Depth of vertical insulation {m}
1; !- IVINS: Flag: Is there vertical insulation


!- =========== ALL OBJECTS IN CLASS: EQUIVALENTSLAB ===========

EquivalentSlab,
Expand All @@ -81,4 +76,3 @@ EquivalentSlab,
15, !- CLEARANCE: Distance from edge of slab to domain edge {m}
10.; !- ZCLEARANCE: Depth of region below slab, m


2 changes: 1 addition & 1 deletion testfiles/5ZoneCoolingPanelBaseboard.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2229,7 +2229,7 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
Seasonal Relative Humidity Sch; !- Humidifying Relative Humidity Setpoint Schedule Name
Seasonal Relative Humidity Sch; !- Humidifying Setpoint Schedule Name

!- =========== ALL OBJECTS IN CLASS: ZONECONTROL:THERMOSTAT ===========

Expand Down
2 changes: 1 addition & 1 deletion testfiles/5ZoneCoolingPanelBaseboardAuto.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2229,7 +2229,7 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
Seasonal Relative Humidity Sch; !- Humidifying Relative Humidity Setpoint Schedule Name
Seasonal Relative Humidity Sch; !- Humidifying Setpoint Schedule Name

!- =========== ALL OBJECTS IN CLASS: ZONECONTROL:THERMOSTAT ===========

Expand Down
2 changes: 1 addition & 1 deletion testfiles/5ZoneCoolingPanelBaseboardTotalLoad.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2229,7 +2229,7 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
Seasonal Relative Humidity Sch; !- Humidifying Relative Humidity Setpoint Schedule Name
Seasonal Relative Humidity Sch; !- Humidifying Setpoint Schedule Name

!- =========== ALL OBJECTS IN CLASS: ZONECONTROL:THERMOSTAT ===========

Expand Down
2 changes: 1 addition & 1 deletion testfiles/5ZoneCoolingPanelBaseboardVarOff.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2229,7 +2229,7 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
Seasonal Relative Humidity Sch; !- Humidifying Relative Humidity Setpoint Schedule Name
Seasonal Relative Humidity Sch; !- Humidifying Setpoint Schedule Name

!- =========== ALL OBJECTS IN CLASS: ZONECONTROL:THERMOSTAT ===========

Expand Down
2 changes: 1 addition & 1 deletion testfiles/5ZoneElectricBaseboard.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2235,7 +2235,7 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
Seasonal Relative Humidity Sch; !- Humidifying Relative Humidity Setpoint Schedule Name
Seasonal Relative Humidity Sch; !- Humidifying Setpoint Schedule Name

!- =========== ALL OBJECTS IN CLASS: ZONECONTROL:THERMOSTAT ===========

Expand Down
2 changes: 1 addition & 1 deletion testfiles/5ZoneWaterCooled_Baseboard.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2228,7 +2228,7 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
Seasonal Relative Humidity Sch; !- Humidifying Relative Humidity Setpoint Schedule Name
Seasonal Relative Humidity Sch; !- Humidifying Setpoint Schedule Name

!- =========== ALL OBJECTS IN CLASS: ZONECONTROL:THERMOSTAT ===========

Expand Down
2 changes: 1 addition & 1 deletion testfiles/5ZoneWaterCooled_BaseboardScalableSizing.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2230,7 +2230,7 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
Seasonal Relative Humidity Sch; !- Humidifying Relative Humidity Setpoint Schedule Name
Seasonal Relative Humidity Sch; !- Humidifying Setpoint Schedule Name

!- =========== ALL OBJECTS IN CLASS: ZONECONTROL:THERMOSTAT ===========

Expand Down
20 changes: 10 additions & 10 deletions testfiles/5ZoneWaterCooled_GasFiredSteamHumidifier.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2276,8 +2276,8 @@
ZoneControl:Humidistat,
Space1-1 Humidistat, !- Name
SPACE1-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE2-1 Control, !- Name
Expand All @@ -2289,8 +2289,8 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE3-1 Control, !- Name
Expand All @@ -2302,8 +2302,8 @@
ZoneControl:Humidistat,
Space3-1 Humidistat, !- Name
SPACE3-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE4-1 Control, !- Name
Expand All @@ -2315,8 +2315,8 @@
ZoneControl:Humidistat,
Space4-1 Humidistat, !- Name
SPACE4-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE5-1 Control, !- Name
Expand All @@ -2328,8 +2328,8 @@
ZoneControl:Humidistat,
Space5-1 Humidistat, !- Name
SPACE5-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ThermostatSetpoint:DualSetpoint,
DualSetPoint, !- Name
Expand Down
2 changes: 1 addition & 1 deletion testfiles/5ZoneWaterCooled_HighRHControl.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2253,7 +2253,7 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
Seasonal Relative Humidity Sch; !- Humidifying Relative Humidity Setpoint Schedule Name
Seasonal Relative Humidity Sch; !- Humidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE3-1 Control, !- Name
Expand Down
20 changes: 10 additions & 10 deletions testfiles/5ZoneWaterCooled_MultizoneAverageRHControl.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2269,8 +2269,8 @@
ZoneControl:Humidistat,
Space1-1 Humidistat, !- Name
SPACE1-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE2-1 Control, !- Name
Expand All @@ -2282,8 +2282,8 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE3-1 Control, !- Name
Expand All @@ -2295,8 +2295,8 @@
ZoneControl:Humidistat,
Space3-1 Humidistat, !- Name
SPACE3-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE4-1 Control, !- Name
Expand All @@ -2308,8 +2308,8 @@
ZoneControl:Humidistat,
Space4-1 Humidistat, !- Name
SPACE4-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE5-1 Control, !- Name
Expand All @@ -2321,8 +2321,8 @@
ZoneControl:Humidistat,
Space5-1 Humidistat, !- Name
SPACE5-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ThermostatSetpoint:DualSetpoint,
DualSetPoint, !- Name
Expand Down
20 changes: 10 additions & 10 deletions testfiles/5ZoneWaterCooled_MultizoneMinMaxRHControl.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2276,8 +2276,8 @@
ZoneControl:Humidistat,
Space1-1 Humidistat, !- Name
SPACE1-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE2-1 Control, !- Name
Expand All @@ -2289,8 +2289,8 @@
ZoneControl:Humidistat,
Space2-1 Humidistat, !- Name
SPACE2-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE3-1 Control, !- Name
Expand All @@ -2302,8 +2302,8 @@
ZoneControl:Humidistat,
Space3-1 Humidistat, !- Name
SPACE3-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE4-1 Control, !- Name
Expand All @@ -2315,8 +2315,8 @@
ZoneControl:Humidistat,
Space4-1 Humidistat, !- Name
SPACE4-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Thermostat,
SPACE5-1 Control, !- Name
Expand All @@ -2328,8 +2328,8 @@
ZoneControl:Humidistat,
Space5-1 Humidistat, !- Name
SPACE5-1, !- Zone Name
HumidifyingHumSetSch, !- Humidifying Relative Humidity Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
HumidifyingHumSetSch, !- Humidifying Setpoint Schedule Name
DehumidifyingHumSetSch; !- Dehumidifying Setpoint Schedule Name

ThermostatSetpoint:DualSetpoint,
DualSetPoint, !- Name
Expand Down
20 changes: 10 additions & 10 deletions testfiles/ASHRAE901_Hospital_STD2019_Denver.idf
Original file line number Diff line number Diff line change
Expand Up @@ -18190,32 +18190,32 @@
ZoneControl:Humidistat,
ER_Exam3_Mult4_Flr_1 Humidistat, !- Name
ER_Exam3_Mult4_Flr_1, !- Zone Name
MinRelHumSetSch_addDI, !- Humidifying Relative Humidity Setpoint Schedule Name
MaxRelHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
MinRelHumSetSch_addDI, !- Humidifying Setpoint Schedule Name
MaxRelHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Humidistat,
OR2_Mult5_Flr_2 Humidistat, !- Name
OR2_Mult5_Flr_2, !- Zone Name
MinRelHumSetSch_addDI, !- Humidifying Relative Humidity Setpoint Schedule Name
MaxRelHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
MinRelHumSetSch_addDI, !- Humidifying Setpoint Schedule Name
MaxRelHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Humidistat,
ICU_Flr_2 Humidistat, !- Name
ICU_Flr_2, !- Zone Name
MinRelHumSetSch_addDI_ICU, !- Humidifying Relative Humidity Setpoint Schedule Name
MaxRelHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
MinRelHumSetSch_addDI_ICU, !- Humidifying Setpoint Schedule Name
MaxRelHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Humidistat,
Lab_Flr_3 Humidistat, !- Name
Lab_Flr_3, !- Zone Name
MinRelHumSetSch_addDI, !- Humidifying Relative Humidity Setpoint Schedule Name
MaxRelHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
MinRelHumSetSch_addDI, !- Humidifying Setpoint Schedule Name
MaxRelHumSetSch; !- Dehumidifying Setpoint Schedule Name

ZoneControl:Humidistat,
PatRoom5_Mult10_Flr_4 Humidistat, !- Name
PatRoom5_Mult10_Flr_4, !- Zone Name
MinRelHumSetSch_addDI, !- Humidifying Relative Humidity Setpoint Schedule Name
MaxRelHumSetSch; !- Dehumidifying Relative Humidity Setpoint Schedule Name
MinRelHumSetSch_addDI, !- Humidifying Setpoint Schedule Name
MaxRelHumSetSch; !- Dehumidifying Setpoint Schedule Name

!- =========== ALL OBJECTS IN CLASS: ZONECONTROL:THERMOSTAT ===========

Expand Down
Loading