Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
836482b
Implemented support for RunPeriod
mwetter Apr 21, 2022
965fe41
Implemented support for RunPeriod
mwetter Apr 21, 2022
7b61856
Implemented support for RunPeriod
mwetter Apr 21, 2022
6331a16
Implemented support for RunPeriod
mwetter Apr 21, 2022
bbb6468
Implemented support for RunPeriod
mwetter Apr 21, 2022
850a10e
Added Linux binary
mwetter Apr 21, 2022
bfc1b12
Add EnergyPlus_24_1_0 resources
kbenne Jun 25, 2024
3682042
Merged master
mwetter Aug 21, 2024
8bae883
Added validation test
mwetter Aug 21, 2024
32a1eab
Added validation test
mwetter Aug 21, 2024
dd2a6f4
Removed comment in annotation
mwetter Aug 21, 2024
18195d0
Introduced sLen
mwetter Aug 21, 2024
0506fcb
Compiled Linux binaries
mwetter Aug 21, 2024
0fc07e9
Revised and expanded documentation
mwetter Aug 22, 2024
cd19b6e
Revised and expanded documentation
mwetter Aug 22, 2024
c0b7065
Added install.py file
mwetter Aug 24, 2024
a806c31
Merge branch 'master' into issue3911_EP_24_1_0
mwetter Aug 24, 2024
cbe8bd1
Merge branch 'issue2926_runPeriod' into issue3911_EP_24_1_0
mwetter Aug 24, 2024
c356729
Updated hash and version for new binaries
mwetter Aug 24, 2024
98565df
Updated .mo files for EnergyPlus 24.1.0, after copying examples from …
mwetter Aug 24, 2024
696af3d
Updated EnergyPlus version
mwetter Aug 24, 2024
d45a9e2
Added mos scripts
mwetter Aug 26, 2024
0172fda
Setup examples
mwetter Aug 26, 2024
fb39b07
Updated C code
mwetter Aug 26, 2024
fd2cb3c
Removed old binary
mwetter Aug 26, 2024
8b084e2
Updated EnergyPlus version
mwetter Aug 26, 2024
bbfdb73
Updated release notes
mwetter Aug 26, 2024
085fbc8
Updated link to figures
mwetter Aug 26, 2024
2b19281
Moved files used for EnergyPlus_9_6_0 and EnergyPlus_24_1_0 testing
mwetter Aug 26, 2024
15e21ed
Changed Spawn version [ci skip]
mwetter Sep 3, 2024
dea9608
Refactored RunPeriod [ci skip]
mwetter Sep 3, 2024
7b37737
Merge branch 'master' into issue2926_runPeriod
mwetter Sep 3, 2024
ad36a65
Compiled dll
mwetter Sep 3, 2024
02b0299
Updated documentation
mwetter Sep 3, 2024
3a92082
Formatted file
mwetter Sep 3, 2024
605f332
Renamed model
mwetter Sep 3, 2024
cecf92e
Updated release notes
mwetter Sep 3, 2024
f7ea3da
Corrected format
mwetter Sep 3, 2024
db4a232
Merged #2926
mwetter Sep 3, 2024
aae5886
Renamed model
mwetter Sep 3, 2024
6dd75b8
Ported changes from #2926
mwetter Sep 3, 2024
7352fd8
Ported changes from #2926
mwetter Sep 3, 2024
7f838d9
Ported changes from #2926
mwetter Sep 3, 2024
c8a408b
Merged master
mwetter Oct 17, 2024
40224a3
Changed E+ version
mwetter Oct 17, 2024
97b256f
Renamed 24_1_0 to 24_2_0 and 24.1.0 to 24.2.0
mwetter Oct 17, 2024
f439f04
Renamed 24_1_0 to 24_2_0 and 24.1.0 to 24.2.0
mwetter Oct 17, 2024
c57ad29
Checked out idf from issue3911_EP_24_2_1
mwetter Oct 17, 2024
112520a
Reverted package.order
mwetter Oct 17, 2024
f21f28e
Ported autosizing code to .c and .h files
mwetter Oct 17, 2024
742e5d3
Removed annotations that do not belong into base class
mwetter Oct 17, 2024
88673e7
Removed annotations that do not belong into base class
mwetter Oct 17, 2024
6f36b71
Ported autosizing code to .mo files
mwetter Oct 17, 2024
6312376
Merged master
mwetter Nov 27, 2024
fea8ca6
Removed conflict
mwetter Nov 27, 2024
2bb5ad2
Corrected function signature
mwetter Nov 27, 2024
71eff9d
Updated hash for Spawn binaries [ci skip]
mwetter Jan 8, 2025
4542766
Removed quotes for boolean values [ci skip]
mwetter Jan 8, 2025
33eaa4d
Compiled binaries for Linux
mwetter Jan 8, 2025
1a58aee
Updated Spawn binary version [ci skip]
mwetter Jan 29, 2025
bdfb50e
Merge branch 'master' into issue3866_24_2_0_autosize
dhblum May 27, 2025
f303afa
Update spawn binary to dev and get zone sizing pars to Modelica
dhblum Jun 9, 2025
5792fc9
Initial add for system sizing object
dhblum Jun 11, 2025
ef54f71
Add and use record for sizing parameters
dhblum Jun 25, 2025
f94d1f5
Move autosize booleans and options to zone, change to systemName
dhblum Aug 19, 2025
7ba4f8c
Make two instances of siz record for hea and coo and pass as public i…
dhblum Aug 19, 2025
ae84875
Add autosize field to modelicaSystems in json
dhblum Aug 22, 2025
51a032e
Change json field from modelicaSystems to hvacSystems
dhblum Sep 17, 2025
cb11886
Added explicit type conversion to avoid compiler warnings
mwetter Sep 17, 2025
7df9c9d
Added comment
mwetter Sep 17, 2025
b651fbf
Removed autosizeHVAC and use_sizingPeriods
mwetter Sep 17, 2025
d40ecb7
Removed autosizeHVAC and use_sizingPeriods
mwetter Sep 17, 2025
195f88f
Corrected graphical annotation
mwetter Sep 17, 2025
9799a12
Removed autosizeHVAC and use_sizingPeriods
mwetter Sep 17, 2025
798cee6
Moved files due to the API changes for EnergyPlus 24.2
mwetter Sep 17, 2025
db68244
Added sizing data to mockup
mwetter Sep 17, 2025
453e6ff
Changed time from T to t. Changed parameter order to be the same for …
mwetter Sep 17, 2025
8894619
Updated binaries
mwetter Sep 17, 2025
413549c
Moved comment
mwetter Sep 17, 2025
de64942
Merge pull request #4352 from lbl-srg/issue3866_24_2_0_autosize_remov…
dhblum Sep 18, 2025
c392163
Fix for new system name parameter
dhblum Nov 3, 2025
5ac221e
Add single family air heating autosize example
dhblum Nov 4, 2025
6b852fa
Change default system name to none
dhblum Nov 12, 2025
24cc755
Update spawn package commit
dhblum Nov 12, 2025
6d1486b
Add conversion of humidity ratio from EPlus to Modelica
dhblum Dec 10, 2025
73bdd34
Address if XOutCoo/Hea is 0
dhblum Feb 5, 2026
60ffc82
Update Spawn version
dhblum Apr 2, 2026
73d310a
Exchange TSet and XSet, and convert humidity ratio
dhblum Apr 2, 2026
49ff803
Update AirHeating example
dhblum Apr 2, 2026
deab967
Add autosizing examples for ASHRAE2006, Guideline36, and multiple sys…
dhblum Apr 2, 2026
9cf2a58
Add example with ideal heating and cooling
dhblum Apr 2, 2026
9cbcc49
Merge branch 'master' into issue3866_24_2_0_autosize
dhblum Apr 2, 2026
4a380b3
Replace autosizing floor baseclass for vav examples
dhblum Apr 2, 2026
3c697fb
Fix humidity ratio calculation for XSet in heating
dhblum Apr 3, 2026
b4d374e
Add outside air and cooling coil sensible load from autosizing for AS…
dhblum Apr 3, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ model FMUZoneAdapterZones1
final zoneName="Core_ZN",
usePrecompiledFMU=true,
final fmuName=Modelica.Utilities.Files.loadResource(
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones1.fmu"),
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones1.fmu"),
logLevel=building.logLevel,
setInitialRadiativeHeatGainToZero=true,
final nFluPor=2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ model FMUZoneAdapterZones2
final zoneName="Core_ZN",
usePrecompiledFMU=true,
final fmuName=Modelica.Utilities.Files.loadResource(
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu"),
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
logLevel=building.logLevel,
setInitialRadiativeHeatGainToZero=true,
final nFluPor=2)
Expand Down Expand Up @@ -70,7 +70,7 @@ model FMUZoneAdapterZones2
final zoneName="South_ZN",
usePrecompiledFMU=true,
final fmuName=Modelica.Utilities.Files.loadResource(
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu"),
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
logLevel=building.logLevel,
setInitialRadiativeHeatGainToZero=true,
final nFluPor=2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ model FMUZoneAdapterZones3
final zoneName="Core_ZN",
usePrecompiledFMU=true,
final fmuName=Modelica.Utilities.Files.loadResource(
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu"),
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
logLevel=building.logLevel,
setInitialRadiativeHeatGainToZero=true,
final nFluPor=2)
Expand Down Expand Up @@ -70,7 +70,7 @@ model FMUZoneAdapterZones3
final zoneName="South_ZN",
usePrecompiledFMU=true,
final fmuName=Modelica.Utilities.Files.loadResource(
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu"),
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
logLevel=building.logLevel,
setInitialRadiativeHeatGainToZero=true,
final nFluPor=2)
Expand All @@ -94,7 +94,7 @@ model FMUZoneAdapterZones3
final zoneName="North_ZN",
usePrecompiledFMU=true,
final fmuName=Modelica.Utilities.Files.loadResource(
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu"),
"modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
logLevel=building.logLevel,
setInitialRadiativeHeatGainToZero=true,
final nFluPor=2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ equation
textString="phi"),
Text(
extent={{-56,-48},{-20,-68}},
textString="rad",
textColor={0,0,0}), Rectangle(
textString="rad"),
Rectangle(
extent={{-204,204},{204,-204}},
lineColor={255,0,0},
pattern=LinePattern.Dash,
Expand Down Expand Up @@ -546,6 +546,10 @@ is not possible.
revisions="<html>
<ul>
<li>
September 17, 2025, by Michael Wetter:<br/>
Corrected graphical annotation for <code>Text</code>.
</li>
<li>
March 22, 2024, by Michael Wetter:<br/>
Changed radiative heat flow rate sent to EnergyPlus to be the average over the last
synchronization time step rather than the instantaneuous value, and set the initial value by default to zero.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,6 @@ First implementation.
</li>
</ul>
</html>"),
__Dymola_Commands(
file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/SurfaceComparison/ZoneSurfaces.mos"
"Simulate and Plot", file="../test.mos" "test"),
experiment(
StopTime=2592000,
Tolerance=1e-06),
Diagram(coordinateSystem(extent={{-100,-100},{100,100}})),
Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
end ZoneSurfaces;
6 changes: 4 additions & 2 deletions Buildings/Resources/C-Sources/EnergyPlus_24_2_0_Wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,15 @@ void* allocate_Modelica_EnergyPlus_24_2_0(
const char* idfVersion,
const char* idfName,
const char* epwName,
const char* epName,
const char* hvacZone,
int runPeriod_dayOfWeekForStartDay,
int runPeriod_applyWeekEndHolidayRule,
int runPeriod_use_weatherFileDaylightSavingPeriod,
int runPeriod_use_weatherFileHolidaysAndSpecialDays,
int runPeriod_use_weatherFileRainIndicators,
int runPeriod_use_weatherFileSnowIndicators,
double relativeSurfaceTolerance,
const char* epName,
int usePrecompiledFMU,
const char* fmuName,
const char* buildingsRootFileLocation,
Expand Down Expand Up @@ -88,9 +89,10 @@ void* allocate_Modelica_EnergyPlus_24_2_0(
idfVersion,
idfName,
epwName,
epName,
hvacZone,
&runPer,
relativeSurfaceTolerance,
epName,
usePrecompiledFMU,
fmuName,
buildingsRootFileLocation,
Expand Down
3 changes: 2 additions & 1 deletion Buildings/Resources/C-Sources/EnergyPlus_24_2_0_Wrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ extern void* allocate_Spawn_EnergyPlus_24_2_0(
const char* idfVersion,
const char* idfName,
const char* epwName,
const char* epName,
const char* hvacZone,
const runPeriod* runPer,
double relativeSurfaceTolerance,
const char* epName,
int usePrecompiledFMU,
const char* fmuName,
const char* buildingsRootFileLocation,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4022,9 +4022,9 @@
Temperature, !- Schedule Type Limits Name
Through: 12/31, !- Field 1
For: Weekdays SummerDesignDay, !- Field 2
Until: 06:00,80.0, !- Field 3
Until: 22:00,80.0, !- Field 5
Until: 24:00,80.0, !- Field 7
Until: 06:00,24.0, !- Field 3
Until: 22:00,24.0, !- Field 5
Until: 24:00,24.0, !- Field 7
For: Saturday, !- Field 9
Until: 06:00,80.0, !- Field 10
Until: 18:00,80.0, !- Field 12
Expand Down
Loading
Loading