diff --git a/.gitattributes b/.gitattributes index 76c58250121..f4dc5fabe82 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,6 +6,7 @@ libfmilib*.* filter=lfs diff=lfs merge=lfs -text fmilib_shared*.* filter=lfs diff=lfs merge=lfs -text epfmi*.* filter=lfs diff=lfs merge=lfs -text VCRUNTIME*.dll filter=lfs diff=lfs merge=lfs -text -Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones1.fmu filter=lfs diff=lfs merge=lfs -text -Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu filter=lfs diff=lfs merge=lfs -text -Buildings/Resources/bin/spawn-*/bin/spawn* filter=lfs diff=lfs merge=lfs -text +Buildings/Resources/src/ThermalZones/EnergyPlus*/FMUs/Zones1.fmu filter=lfs diff=lfs merge=lfs -text +Buildings/Resources/src/ThermalZones/EnergyPlus*/FMUs/Zones3.fmu filter=lfs diff=lfs merge=lfs -text +Buildings/Resources/bin/spawn-*/linux64/bin/spawn* filter=lfs diff=lfs merge=lfs -text +Buildings/Resources/bin/spawn-*/win64/bin/spawn* filter=lfs diff=lfs merge=lfs -text diff --git a/.travis.yml b/.travis.yml index 6ac11daf7fd..005a77d298e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,9 +45,9 @@ env: - TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Air,Examples}\"" - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Air,Examples}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Air,Examples}\"" - - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.EnergyPlus\"" - - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus\"" - - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.EnergyPlus\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\"" - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\"" diff --git a/Buildings/Examples/VAVReheat/package.mo b/Buildings/Examples/VAVReheat/package.mo index 566bf6dda00..943ccb95a97 100644 --- a/Buildings/Examples/VAVReheat/package.mo +++ b/Buildings/Examples/VAVReheat/package.mo @@ -11,11 +11,11 @@ for office buildings.

Note

The models - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter and - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter appear to be quite similar to Buildings.Examples.VAVReheat.ASHRAE2006 @@ -25,8 +25,8 @@ Buildings.Examples.VAVReheat.Guideline36, respectively, because they all have the same HVAC system, control sequences, and all have five thermal zones. However, the models in - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice are from the DOE Commercial Reference Building, Small Office, new construction, ASHRAE 90.1-2004, @@ -39,8 +39,8 @@ are from the Medium Office, new construction, ASHRAE 90.1-2004, version 1.2_4.0. Therefore, the dimensions of the thermal zones in - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice are considerably smaller than in Buildings.Examples.VAVReheat. diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ1.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ1.mo index 25c837949e4..ab718dd0701 100644 --- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ1.mo +++ b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ1.mo @@ -12,7 +12,7 @@ model BuildingSpawnZ1 "Load side medium"; parameter Integer nZon=1 "Number of thermal zones"; - parameter String idfName="modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf" + parameter String idfName="modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf" "Name of the IDF file"; parameter String epwName="modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw" "Name of the weather file"; @@ -32,13 +32,13 @@ model BuildingSpawnZ1 k=0) "Latent heat gain" annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); - Buildings.ThermalZones.EnergyPlus.ThermalZone zon( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone zon( redeclare package Medium=Medium2, zoneName="Core_ZN", nPorts=2) "Thermal zone" annotation (Placement(transformation(extent={{40,-20},{80,20}}))); - inner Buildings.ThermalZones.EnergyPlus.Building building( + inner Buildings.ThermalZones.EnergyPlus_9_6_0.Building building( idfName=Modelica.Utilities.Files.loadResource( idfName), epwName=Modelica.Utilities.Files.loadResource( @@ -176,5 +176,5 @@ First implementation. graphics={ Bitmap( extent={{-108,-100},{92,100}}, - fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png")})); + fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/EnergyPlusLogo.png")})); end BuildingSpawnZ1; diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ6.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ6.mo index e18581f0d28..05b4d4164e4 100644 --- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ6.mo +++ b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ6.mo @@ -26,7 +26,7 @@ model BuildingSpawnZ6 nZon) ./ facMulTerUni "Design cooling heat flow rate (single terminal unit)" annotation (Dialog(group="Nominal condition")); - parameter String idfName="modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf" + parameter String idfName="modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf" "Name of the IDF file"; parameter String epwName="modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw" "Name of the weather file"; @@ -62,42 +62,42 @@ model BuildingSpawnZ6 k=0) "Latent heat gain" annotation (Placement(transformation(extent={{-60,64},{-40,84}}))); - Buildings.ThermalZones.EnergyPlus.ThermalZone znAttic( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone znAttic( redeclare package Medium=Medium2, zoneName="Attic") "Thermal zone" annotation (Placement(transformation(extent={{24,84},{64,124}}))); - Buildings.ThermalZones.EnergyPlus.ThermalZone znCore_ZN( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone znCore_ZN( redeclare package Medium=Medium2, zoneName="Core_ZN", nPorts=2) "Thermal zone" annotation (Placement(transformation(extent={{24,42},{64,82}}))); - Buildings.ThermalZones.EnergyPlus.ThermalZone znPerimeter_ZN_1( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone znPerimeter_ZN_1( redeclare package Medium=Medium2, zoneName="Perimeter_ZN_1", nPorts=2) "Thermal zone" annotation (Placement(transformation(extent={{24,0},{64,40}}))); - Buildings.ThermalZones.EnergyPlus.ThermalZone znPerimeter_ZN_2( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone znPerimeter_ZN_2( redeclare package Medium=Medium2, zoneName="Perimeter_ZN_2", nPorts=2) "Thermal zone" annotation (Placement(transformation(extent={{24,-40},{64,0}}))); - Buildings.ThermalZones.EnergyPlus.ThermalZone znPerimeter_ZN_3( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone znPerimeter_ZN_3( redeclare package Medium=Medium2, zoneName="Perimeter_ZN_3", nPorts=2) "Thermal zone" annotation (Placement(transformation(extent={{24,-80},{64,-40}}))); - Buildings.ThermalZones.EnergyPlus.ThermalZone znPerimeter_ZN_4( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone znPerimeter_ZN_4( redeclare package Medium=Medium2, zoneName="Perimeter_ZN_4", nPorts=2) "Thermal zone" annotation (Placement(transformation(extent={{24,-120},{64,-80}}))); - inner Buildings.ThermalZones.EnergyPlus.Building building( + inner Buildings.ThermalZones.EnergyPlus_9_6_0.Building building( idfName=Modelica.Utilities.Files.loadResource( idfName), epwName=Modelica.Utilities.Files.loadResource( @@ -280,5 +280,5 @@ First implementation. graphics={ Bitmap( extent={{-108,-100},{92,100}}, - fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png")})); + fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/EnergyPlusLogo.png")})); end BuildingSpawnZ6; diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo index db09d776c67..1f9b42bfd43 100644 --- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo +++ b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo @@ -85,8 +85,8 @@ secondary pumps.

Simulation with Dymola requires minimum version 2020x and setting Hidden.AvoidDoubleComputation=true, see - -Buildings.ThermalZones.EnergyPlus.UsersGuide. + +Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide.

", revisions=" diff --git a/Buildings/Resources/C-Sources/EnergyPlusWrapper.c b/Buildings/Resources/C-Sources/EnergyPlus_9_6_0_Wrapper.c similarity index 83% rename from Buildings/Resources/C-Sources/EnergyPlusWrapper.c rename to Buildings/Resources/C-Sources/EnergyPlus_9_6_0_Wrapper.c index 9dcb3a3e06e..45963bb4e2a 100644 --- a/Buildings/Resources/C-Sources/EnergyPlusWrapper.c +++ b/Buildings/Resources/C-Sources/EnergyPlus_9_6_0_Wrapper.c @@ -1,7 +1,7 @@ #ifndef Spawn_declared #define Spawn_declared -#include "EnergyPlusWrapper.h" +#include "EnergyPlus_9_6_0_Wrapper.h" /* ********************************************************* Wrapper functions that connect to the library which @@ -27,12 +27,13 @@ void my_printf(const char *fmt, ...) { } */ -void* ModelicaSpawnAllocate( +void* allocate_Modelica_EnergyPlus_9_6_0( const int objectType, double startTime, const char* modelicaNameBuilding, const char* modelicaNameThermalZone, const char* spawnExe, + const char* idfVersion, const char* idfName, const char* epwName, double relativeSurfaceTolerance, @@ -62,12 +63,13 @@ void* ModelicaSpawnAllocate( const double* derivatives_delta, const size_t nDer){ - return EnergyPlusSpawnAllocate( + return allocate_Spawn_EnergyPlus_9_6_0( objectType, startTime, modelicaNameBuilding, modelicaNameThermalZone, spawnExe, + idfVersion, idfName, epwName, relativeSurfaceTolerance, @@ -102,36 +104,36 @@ void* ModelicaSpawnAllocate( ModelicaFormatError); } -void ModelicaSpawnInitialize( +void initialize_Modelica_EnergyPlus_9_6_0( void* object, double isSynchronized, int *nObj){ - EnergyPlusSpawnInitialize(object, nObj); + initialize_Spawn_EnergyPlus_9_6_0(object, nObj); } -void ModelicaSpawnGetParameters( +void getParameters_Modelica_EnergyPlus_9_6_0( void* object, double isSynchronized, double *parOut){ - EnergyPlusSpawnGetParameters(object, parOut); + getParameters_Spawn_EnergyPlus_9_6_0(object, parOut); } -void ModelicaSpawnExchange( +void exchange_Modelica_EnergyPlus_9_6_0( void* object, int initialCall, const double* u, double dummy, double* y){ - EnergyPlusSpawnExchange( + exchange_Spawn_EnergyPlus_9_6_0( object, initialCall, u, y); } -void ModelicaSpawnFree(void* object){ - EnergyPlusSpawnObjectFree(object); +void free_Modelica_EnergyPlus_9_6_0(void* object){ + free_Spawn_EnergyPlus_9_6_0(object); } #endif diff --git a/Buildings/Resources/C-Sources/EnergyPlusWrapper.h b/Buildings/Resources/C-Sources/EnergyPlus_9_6_0_Wrapper.h similarity index 80% rename from Buildings/Resources/C-Sources/EnergyPlusWrapper.h rename to Buildings/Resources/C-Sources/EnergyPlus_9_6_0_Wrapper.h index bf4ad158bca..7989a118693 100644 --- a/Buildings/Resources/C-Sources/EnergyPlusWrapper.h +++ b/Buildings/Resources/C-Sources/EnergyPlus_9_6_0_Wrapper.h @@ -1,5 +1,5 @@ -#ifndef EnergyPlusWrapper_h -#define EnergyPlusWrapper_h +#ifndef EnergyPlus_9_6_0_Wrapper_h +#define EnergyPlus_9_6_0_Wrapper_h #include @@ -31,12 +31,13 @@ /* ********************************************************* */ /* Thermal zone */ -extern void* EnergyPlusSpawnAllocate( +extern void* allocate_Spawn_EnergyPlus_9_6_0( const int objectType, double startTime, const char* modelicaNameBuilding, const char* modelicaNameThermalZone, const char* spawnExe, + const char* idfVersion, const char* idfName, const char* epwName, double relativeSurfaceTolerance, @@ -70,16 +71,16 @@ extern void* EnergyPlusSpawnAllocate( void (*SpawnFormatMessage)(const char *string, ...), void (*SpawnFormatError)(const char *string, ...)); -extern void EnergyPlusSpawnInitialize(void* object, int *nObj); +extern void initialize_Spawn_EnergyPlus_9_6_0(void* object, int *nObj); -extern void EnergyPlusSpawnGetParameters(void* object, double *parOut); +extern void getParameters_Spawn_EnergyPlus_9_6_0(void* object, double *parOut); -extern void EnergyPlusSpawnExchange( +extern void exchange_Spawn_EnergyPlus_9_6_0( void* object, int initialCall, const double* u, double* y); -extern void EnergyPlusSpawnObjectFree(void* object); +extern void free_Spawn_EnergyPlus_9_6_0(void* object); #endif diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/EMSWindowShadeControl/EMSWindowShadeControl.idf b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/EMSWindowShadeControl/EMSWindowShadeControl.idf similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/EMSWindowShadeControl/EMSWindowShadeControl.idf rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/EMSWindowShadeControl/EMSWindowShadeControl.idf diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.dat b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.dat similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.dat rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.dat diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/csv_to_mos.py b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/csv_to_mos.py similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/csv_to_mos.py rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/csv_to_mos.py diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/run.sh b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/run.sh similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/run.sh rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/run.sh diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_NoOutput.idf b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_NoOutput.idf similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_NoOutput.idf rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_NoOutput.idf diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoilHighInfiltration.idf b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoilHighInfiltration.idf similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoilHighInfiltration.idf rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoilHighInfiltration.idf diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Validation/TwoIdenticalZones/TwoIdenticalZones.dat b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Validation/TwoIdenticalZones/TwoIdenticalZones.dat similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Validation/TwoIdenticalZones/TwoIdenticalZones.dat rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Validation/TwoIdenticalZones/TwoIdenticalZones.dat diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Validation/TwoIdenticalZones/TwoIdenticalZones.idf b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Validation/TwoIdenticalZones/TwoIdenticalZones.idf similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Validation/TwoIdenticalZones/TwoIdenticalZones.idf rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Validation/TwoIdenticalZones/TwoIdenticalZones.idf diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Validation/TwoIdenticalZones/csv_to_mos.py b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Validation/TwoIdenticalZones/csv_to_mos.py similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Validation/TwoIdenticalZones/csv_to_mos.py rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Validation/TwoIdenticalZones/csv_to_mos.py diff --git a/Buildings/Resources/Data/ThermalZones/EnergyPlus/Validation/TwoIdenticalZones/run.sh b/Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Validation/TwoIdenticalZones/run.sh similarity index 100% rename from Buildings/Resources/Data/ThermalZones/EnergyPlus/Validation/TwoIdenticalZones/run.sh rename to Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Validation/TwoIdenticalZones/run.sh diff --git a/Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png b/Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/EnergyPlusLogo.png similarity index 100% rename from Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png rename to Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/EnergyPlusLogo.png diff --git a/Buildings/Resources/Images/ThermalZones/EnergyPlus/envelope-room-hvac-1600.png b/Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/envelope-room-hvac-1600.png similarity index 100% rename from Buildings/Resources/Images/ThermalZones/EnergyPlus/envelope-room-hvac-1600.png rename to Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/envelope-room-hvac-1600.png diff --git a/Buildings/Resources/Images/ThermalZones/EnergyPlus/envelope-room-hvac.pdf b/Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/envelope-room-hvac.pdf similarity index 100% rename from Buildings/Resources/Images/ThermalZones/EnergyPlus/envelope-room-hvac.pdf rename to Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/envelope-room-hvac.pdf diff --git a/Buildings/Resources/Images/ThermalZones/EnergyPlus/envelope-room-hvac.svg b/Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/envelope-room-hvac.svg similarity index 100% rename from Buildings/Resources/Images/ThermalZones/EnergyPlus/envelope-room-hvac.svg rename to Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/envelope-room-hvac.svg diff --git a/Buildings/Resources/Library/linux64/libModelicaBuildingsEnergyPlus_9_6_0.so b/Buildings/Resources/Library/linux64/libModelicaBuildingsEnergyPlus_9_6_0.so new file mode 100644 index 00000000000..9c37767ac38 --- /dev/null +++ b/Buildings/Resources/Library/linux64/libModelicaBuildingsEnergyPlus_9_6_0.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10d337eb07a5e94d8f4582fbd806e3d8babd82d90e8286cd9887f3d26a93150a +size 77104 diff --git a/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus.dll b/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus.dll deleted file mode 100644 index 1aa8b0b404c..00000000000 --- a/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23d726fe7506ec99a03aa9493920f825086084b5a1ef203b147ffec0ecea24a8 -size 143360 diff --git a/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus.lib b/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus.lib deleted file mode 100644 index 43ea13b0540..00000000000 --- a/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5e260c36c12bb20141e96c9f5820f05d6b7f49686c74d78d25e739f19f99407 -size 3194 diff --git a/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus_9_6_0.dll b/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus_9_6_0.dll new file mode 100644 index 00000000000..d76b4901515 --- /dev/null +++ b/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus_9_6_0.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb3eb0e038d9214b689dee4014c080ea7610f044715ff19eaee869ebb9eee2d4 +size 144384 diff --git a/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus_9_6_0.lib b/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus_9_6_0.lib new file mode 100644 index 00000000000..7bda069e3e2 --- /dev/null +++ b/Buildings/Resources/Library/win64/ModelicaBuildingsEnergyPlus_9_6_0.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65989657c0e41ee7c9d4a0ef04d07d27ad31479b233d80bf1af21a573e2fe14a +size 3466 diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_BaseClasses_Validation_FMUZoneAdapterZones1.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_BaseClasses_Validation_FMUZoneAdapterZones1.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_BaseClasses_Validation_FMUZoneAdapterZones1.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_BaseClasses_Validation_FMUZoneAdapterZones1.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_BaseClasses_Validation_FMUZoneAdapterZones2.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_BaseClasses_Validation_FMUZoneAdapterZones2.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_BaseClasses_Validation_FMUZoneAdapterZones2.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_BaseClasses_Validation_FMUZoneAdapterZones2.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_BaseClasses_Validation_FMUZoneAdapterZones3.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_BaseClasses_Validation_FMUZoneAdapterZones3.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_BaseClasses_Validation_FMUZoneAdapterZones3.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_BaseClasses_Validation_FMUZoneAdapterZones3.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_AirHeating.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_AirHeating.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_AirHeating.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_AirHeating.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_EquipmentSchedule.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_EquipmentSchedule.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_EquipmentSchedule.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_EquipmentSchedule.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_LightsControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_LightsControl.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_LightsControl.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_LightsControl.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_RadiantHeatingCooling_TRoom.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TRoom.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_RadiantHeatingCooling_TRoom.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TRoom.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_RadiantHeatingCooling_TSurface.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TSurface.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_RadiantHeatingCooling_TSurface.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TSurface.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_RadiantHeatingWithGroundHeatTransfer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingWithGroundHeatTransfer.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_RadiantHeatingWithGroundHeatTransfer.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingWithGroundHeatTransfer.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_ShadeControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_ShadeControl.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_ShadeControl.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_ShadeControl.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_Unconditioned.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_Unconditioned.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SingleFamilyHouse_Unconditioned.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_Unconditioned.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_ASHRAE2006Spring.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Spring.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_ASHRAE2006Spring.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Spring.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_ASHRAE2006Summer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Summer.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_ASHRAE2006Summer.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Summer.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_ASHRAE2006Winter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Winter.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_ASHRAE2006Winter.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Winter.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_Guideline36Spring.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Spring.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_Guideline36Spring.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Spring.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_Guideline36Summer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Summer.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_Guideline36Summer.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Summer.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_Guideline36Winter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Winter.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_Guideline36Winter.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Winter.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_IdealHeatingCoolingSpring.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSpring.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_IdealHeatingCoolingSpring.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSpring.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_IdealHeatingCoolingSummer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSummer.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_IdealHeatingCoolingSummer.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSummer.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_IdealHeatingCoolingWinter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingWinter.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_IdealHeatingCoolingWinter.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingWinter.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_Unconditioned.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Unconditioned.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Examples_SmallOffice_Unconditioned.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Unconditioned.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_MultipleBuildings_ThreeZonesTwoBuildings.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_ThreeZonesTwoBuildings.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_MultipleBuildings_ThreeZonesTwoBuildings.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_ThreeZonesTwoBuildings.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_MultipleBuildings_TwoIdenticalOneZoneBuildings.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalOneZoneBuildings.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_MultipleBuildings_TwoIdenticalOneZoneBuildings.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalOneZoneBuildings.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_MultipleBuildings_TwoIdenticalTwoZoneBuildings.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalTwoZoneBuildings.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_MultipleBuildings_TwoIdenticalTwoZoneBuildings.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalTwoZoneBuildings.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_NoOutputVariable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_NoOutputVariable.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_NoOutputVariable.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_NoOutputVariable.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneEnvironmentOutputVariable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneEnvironmentOutputVariable.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneEnvironmentOutputVariable.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneEnvironmentOutputVariable.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneZoneOneOutputVariable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariable.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneZoneOneOutputVariable.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariable.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneZoneOneOutputVariableSummer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariableSummer.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneZoneOneOutputVariableSummer.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariableSummer.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneZoneOutputVariable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOutputVariable.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneZoneOutputVariable.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOutputVariable.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneZoneTwoDifferentOutputVariables.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoDifferentOutputVariables.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneZoneTwoDifferentOutputVariables.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoDifferentOutputVariables.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneZoneTwoIdenticalOutputVariables.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoIdenticalOutputVariables.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_OutputVariable_OneZoneTwoIdenticalOutputVariables.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoIdenticalOutputVariables.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_Schedule_EquipmentScheduleOutputVariable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_Schedule_EquipmentScheduleOutputVariable.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_Schedule_EquipmentScheduleOutputVariable.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_Schedule_EquipmentScheduleOutputVariable.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_SurfaceComparison_SurfaceComparison.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_SurfaceComparison_SurfaceComparison.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_SurfaceComparison_SurfaceComparison.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_SurfaceComparison_SurfaceComparison.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_Infiltration.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_Infiltration.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_Infiltration.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_Infiltration.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_InternalGain.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_InternalGain.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_InternalGain.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_InternalGain.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_OneZoneCompareZoneTemperatureOutput.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneCompareZoneTemperatureOutput.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_OneZoneCompareZoneTemperatureOutput.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneCompareZoneTemperatureOutput.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_OneZoneOneYear.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneOneYear.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_OneZoneOneYear.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneOneYear.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_RefBldgSmallOffice.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_RefBldgSmallOffice.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_RefBldgSmallOffice.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_RefBldgSmallOffice.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_TwoIdenticalZones.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_TwoIdenticalZones.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_TwoIdenticalZones.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_TwoIdenticalZones.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_ZoneTemperatureInitialization.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_ZoneTemperatureInitialization.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ThermalZone_ZoneTemperatureInitialization.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_ZoneTemperatureInitialization.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ZoneSurface_OneZoneConstantFloorTemperature.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneConstantFloorTemperature.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ZoneSurface_OneZoneConstantFloorTemperature.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneConstantFloorTemperature.txt diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ZoneSurface_OneZoneControlledFloorTemperature.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneControlledFloorTemperature.txt similarity index 100% rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_Validation_ZoneSurface_OneZoneControlledFloorTemperature.txt rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneControlledFloorTemperature.txt diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml index 5aef7a548b5..8d5a16d7d67 100644 --- a/Buildings/Resources/Scripts/BuildingsPy/conf.yml +++ b/Buildings/Resources/Scripts/BuildingsPy/conf.yml @@ -311,64 +311,64 @@ optimica: comment: Tolerance of 1E-7 would lead to very slow progress with commit fabaa64231692a2a2b6c044aff34f5ae6b3be868 rtol: 1.0e-08 -- model_name: Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Spring +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Spring openmodelica: comment: timed out after 300 seconds simulate: false optimica: rtol: 1.0e-07 -- model_name: Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Summer +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Summer openmodelica: comment: timed out after 300 seconds simulate: false optimica: comment: This causes a timeout on travis, but works locally. See https://travis-ci.com/github/lbl-srg/modelica-buildings/jobs/501193509#L635 simulate: false -- model_name: Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter openmodelica: comment: timed out after 300 seconds simulate: false optimica: comment: This causes a timeout on travis, but works locally. See https://travis-ci.com/github/lbl-srg/modelica-buildings/jobs/501193509#L635 simulate: false -- model_name: Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Spring +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Spring openmodelica: comment: timed out after 300 seconds simulate: false optimica: rtol: 1.0e-07 -- model_name: Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Summer +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Summer openmodelica: comment: timed out after 300 seconds simulate: false optimica: rtol: 1.0e-07 -- model_name: Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter openmodelica: comment: timed out after 300 seconds simulate: false optimica: rtol: 1.0e-07 -- model_name: Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingSpring +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingSpring openmodelica: comment: returned non-zero exit status 255. simulate: false optimica: rtol: 1.0e-08 -- model_name: Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingSummer +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingSummer openmodelica: comment: returned non-zero exit status 255. simulate: false optimica: rtol: 1.0e-08 -- model_name: Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingWinter +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingWinter optimica: rtol: 1.0e-08 -- model_name: Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Unconditioned +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Unconditioned optimica: comment: 'Failed with RuntimeError: Process timeout after 300 seconds. Since oct-r26446.' simulate: false -- model_name: Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings +- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings openmodelica: comment: returned non-zero exit status 139. simulate: false diff --git a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_8_to_9.0.0.mos b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_8_to_9.0.0.mos index 0fd6d70ef93..c2fb49ef4fc 100644 --- a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_8_to_9.0.0.mos +++ b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_8_to_9.0.0.mos @@ -131,8 +131,8 @@ convertClass("Buildings.Controls.OBC.CDL.Types.Day", "Buildings.Obsolete.Controls.OBC.CDL.Types.Day"); // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/2759 -convertModifiers("Buildings.ThermalZones.EnergyPlus.Building", {"showWeatherData"}, fill("",0), true); -convertModifiers("Buildings.ThermalZones.EnergyPlus.Building", {"generatePortableFMU"}, fill("",0), true); +convertModifiers("Buildings.ThermalZones.EnergyPlus_9_6_0.Building", {"showWeatherData"}, fill("",0), true); +convertModifiers("Buildings.ThermalZones.EnergyPlus_9_6_0.Building", {"generatePortableFMU"}, fill("",0), true); // Conversion for https://github.com/ibpsa/modelica-ibpsa/issues/1522 convertClass("Buildings.Controls.Continuous.PIDHysteresisTimer", diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/EquipmentSchedule.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/EquipmentSchedule.mos deleted file mode 100644 index ef7fd3dfed0..00000000000 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/EquipmentSchedule.mos +++ /dev/null @@ -1,2 +0,0 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.EquipmentSchedule", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="EquipmentSchedule"); -createPlot(id=1, position={255, 85, 590, 557}, y={"zon.TAir"}, range={0.0, 90000.0, 17.0, 21.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/NoOutputVariable.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/NoOutputVariable.mos deleted file mode 100644 index e897a57b696..00000000000 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/NoOutputVariable.mos +++ /dev/null @@ -1,2 +0,0 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.NoOutputVariable", stopTime=86400, method="Cvode", tolerance=1e-06, resultFile="NoOutputVariable"); -createPlot(id=1, position={255, 85, 590, 557}, y={"zon.TAir"}, range={0.0, 86400, 17.0, 21.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneEnvironmentOutputVariable.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneEnvironmentOutputVariable.mos deleted file mode 100644 index 1e2f7c706e8..00000000000 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneEnvironmentOutputVariable.mos +++ /dev/null @@ -1,2 +0,0 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneEnvironmentOutputVariable", startTime=864000, stopTime=950400, method="Cvode", tolerance=1e-06, resultFile="OneEnvironmentOutputVariable"); -createPlot(id=1, position={50, 88, 592, 372}, y={"TEnePlu.y", "building.weaBus.TDryBul"}, range={10.0, 11.0, -6.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"degC", "degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOutputVariable.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOutputVariable.mos deleted file mode 100644 index 1464af9570d..00000000000 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOutputVariable.mos +++ /dev/null @@ -1,2 +0,0 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOutputVariable", startTime=864000, stopTime=950400, method="Cvode", tolerance=1e-06, resultFile="OneZoneOutputVariable"); -createPlot(id=1, position={50, 88, 965, 650}, y={"TEnePlu.y"}, range={10.0, 11.0, 4.0, 17.0}, grid=true, colors={{28,108,200}}, timeUnit="d", displayUnits={"degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneOneYear.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneOneYear.mos deleted file mode 100644 index 07656275d09..00000000000 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneOneYear.mos +++ /dev/null @@ -1,2 +0,0 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.OneZoneOneYear", stopTime=31536000, method="Cvode", tolerance=1e-06, resultFile="OneZoneOneYear"); -createPlot(id=1, position={255, 85, 590, 557}, y={"TAirMea.y"}, range={0.0, 90000.0, 17.0, 21.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mos similarity index 61% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mos index d7a57d31f7a..230f210a4bb 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mos @@ -1,3 +1,3 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones1", stopTime=3600, method="Cvode", tolerance=1e-06, resultFile="FMUZoneAdapterZones1"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones1", stopTime=3600, method="Cvode", tolerance=1e-06, resultFile="FMUZoneAdapterZones1"); createPlot(id=1, position={95, 90, 1092, 1001}, y={"fmuZonCor.T"}, range={0.0, 3600.0, 270.0, 295.0}, grid=true, colors={{28,108,200}}); createPlot(id=1, position={95, 90, 1092, 498}, y={"fmuZonCor.QCon_flow"}, range={0.0, 3600.0, -16000.0, 6000.0}, grid=true, subPlot=2, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mos similarity index 74% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mos index 09c24224e67..eaad1c20801 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mos @@ -1,6 +1,6 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones2", stopTime=3600, method="Cvode", tolerance=1e-06, resultFile="FMUZoneAdapterZones2"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones2", stopTime=3600, method="Cvode", tolerance=1e-06, resultFile="FMUZoneAdapterZones2"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=1, position={95, 90, 1092, 1001}, y={"fmuZonCor.T", "fmuZonSou.T"}, range={0.0, 3600.0, 270.0, 295.0}, grid=true, colors={{28,108,200}, {238,46,47}}); createPlot(id=1, position={95, 90, 1092, 498}, y={"fmuZonCor.QCon_flow", "fmuZonSou.QCon_flow"}, range={0.0, 3600.0, -16000.0, 6000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mos similarity index 76% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mos index 70433986f13..8c5ddc24aeb 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mos @@ -1,6 +1,6 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones3", stopTime=3600, method="Cvode", tolerance=1e-06, resultFile="FMUZoneAdapterZones3"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones3", stopTime=3600, method="Cvode", tolerance=1e-06, resultFile="FMUZoneAdapterZones3"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=1, position={95, 90, 1092, 1001}, y={"fmuZonCor.T", "fmuZonNor.T", "fmuZonSou.T"}, range={0.0, 3600.0, 270.0, 295.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}); createPlot(id=1, position={95, 90, 1092, 498}, y={"fmuZonCor.QCon_flow", "fmuZonSou.QCon_flow", "fmuZonNor.QCon_flow"}, range={0.0, 3600.0, -16000.0, 6000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/AirHeating.mos similarity index 80% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/AirHeating.mos index 96f151097d8..330ca8546a3 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/AirHeating.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.AirHeating", stopTime=86400, method="Cvode", tolerance=1e-06, resultFile="AirHeating"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.AirHeating", stopTime=86400, method="Cvode", tolerance=1e-06, resultFile="AirHeating"); createPlot(id=1, position={113, 195, 1189, 975}, y={"zon.TAir", "TSet.y"}, range={0.0, 25.0, 10.0, 25.0}, grid=true, colors={{28,108,200}, {238,46,47}}, timeUnit="h", displayUnits={"degC", "degC"}); createPlot(id=1, position={113, 195, 1189, 975}, y={"conPID.y"}, range={0.0, 25.0, -1.0, 2.0}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="h"); createPlot(id=1, position={113, 195, 1189, 975}, y={"hea.m_flow"}, range={0.0, 25.0, -1.0, 2.0}, grid=true, subPlot=103, colors={{0,140,72}}, timeUnit="h", displayUnits={"kg/s"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/EquipmentSchedule.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/EquipmentSchedule.mos new file mode 100644 index 00000000000..07c4a7011f6 --- /dev/null +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/EquipmentSchedule.mos @@ -0,0 +1,2 @@ +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.EquipmentSchedule", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="EquipmentSchedule"); +createPlot(id=1, position={255, 85, 590, 557}, y={"zon.TAir"}, range={0.0, 90000.0, 17.0, 21.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/LightsControl.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/LightsControl.mos similarity index 67% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/LightsControl.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/LightsControl.mos index 8d226f56374..28389ff9679 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/LightsControl.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/LightsControl.mos @@ -1,3 +1,3 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.LightsControl", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="LightControl"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.LightsControl", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="LightControl"); createPlot(id=1, position={15, 15, 778, 758}, y={"PLig.y", "ligPow.y"}, range={0.0, 50.0, -500.0, 1500.0}, grid=true, colors={{28,108,200}, {238,46,47}}, timeUnit="h", displayUnits={"", "W"}); createPlot(id=1, position={15, 15, 778, 758}, y={"zon.TAir"}, range={0.0, 50.0, 0.0, 25.0}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="h", displayUnits={"degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mos similarity index 85% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mos index d99517a699e..e67f3670b24 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom", startTime=7776000, stopTime=9504000, method="Cvode", tolerance=1e-06, resultFile="RadiantHeatingCooling_TRoom"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom", startTime=7776000, stopTime=9504000, method="Cvode", tolerance=1e-06, resultFile="RadiantHeatingCooling_TRoom"); createPlot(id=1, position={15, 15, 1380, 1145}, y={"livFlo.heaPorFro.T", "zon.TAir", "TSetRooHea.y", "TSetRooCoo.y", "attFlo.heaPorBac.T"}, range={90.0, 110.0, 15.0, 30.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC"}); createPlot(id=1, position={15, 15, 1380, 1145}, y={"conHea.y", "conCoo.y"}, range={90.0, 110.0, -0.5, 1.5}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d"); createPlot(id=1, position={15, 15, 1380, 1145}, y={"livFlo.qFro_flow", "livFlo.qBac_flow", "attFlo.qFro_flow", "attFlo.qBac_flow"}, range={90.0, 110.0, -100.0, 100.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W/m2", "W/m2", "W/m2", "W/m2"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mos similarity index 85% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mos index 6bbd3d266eb..63b7db95be1 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface", startTime=7776000, stopTime=9504000, method="Cvode", tolerance=1e-06, resultFile="RadiantHeatingCooling_TSurface"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface", startTime=7776000, stopTime=9504000, method="Cvode", tolerance=1e-06, resultFile="RadiantHeatingCooling_TSurface"); createPlot(id=1, position={15, 15, 1380, 1145}, y={"livFlo.heaPorFro.T", "zon.TAir", "TSetRooHea.y", "conCoo.TSurSet", "conCoo.TSur"}, range={90.0, 110.0, 15.0, 30.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC"}); createPlot(id=1, position={15, 15, 1380, 1145}, y={"conHea.y", "conCoo.y"}, range={90.0, 110.0, -0.5, 1.5}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d"); createPlot(id=1, position={15, 15, 1380, 1145}, y={"livFlo.qFro_flow", "livFlo.qBac_flow", "attFlo.qFro_flow", "attFlo.qBac_flow"}, range={90.0, 110.0, -100.0, 100.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W/m2", "W/m2", "W/m2", "W/m2"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mos similarity index 78% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mos index c624d6bd0df..d71e14fc33e 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="RadiantHeatingWithGroundHeatTransfer"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="RadiantHeatingWithGroundHeatTransfer"); createPlot(id=1, position={15, 15, 1380, 1145}, y={"livFlo.T", "zon.TAir", "TSetRooHea.y"}, range={0.0, 5.0, 15.0, 30.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}, timeUnit="d", displayUnits={"degC", "degC", "degC"}); createPlot(id=1, position={15, 15, 1380, 1145}, y={"conHea.y"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="d"); createPlot(id=1, position={15, 15, 1380, 1145}, y={"livFlo.q_flow"}, range={0.0, 5.0, -60.0, 0.0}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="d", displayUnits={"W/m2"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/ShadeControl.mos similarity index 82% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/ShadeControl.mos index 13805679163..b6f080654bf 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/ShadeControl.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.ShadeControl", startTime=8640000, stopTime=8899200, method="Cvode", tolerance=1e-06, resultFile="ShadeControl"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.ShadeControl", startTime=8640000, stopTime=8899200, method="Cvode", tolerance=1e-06, resultFile="ShadeControl"); createPlot(id=1, position={75, 16, 1089, 1151}, y={"shaT.THigh", "shaT.TLow", "zonWes.TAir"}, range={100.0, 103.0, 15.0, 30.0}, grid=true, colors={{238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"degC", "degC", "degC"}); createPlot(id=1, position={75, 16, 1089, 1151}, y={"shaH.H", "shaH.HHigh", "shaH.HLow"}, range={100.0, 103.0, -200.0, 600.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}}, timeUnit="d", displayUnits={"W/m2", "W/m2", "W/m2"}); createPlot(id=1, position={75, 16, 1089, 1151}, y={"shaT.y", "shaH.y", "cooWes.conPID.y"}, range={100.0, 103.0, -0.5, 1.5}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}}, timeUnit="d", displayUnits={"1", "1", ""}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Unconditioned.mos similarity index 64% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Unconditioned.mos index 40bff840036..3b3bb04a9ee 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Unconditioned.mos @@ -1,3 +1,3 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="Unconditioned"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="Unconditioned"); createPlot(id=1, position={255, 85, 590, 557}, y={"zon.TAir"}, range={0.0, 90000.0, 17.0, 21.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); createPlot(id=1, position={255, 85, 590, 276}, y={"zon.V", "zon.AFlo"}, range={0.0, 90000.0, -50.0, 100.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Spring.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Spring.mos similarity index 88% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Spring.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Spring.mos index 98e679bb682..a1fd17606dc 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Spring.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Spring.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Spring", startTime=7344000, stopTime=7776000, method="cvode", tolerance=1e-07, resultFile="ASHRAE2006Spring"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Spring", startTime=7344000, stopTime=7776000, method="cvode", tolerance=1e-07, resultFile="ASHRAE2006Spring"); createPlot(id=1, position={26, 33, 1068, 1127}, y={"flo.sou.TAir", "flo.eas.TAir", "flo.nor.TAir", "flo.wes.TAir", "flo.cor.TAir", "hvac.TSetRoo.setPoiHea.y", "hvac.TSetRoo.setPoiCoo.y"}, range={85.0, 90.0, 10.0, 35.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC", "degC", "degC"}); createPlot(id=1, position={26, 33, 1068, 1127}, y={"hvac.fanSup.y", "hvac.VAVBox[5].vav.y_actual", "hvac.VAVBox[1].vav.y_actual", "hvac.VAVBox[2].vav.y_actual", "hvac.VAVBox[3].vav.y_actual", "hvac.VAVBox[4].vav.y_actual", "hvac.damOut.y"}, range={85.0, 90.0, -0.2, 1.2000000000000002}, grid=true, subPlot=102, colors={{162,29,33}, {238,46,47}, {28,108,200}, {0,140,72}, {217,67,180}, {0,0,0}, {244,125,35}}, thicknesses={0.5, 0.25, 0.25, 0.25, 0.25, 0.25, 0.5}, timeUnit="d", displayUnits={"1", "", "", "", "", "", "1"}); createPlot(id=1, position={26, 33, 1068, 1127}, y={"hvac.VAVBox[1].TSup", "hvac.VAVBox[2].TSup", "hvac.VAVBox[3].TSup", "hvac.VAVBox[4].TSup", "hvac.VAVBox[5].TSup"}, range={85.0, 90.0, 5.0, 40.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Summer.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Summer.mos similarity index 88% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Summer.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Summer.mos index fb57606da99..40cbe37dd03 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Summer.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Summer.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Summer", startTime=16848000, stopTime=17280000, method="cvode", tolerance=1e-07, resultFile="ASHRAE2006Summer"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Summer", startTime=16848000, stopTime=17280000, method="cvode", tolerance=1e-07, resultFile="ASHRAE2006Summer"); createPlot(id=1, position={26, 33, 1068, 1127}, y={"flo.sou.TAir", "flo.eas.TAir", "flo.nor.TAir", "flo.wes.TAir", "flo.cor.TAir", "hvac.TSetRoo.setPoiHea.y", "hvac.TSetRoo.setPoiCoo.y"}, range={85.0, 90.0, 10.0, 35.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC", "degC", "degC"}); createPlot(id=1, position={26, 33, 1068, 1127}, y={"hvac.fanSup.y", "hvac.VAVBox[5].vav.y_actual", "hvac.VAVBox[1].vav.y_actual", "hvac.VAVBox[2].vav.y_actual", "hvac.VAVBox[3].vav.y_actual", "hvac.VAVBox[4].vav.y_actual", "hvac.damOut.y"}, range={85.0, 90.0, -0.2, 1.2000000000000002}, grid=true, subPlot=102, colors={{162,29,33}, {238,46,47}, {28,108,200}, {0,140,72}, {217,67,180}, {0,0,0}, {244,125,35}}, thicknesses={0.5, 0.25, 0.25, 0.25, 0.25, 0.25, 0.5}, timeUnit="d", displayUnits={"1", "", "", "", "", "", "1"}); createPlot(id=1, position={26, 33, 1068, 1127}, y={"hvac.VAVBox[1].TSup", "hvac.VAVBox[2].TSup", "hvac.VAVBox[3].TSup", "hvac.VAVBox[4].TSup", "hvac.VAVBox[5].TSup"}, range={85.0, 90.0, 5.0, 40.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Winter.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Winter.mos similarity index 88% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Winter.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Winter.mos index a43f018edfb..f0cefdbad30 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Winter.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Winter.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter", startTime=432000, stopTime=864000, method="cvode", tolerance=1e-07, resultFile="ASHRAE2006Winter"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter", startTime=432000, stopTime=864000, method="cvode", tolerance=1e-07, resultFile="ASHRAE2006Winter"); createPlot(id=1, position={26, 33, 1068, 1127}, y={"flo.sou.TAir", "flo.eas.TAir", "flo.nor.TAir", "flo.wes.TAir", "flo.cor.TAir", "hvac.TSetRoo.setPoiHea.y", "hvac.TSetRoo.setPoiCoo.y"}, range={85.0, 90.0, 10.0, 35.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC", "degC", "degC"}); createPlot(id=1, position={26, 33, 1068, 1127}, y={"hvac.fanSup.y", "hvac.VAVBox[5].vav.y_actual", "hvac.VAVBox[1].vav.y_actual", "hvac.VAVBox[2].vav.y_actual", "hvac.VAVBox[3].vav.y_actual", "hvac.VAVBox[4].vav.y_actual", "hvac.damOut.y"}, range={85.0, 90.0, -0.2, 1.2000000000000002}, grid=true, subPlot=102, colors={{162,29,33}, {238,46,47}, {28,108,200}, {0,140,72}, {217,67,180}, {0,0,0}, {244,125,35}}, thicknesses={0.5, 0.25, 0.25, 0.25, 0.25, 0.25, 0.5}, timeUnit="d", displayUnits={"1", "", "", "", "", "", "1"}); createPlot(id=1, position={26, 33, 1068, 1127}, y={"hvac.VAVBox[1].TSup", "hvac.VAVBox[2].TSup", "hvac.VAVBox[3].TSup", "hvac.VAVBox[4].TSup", "hvac.VAVBox[5].TSup"}, range={85.0, 90.0, 5.0, 40.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Spring.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Spring.mos similarity index 88% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Spring.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Spring.mos index dffb4e6eb0d..76f7ef700e9 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Spring.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Spring.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Spring", startTime=7344000, stopTime=7776000, method="Cvode", tolerance=1e-07, resultFile="Guideline36Spring"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Spring", startTime=7344000, stopTime=7776000, method="Cvode", tolerance=1e-07, resultFile="Guideline36Spring"); createPlot(id=1, position={26, 33, 1068, 1127}, y={"flo.sou.TAir", "flo.eas.TAir", "flo.nor.TAir", "flo.wes.TAir", "flo.cor.TAir", "hvac.TZonSet[1].TZonCooSet", "hvac.TZonSet[1].TZonHeaSet"}, range={195.0, 200.0, 10.0, 35.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}}, timeUnit="d"); createPlot(id=1, position={26, 33, 1068, 1127}, y={"hvac.fanSup.y", "hvac.VAVBox[5].vav.y_actual", "hvac.VAVBox[1].vav.y_actual", "hvac.VAVBox[2].vav.y_actual", "hvac.VAVBox[3].vav.y_actual", "hvac.VAVBox[4].vav.y_actual", "hvac.damOut.y"}, range={85.0, 90.0, -0.2, 1.2000000000000002}, grid=true, subPlot=102, colors={{162,29,33}, {238,46,47}, {28,108,200}, {0,140,72}, {217,67,180}, {0,0,0}, {244,125,35}}, thicknesses={0.5, 0.25, 0.25, 0.25, 0.25, 0.25, 0.5}, timeUnit="d", displayUnits={"1", "", "", "", "", "", "1"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Summer.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Summer.mos similarity index 88% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Summer.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Summer.mos index e52a7c6e34e..1ccd64d1a8e 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Summer.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Summer.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Summer", startTime=16848000, stopTime=17280000, method="Cvode", tolerance=1e-07, resultFile="Guideline36Summer"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Summer", startTime=16848000, stopTime=17280000, method="Cvode", tolerance=1e-07, resultFile="Guideline36Summer"); createPlot(id=1, position={26, 33, 1068, 1127}, y={"flo.sou.TAir", "flo.eas.TAir", "flo.nor.TAir", "flo.wes.TAir", "flo.cor.TAir", "hvac.TZonSet[1].TZonCooSet", "hvac.TZonSet[1].TZonHeaSet"}, range={195.0, 200.0, 10.0, 35.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}}, timeUnit="d"); createPlot(id=1, position={26, 33, 1068, 1127}, y={"hvac.fanSup.y", "hvac.VAVBox[5].vav.y_actual", "hvac.VAVBox[1].vav.y_actual", "hvac.VAVBox[2].vav.y_actual", "hvac.VAVBox[3].vav.y_actual", "hvac.VAVBox[4].vav.y_actual", "hvac.damOut.y"}, range={85.0, 90.0, -0.2, 1.2000000000000002}, grid=true, subPlot=102, colors={{162,29,33}, {238,46,47}, {28,108,200}, {0,140,72}, {217,67,180}, {0,0,0}, {244,125,35}}, thicknesses={0.5, 0.25, 0.25, 0.25, 0.25, 0.25, 0.5}, timeUnit="d", displayUnits={"1", "", "", "", "", "", "1"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Winter.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Winter.mos similarity index 88% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Winter.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Winter.mos index e9c18044ae8..269a331025e 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Winter.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Winter.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter", startTime=432000, stopTime=864000, method="cvode", tolerance=1e-07, resultFile="Guideline36Winter"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter", startTime=432000, stopTime=864000, method="cvode", tolerance=1e-07, resultFile="Guideline36Winter"); createPlot(id=1, position={26, 33, 1068, 1127}, y={"flo.sou.TAir", "flo.eas.TAir", "flo.nor.TAir", "flo.wes.TAir", "flo.cor.TAir", "hvac.TZonSet[1].TZonCooSet", "hvac.TZonSet[1].TZonHeaSet"}, range={195.0, 200.0, 10.0, 35.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}}, timeUnit="d"); createPlot(id=1, position={26, 33, 1068, 1127}, y={"hvac.fanSup.y", "hvac.VAVBox[5].vav.y_actual", "hvac.VAVBox[1].vav.y_actual", "hvac.VAVBox[2].vav.y_actual", "hvac.VAVBox[3].vav.y_actual", "hvac.VAVBox[4].vav.y_actual", "hvac.damOut.y"}, range={85.0, 90.0, -0.2, 1.2000000000000002}, grid=true, subPlot=102, colors={{162,29,33}, {238,46,47}, {28,108,200}, {0,140,72}, {217,67,180}, {0,0,0}, {244,125,35}}, thicknesses={0.5, 0.25, 0.25, 0.25, 0.25, 0.25, 0.5}, timeUnit="d", displayUnits={"1", "", "", "", "", "", "1"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSpring.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSpring.mos similarity index 87% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSpring.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSpring.mos index a5da859a79b..f256148a1a5 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSpring.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSpring.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingSpring", startTime=7344000, stopTime=7776000, method="Radau", tolerance=1e-06, resultFile="IdealHeatingCoolingSpring"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingSpring", startTime=7344000, stopTime=7776000, method="Radau", tolerance=1e-06, resultFile="IdealHeatingCoolingSpring"); createPlot(id=1, position={15, 15, 1496, 1040}, y={"flo.TAirCor", "flo.TAirSou", "flo.TAirNor", "flo.TAirEas", "flo.TAirWes"}, range={5.0, 10.0, 0.0, 40.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC"}); createPlot(id=1, position={15, 15, 1496, 1040}, y={"hea[1].conPID.y", "hea[2].conPID.y", "hea[3].conPID.y", "hea[4].conPID.y", "hea[5].conPID.y"}, range={5.0, 10.0, -1.0, 2.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d"); createPlot(id=1, position={15, 15, 1496, 1040}, y={"flo.sou.heaPorAir.Q_flow", "flo.eas.heaPorAir.Q_flow", "flo.nor.heaPorAir.Q_flow", "flo.wes.heaPorAir.Q_flow", "flo.cor.heaPorAir.Q_flow"}, range={5.0, 10.0, -10000.0, 20000.0}, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"W", "W", "W", "W", "W"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSummer.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSummer.mos similarity index 87% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSummer.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSummer.mos index 6084ad1205c..0a19c8e11a8 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSummer.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSummer.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingSummer", startTime=16848000, stopTime=17280000, method="Radau", tolerance=1e-06, resultFile="IdealHeatingCoolingSummer"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingSummer", startTime=16848000, stopTime=17280000, method="Radau", tolerance=1e-06, resultFile="IdealHeatingCoolingSummer"); createPlot(id=1, position={15, 15, 1496, 1040}, y={"flo.TAirCor", "flo.TAirSou", "flo.TAirNor", "flo.TAirEas", "flo.TAirWes"}, range={5.0, 10.0, 0.0, 40.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC"}); createPlot(id=1, position={15, 15, 1496, 1040}, y={"hea[1].conPID.y", "hea[2].conPID.y", "hea[3].conPID.y", "hea[4].conPID.y", "hea[5].conPID.y"}, range={5.0, 10.0, -1.0, 2.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d"); createPlot(id=1, position={15, 15, 1496, 1040}, y={"flo.sou.heaPorAir.Q_flow", "flo.eas.heaPorAir.Q_flow", "flo.nor.heaPorAir.Q_flow", "flo.wes.heaPorAir.Q_flow", "flo.cor.heaPorAir.Q_flow"}, range={5.0, 10.0, -10000.0, 20000.0}, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"W", "W", "W", "W", "W"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingWinter.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingWinter.mos similarity index 87% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingWinter.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingWinter.mos index 9144d98ece3..64d0b846315 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingWinter.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingWinter.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingWinter", startTime=432000, stopTime=864000, method="Radau", tolerance=1e-06, resultFile="IdealHeatingCoolingWinter"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingWinter", startTime=432000, stopTime=864000, method="Radau", tolerance=1e-06, resultFile="IdealHeatingCoolingWinter"); createPlot(id=1, position={15, 15, 1496, 1040}, y={"flo.TAirCor", "flo.TAirSou", "flo.TAirNor", "flo.TAirEas", "flo.TAirWes"}, range={5.0, 10.0, 0.0, 40.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC", "degC"}); createPlot(id=1, position={15, 15, 1496, 1040}, y={"hea[1].conPID.y", "hea[2].conPID.y", "hea[3].conPID.y", "hea[4].conPID.y", "hea[5].conPID.y"}, range={5.0, 10.0, -1.0, 2.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d"); createPlot(id=1, position={15, 15, 1496, 1040}, y={"flo.sou.heaPorAir.Q_flow", "flo.eas.heaPorAir.Q_flow", "flo.nor.heaPorAir.Q_flow", "flo.wes.heaPorAir.Q_flow", "flo.cor.heaPorAir.Q_flow"}, range={5.0, 10.0, -10000.0, 20000.0}, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"W", "W", "W", "W", "W"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Unconditioned.mos similarity index 63% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Unconditioned.mos index 3a031fc8c6d..17cb2a0c802 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Unconditioned.mos @@ -1,2 +1,2 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Unconditioned", stopTime=172800, method="Radau", tolerance=1e-06, resultFile="OfficeUnconditioned"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Unconditioned", stopTime=172800, method="Radau", tolerance=1e-06, resultFile="OfficeUnconditioned"); createPlot(id=5, position={55, 50, 1783, 995}, y={"weaDat.weaBus.TDryBul", "flo.att.TAir", "flo.sou.TAir", "flo.eas.TAir", "flo.nor.TAir", "flo.wes.TAir", "flo.cor.TAir"}, range={0.0, 2.0, -15.0, 25.0}, grid=true, colors={{28,108,200}, {244,125,35}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mos similarity index 67% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mos index 35486eb9675..2a6ca8ee700 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mos @@ -1,5 +1,5 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.ThreeZonesTwoBuildings", stopTime=86400, method="Cvode", tolerance=1e-06, resultFile="ThreeZonesTwoBuildings"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.ThreeZonesTwoBuildings", stopTime=86400, method="Cvode", tolerance=1e-06, resultFile="ThreeZonesTwoBuildings"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=1, position={15, 10, 590, 420}, y={"zon1.zon.TAir", "zon2.zon1.TAir", "zon2.zon2.TAir"}, range={0.0, 100000.0, -50000.0, 200000.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}, displayUnits={"degC", "degC", "degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mos similarity index 64% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mos index f75698d5ea3..4db1b864cd8 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mos @@ -1,5 +1,5 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="TwoIdenticalOneZoneBuildings"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="TwoIdenticalOneZoneBuildings"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=1, position={75, 75, 542, 347}, y={"bui[1].zon.TAir", "bui[2].zon.TAir"}, range={0.0, 200000.0, 10.0, 25.0}, grid=true, colors={{28,108,200}, {238,46,47}}, displayUnits={"degC", "degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mos similarity index 69% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mos index 8b4e693affb..26fde55bcf8 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mos @@ -1,5 +1,5 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="TwoIdenticalTwoZoneBuildings"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="TwoIdenticalTwoZoneBuildings"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=1, position={75, 75, 678, 485}, y={"bui[1].zon1.TAir", "bui[1].zon2.TAir", "bui[1].TAirEnePlu.y", "bui[2].zon1.TAir", "bui[2].zon2.TAir", "bui[2].TAirEnePlu.y"}, range={0.0, 50.0, 16.0, 24.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}}, timeUnit="h"); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/NoOutputVariable.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/NoOutputVariable.mos new file mode 100644 index 00000000000..de525255752 --- /dev/null +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/NoOutputVariable.mos @@ -0,0 +1,2 @@ +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.NoOutputVariable", stopTime=86400, method="Cvode", tolerance=1e-06, resultFile="NoOutputVariable"); +createPlot(id=1, position={255, 85, 590, 557}, y={"zon.TAir"}, range={0.0, 86400, 17.0, 21.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneEnvironmentOutputVariable.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneEnvironmentOutputVariable.mos new file mode 100644 index 00000000000..a643952176a --- /dev/null +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneEnvironmentOutputVariable.mos @@ -0,0 +1,2 @@ +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneEnvironmentOutputVariable", startTime=864000, stopTime=950400, method="Cvode", tolerance=1e-06, resultFile="OneEnvironmentOutputVariable"); +createPlot(id=1, position={50, 88, 592, 372}, y={"TEnePlu.y", "building.weaBus.TDryBul"}, range={10.0, 11.0, -6.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"degC", "degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariable.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariable.mos similarity index 70% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariable.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariable.mos index 01efa72e4ba..7a2d7060c24 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariable.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariable.mos @@ -1,6 +1,6 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariable", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="OneZoneOneOutputVariable"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOneOutputVariable", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="OneZoneOneOutputVariable"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=1, position={103, 430, 809, 632}, y={"zon.TAir"}, range={0.0, 450000.0, 12.0, 22.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); createPlot(id=1, position={103, 430, 809, 314}, y={"equEle.y"}, range={0.0, 450000.0, -200.0, 600.0}, grid=true, subPlot=2, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mos similarity index 67% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mos index bb6f18d180a..258b64fca74 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mos @@ -1,6 +1,6 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariableSummer", startTime=18748800, stopTime=19353600, method="Cvode", tolerance=1e-06, resultFile="OneZoneOneOutputVariableSummer"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOneOutputVariableSummer", startTime=18748800, stopTime=19353600, method="Cvode", tolerance=1e-06, resultFile="OneZoneOneOutputVariableSummer"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=1, position={103, 430, 809, 632}, y={"zon.TAir"}, range={0.0, 450000.0, 12.0, 22.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); createPlot(id=1, position={103, 430, 809, 314}, y={"equEle.y"}, range={0.0, 450000.0, -200.0, 600.0}, grid=true, subPlot=2, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOutputVariable.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOutputVariable.mos new file mode 100644 index 00000000000..1dd6bf344c1 --- /dev/null +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOutputVariable.mos @@ -0,0 +1,2 @@ +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOutputVariable", startTime=864000, stopTime=950400, method="Cvode", tolerance=1e-06, resultFile="OneZoneOutputVariable"); +createPlot(id=1, position={50, 88, 965, 650}, y={"TEnePlu.y"}, range={10.0, 11.0, 4.0, 17.0}, grid=true, colors={{28,108,200}}, timeUnit="d", displayUnits={"degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mos similarity index 74% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mos index 352729bb541..1810912ce8d 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mos @@ -1,6 +1,6 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoDifferentOutputVariables", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="OneZoneTwoDifferentOutputVariables"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneTwoDifferentOutputVariables", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="OneZoneTwoDifferentOutputVariables"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=1, position={88, 209, 809, 632}, y={"zon.TAir"}, range={0.0, 450000.0, 10.0, 25.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); createPlot(id=1, position={88, 209, 809, 208}, y={"equEle.y"}, range={0.0, 450000.0, 0.0, 1500.0}, grid=true, subPlot=2, colors={{28,108,200}}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mos similarity index 69% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mos index 97f46f7aa46..88c5ea8aaed 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mos @@ -1,6 +1,6 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoIdenticalOutputVariables", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="OneZoneTwoIdenticalOutputVariables"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneTwoIdenticalOutputVariables", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="OneZoneTwoIdenticalOutputVariables"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=1, position={88, 209, 809, 632}, y={"zon.TAir"}, range={0.0, 450000.0, 12.0, 22.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); createPlot(id=1, position={88, 209, 809, 314}, y={"equEle.y", "equEle2.y"}, range={0.0, 450000.0, 0.0, 2000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/Schedule/EquipmentScheduleOutputVariable.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/EquipmentScheduleOutputVariable.mos similarity index 69% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/Schedule/EquipmentScheduleOutputVariable.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/EquipmentScheduleOutputVariable.mos index 6115c14c48e..2fef5393d0d 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/Schedule/EquipmentScheduleOutputVariable.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/EquipmentScheduleOutputVariable.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.Schedule.EquipmentScheduleOutputVariable", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="EquipmentScheduleOutputVariable"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.Schedule.EquipmentScheduleOutputVariable", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="EquipmentScheduleOutputVariable"); createPlot(id=1, position={15, 13, 590, 743}, y={"zon.TAir"}, range={0.0, 180000.0, 0.0, 30.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); createPlot(id=1, position={15, 13, 590, 743}, y={"schInt.u"}, range={0.0, 180000.0, -1.0, 2.0}, grid=true, subPlot=102, colors={{28,108,200}}); createPlot(id=1, position={15, 13, 590, 743}, y={"equEle.y"}, range={0.0, 180000.0, -500.0, 1000.0}, grid=true, subPlot=103, colors={{28,108,200}}, displayUnits={"W"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/SurfaceComparison/SurfaceComparison.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/SurfaceComparison.mos similarity index 84% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/SurfaceComparison/SurfaceComparison.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/SurfaceComparison.mos index 1ed2301666b..c16dbd4415b 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/SurfaceComparison/SurfaceComparison.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/SurfaceComparison.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.SurfaceComparison", stopTime=2592000, method="Cvode", tolerance=1e-06, resultFile="SurfaceComparison"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.SurfaceComparison", stopTime=2592000, method="Cvode", tolerance=1e-06, resultFile="SurfaceComparison"); // Plot commands createPlot(id=1, position={44, 11, 699, 428}, y={"refSur.TGarAir.y", "zonSur.TGarAir.y"}, range={0.0, 2600000.0, 250.0, 300.0}, autoscale=false, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"K", "K"}); createPlot(id=1, position={44, 11, 699, 428}, y={"refSur.TEasWalGarSur.y", "zonSur.TEasWalGarSur.y"}, range={0.0, 2600000.0, 250.0, 300.0}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"K", "K"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/Infiltration.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/Infiltration.mos similarity index 61% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/Infiltration.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/Infiltration.mos index 6d3dbfe36b2..d72de1db319 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/Infiltration.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/Infiltration.mos @@ -1,2 +1,2 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.Infiltration", stopTime=86400, method="Cvode", tolerance=1e-06, resultFile="Infiltration"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.Infiltration", stopTime=86400, method="Cvode", tolerance=1e-06, resultFile="Infiltration"); createPlot(id=1, position={75, 75, 1018, 724}, y={"defInf.attFlo.heaPorFro.T", "higInf.attFlo.heaPorFro.T", "defInf.bou.weaBus.TDryBul"}, range={0.0, 90000.0, -15.0, 25.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}, displayUnits={"degC", "degC", "degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/InternalGain.mos similarity index 89% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/InternalGain.mos index bb7130c92f6..97cb608b6f6 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/InternalGain.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.InternalGain", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="InternalGain"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.InternalGain", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="InternalGain"); createPlot(id=1, position={55, 55, 1469, 1187}, y={"noGai.bui.zon.TAir", "radOnl.bui.zon.TAir", "conOnl.bui.zon.TAir", "latOnl.bui.zon.TAir"}, range={0.0, 2.0, 16.0, 21.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC"}); createPlot(id=1, position={55, 55, 1469, 1187}, y={"noGai.bui.zon.TRad", "radOnl.bui.zon.TRad", "conOnl.bui.zon.TRad", "latOnl.bui.zon.TRad"}, range={0.0, 2.0, -5.0, 20.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC"}); createPlot(id=1, position={55, 55, 1469, 1187}, y={"noGai.bui.zon.phi", "radOnl.bui.zon.phi", "conOnl.bui.zon.phi", "latOnl.bui.zon.phi"}, range={0.0, 2.0, 0.6000000000000001, 1.2000000000000002}, autoscale=false, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, range2={0.5, 0.9}, timeUnit="d", displayUnits={"1", "1", "1", "1"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mos similarity index 51% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mos index 821d098f27e..6f0dee12cd7 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mos @@ -1,5 +1,5 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.OneZoneCompareZoneTemperatureOutput", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="OneZoneCompareZoneTemperatureOutput"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.OneZoneCompareZoneTemperatureOutput", stopTime=172800, method="Cvode", tolerance=1e-06, resultFile="OneZoneCompareZoneTemperatureOutput"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(y={"zon.TAir", "zonMeaAirTem.y"}, grid=true); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneOneYear.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneOneYear.mos new file mode 100644 index 00000000000..d4b08aa60f0 --- /dev/null +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneOneYear.mos @@ -0,0 +1,2 @@ +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.OneZoneOneYear", stopTime=31536000, method="Cvode", tolerance=1e-06, resultFile="OneZoneOneYear"); +createPlot(id=1, position={255, 85, 590, 557}, y={"TAirMea.y"}, range={0.0, 90000.0, 17.0, 21.0}, grid=true, colors={{28,108,200}}, displayUnits={"degC"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/RefBldgSmallOffice.mos similarity index 83% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/RefBldgSmallOffice.mos index cf73a9be8ec..e2da3ca8eae 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/RefBldgSmallOffice.mos @@ -1,5 +1,5 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.RefBldgSmallOffice", stopTime=604800, method="Cvode", tolerance=1e-06, resultFile="RefBldgSmallOffice"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.RefBldgSmallOffice", stopTime=604800, method="Cvode", tolerance=1e-06, resultFile="RefBldgSmallOffice"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=1, position={55, 50, 1783, 995}, y={"building.weaBus.TDryBul", "att.TAir", "cor.TAir", "sou.TAir", "eas.TAir", "nor.TAir", "wes.TAir", "TOutEP", "TAttEP", "TCorEP", "TSouEP", "TEasEP", "TNorEP", "TWesEP"}, range={0.0, 620000.0, -30.0, 25.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}, {244,125,35}, {102,44,145}, {28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}}, patterns={LinePattern.Solid, LinePattern.Solid, LinePattern.Solid, LinePattern.Solid, LinePattern.Solid, LinePattern.Solid, LinePattern.Solid, LinePattern.Solid, LinePattern.Dash, LinePattern.Dash, LinePattern.Dash, LinePattern.Dash, LinePattern.Dash, LinePattern.Dash}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/TwoIdenticalZones.mos similarity index 85% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/TwoIdenticalZones.mos index cd65a23eec8..0033ad02ffa 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/TwoIdenticalZones.mos @@ -1,6 +1,6 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.TwoIdenticalZones", stopTime=604800, method="Cvode", tolerance=1e-06, resultFile="TwoIdenticalZones"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.TwoIdenticalZones", stopTime=604800, method="Cvode", tolerance=1e-06, resultFile="TwoIdenticalZones"); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; createPlot(id=7, position={41, 7, 1252, 1087}, y={"zon1.TAir", "zon2.TAir", "zon1.zon.TRad", "zon2.zon.TRad", "TAirEnePlu.y"}, range={0.0, 604800, 10.0, 25.0}, autoscale=false, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, displayUnits={"degC", "degC", "degC", "degC", "degC"}); createPlot(id=7, position={41, 7, 1252, 214}, y={"relHumEnePlu.y", "zon1.phi", "zon2.phi"}, range={0.0, 604800, 0.0, 1.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/ZoneTemperatureInitialization.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/ZoneTemperatureInitialization.mos similarity index 66% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/ZoneTemperatureInitialization.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/ZoneTemperatureInitialization.mos index cfa2c5cc060..ce0a8462cb6 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/ZoneTemperatureInitialization.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/ZoneTemperatureInitialization.mos @@ -1,5 +1,5 @@ old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation; Hidden.AvoidDoubleComputation=true; -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.ZoneTemperatureInitialization", stopTime=86400, method="Cvode", tolerance=1e-06, resultFile="ZoneTemperatureInitialization"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.ZoneTemperatureInitialization", stopTime=86400, method="Cvode", tolerance=1e-06, resultFile="ZoneTemperatureInitialization"); createPlot(id=1, position={18, 126, 764, 539}, y={"zon.TAir", "TRad.y", "zon.TRad"}, range={0.0, 1.0, -300.0, 50.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}, timeUnit="d", displayUnits={"degC", "degC", "degC"}); Hidden.AvoidDoubleComputation=old_hidden_avoid_double_computation; diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mos similarity index 74% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mos index a4f778549fc..322fd0955d8 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.ZoneSurface.OneZoneConstantFloorTemperature", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="OneZoneConstantFloorTemperature"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ZoneSurface.OneZoneConstantFloorTemperature", stopTime=432000, method="Cvode", tolerance=1e-06, resultFile="OneZoneConstantFloorTemperature"); createPlot(id=1, position={15, 15, 1138, 688}, y={"zon.TAir", "zon.TRad", "flo.T"}, range={0.0, 440000.0, 15.0, 30.0}, grid=true, colors={{28,108,200}, {0,140,72}, {238,46,47}}, displayUnits={"degC", "degC", "degC"}); createPlot(id=1, position={15, 15, 1138, 688}, y={"flo.q_flow"}, range={0.0, 440000.0, -20.0, 40.0}, grid=true, subPlot=102, colors={{28,108,200}}, displayUnits={"W/m2"}); createPlot(id=1, position={15, 15, 1138, 688}, y={"building.weaBus.HDirNor", "building.weaBus.HDifHor"}, range={0.0, 440000.0, -500.0, 1000.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, displayUnits={"W/m2", "W/m2"}); diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mos similarity index 73% rename from Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mos rename to Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mos index 576022bdc59..df53fb3c05a 100644 --- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mos +++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mos @@ -1,4 +1,4 @@ -simulateModel("Buildings.ThermalZones.EnergyPlus.Validation.ZoneSurface.OneZoneControlledFloorTemperature", startTime=10800000, stopTime=11232000, method="Cvode", tolerance=1e-06, resultFile="OneZoneControlledFloorTemperature"); +simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ZoneSurface.OneZoneControlledFloorTemperature", startTime=10800000, stopTime=11232000, method="Cvode", tolerance=1e-06, resultFile="OneZoneControlledFloorTemperature"); createPlot(id=1, position={255, 85, 1254, 1005}, y={"zon.TAir", "flo.T", "TSetRooHea.y", "TSetRooCoo.y"}, range={125.0, 130.0, 19.0, 25.0}, grid=true, colors={{238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC"}); createPlot(id=1, position={255, 85, 1254, 1005}, y={"flo.q_flow"}, range={125.0, 130.0, -30.0, 10.0}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="d", displayUnits={"W/m2"}); createPlot(id=1, position={255, 85, 1254, 1005}, y={"conHea.y", "conCoo.y"}, range={125.0, 130.0, -0.2, 0.8}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="d"); diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones1.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones1.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones1.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones1.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones2.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones2.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones2.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones2.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones3.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones3.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation.FMUZoneAdapterZones3.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones3.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.AirHeating.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.AirHeating.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.AirHeating.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.AirHeating.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.EquipmentSchedule.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.EquipmentSchedule.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.EquipmentSchedule.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.EquipmentSchedule.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.LightsControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.LightsControl.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.LightsControl.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.LightsControl.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.ShadeControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.ShadeControl.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.ShadeControl.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.ShadeControl.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Spring.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Spring.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Spring.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Spring.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Summer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Summer.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Summer.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Summer.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Spring.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Spring.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Spring.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Spring.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Summer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Summer.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Summer.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Summer.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingSpring.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingSpring.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingSpring.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingSpring.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingSummer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingSummer.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingSummer.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingSummer.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingWinter.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingWinter.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingWinter.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingWinter.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Unconditioned.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Unconditioned.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Unconditioned.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Unconditioned.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.ThreeZonesTwoBuildings.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.ThreeZonesTwoBuildings.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.ThreeZonesTwoBuildings.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.ThreeZonesTwoBuildings.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.NoOutputVariable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.NoOutputVariable.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.NoOutputVariable.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.NoOutputVariable.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneEnvironmentOutputVariable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneEnvironmentOutputVariable.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneEnvironmentOutputVariable.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneEnvironmentOutputVariable.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOneOutputVariable.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariable.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOneOutputVariable.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariableSummer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOneOutputVariableSummer.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariableSummer.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOneOutputVariableSummer.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOutputVariable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOutputVariable.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOutputVariable.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOutputVariable.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoDifferentOutputVariables.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneTwoDifferentOutputVariables.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoDifferentOutputVariables.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneTwoDifferentOutputVariables.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoIdenticalOutputVariables.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneTwoIdenticalOutputVariables.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneTwoIdenticalOutputVariables.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneTwoIdenticalOutputVariables.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.Schedule.EquipmentScheduleOutputVariable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.Schedule.EquipmentScheduleOutputVariable.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.Schedule.EquipmentScheduleOutputVariable.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.Schedule.EquipmentScheduleOutputVariable.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.SurfaceComparison.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.SurfaceComparison.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.SurfaceComparison.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.SurfaceComparison.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.Infiltration.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.Infiltration.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.Infiltration.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.Infiltration.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.InternalGain.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.InternalGain.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.InternalGain.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.InternalGain.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.OneZoneCompareZoneTemperatureOutput.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.OneZoneCompareZoneTemperatureOutput.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.OneZoneCompareZoneTemperatureOutput.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.OneZoneCompareZoneTemperatureOutput.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.OneZoneOneYear.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.OneZoneOneYear.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.OneZoneOneYear.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.OneZoneOneYear.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.RefBldgSmallOffice.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.RefBldgSmallOffice.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.RefBldgSmallOffice.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.RefBldgSmallOffice.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.TwoIdenticalZones.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.TwoIdenticalZones.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.TwoIdenticalZones.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.TwoIdenticalZones.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.ZoneTemperatureInitialization.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.ZoneTemperatureInitialization.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.ZoneTemperatureInitialization.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.ZoneTemperatureInitialization.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ZoneSurface.OneZoneConstantFloorTemperature.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ZoneSurface.OneZoneConstantFloorTemperature.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ZoneSurface.OneZoneConstantFloorTemperature.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ZoneSurface.OneZoneConstantFloorTemperature.mos diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ZoneSurface.OneZoneControlledFloorTemperature.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ZoneSurface.OneZoneControlledFloorTemperature.mos similarity index 100% rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus.Validation.ZoneSurface.OneZoneControlledFloorTemperature.mos rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ZoneSurface.OneZoneControlledFloorTemperature.mos diff --git a/Buildings/Resources/Scripts/travis/Makefile b/Buildings/Resources/Scripts/travis/Makefile index 2bb3be7e3cc..6830820e881 100644 --- a/Buildings/Resources/Scripts/travis/Makefile +++ b/Buildings/Resources/Scripts/travis/Makefile @@ -52,7 +52,7 @@ test-openmodelica-spawn-spaces-success: @$(eval TMP := $(shell mktemp --suffix=-LBL-Buildings -d)) @mkdir -p $(TMP) @cp -rp $(ROOT)/Buildings $(TMP)/ - @mv $(TMP)/Buildings $(TMP)/Buildings\ 8.0.0 + @mv $(TMP)/Buildings $(TMP)/Buildings\ 9.0.0 @cp $(ROOT)/Buildings/Resources/Scripts/travis/SpawnTest.mo $(TMP) @(cd $(TMP) && \ echo "clearCommandLineOptions();\n" \ @@ -65,7 +65,7 @@ test-openmodelica-spawn-spaces-success: "setMatchingAlgorithm(\"PFPlusExt\");\n" \ "setIndexReductionMethod(\"dynamicStateSelection\");\n" \ "loadModel(Modelica, {\"4.0.0\"});\n" \ - "loadFile(\"Buildings 8.0.0/package.mo\");\n" \ + "loadFile(\"Buildings 9.0.0/package.mo\");\n" \ "loadFile(\"SpawnTest.mo\");\n" \ "simulate(SpawnTest);\n" \ "getErrorString();" > openmod.mos ) @@ -80,7 +80,7 @@ test-openmodelica-spawn-spaces-failure: $(eval TMP := $(TMP)/dir\ with\ spaces) @mkdir -p $(TMP) @cp -rp $(ROOT)/Buildings $(TMP)/ - @mv $(TMP)/Buildings $(TMP)/Buildings\ 8.0.0 + @mv $(TMP)/Buildings $(TMP)/Buildings\ 9.0.0 @cp $(ROOT)/Buildings/Resources/Scripts/travis/SpawnTest.mo $(TMP) @(cd $(TMP) && \ echo "clearCommandLineOptions();\n" \ @@ -93,7 +93,7 @@ test-openmodelica-spawn-spaces-failure: "setMatchingAlgorithm(\"PFPlusExt\");\n" \ "setIndexReductionMethod(\"dynamicStateSelection\");\n" \ "loadModel(Modelica, {\"4.0.0\"});\n" \ - "loadFile(\"Buildings 8.0.0/package.mo\");\n" \ + "loadFile(\"Buildings 9.0.0/package.mo\");\n" \ "loadFile(\"SpawnTest.mo\");\n" \ "simulate(SpawnTest);\n" \ "getErrorString();" > openmod.mos ) @@ -107,7 +107,7 @@ test-dymola-spawn-spaces: @$(eval TMP := $(shell mktemp --suffix=-LBL-Buildings -d)) @mkdir -p $(TMP) @cp -rp $(ROOT)/Buildings $(TMP)/ - @mv $(TMP)/Buildings $(TMP)/Buildings\ 8.0.0 + @mv $(TMP)/Buildings $(TMP)/Buildings\ 9.0.0 @cp $(ROOT)/Buildings/Resources/Scripts/travis/SpawnTest.mo $(TMP) @(cd $(TMP) && \ echo "simulateModel(\"SpawnTest\", stopTime=432000, method=\"Cvode\", tolerance=1e-06);" > run.mos && \ diff --git a/Buildings/Resources/Scripts/travis/SpawnTest.mo b/Buildings/Resources/Scripts/travis/SpawnTest.mo index c25be849c5f..5924d07ca89 100644 --- a/Buildings/Resources/Scripts/travis/SpawnTest.mo +++ b/Buildings/Resources/Scripts/travis/SpawnTest.mo @@ -1,6 +1,6 @@ within ; model SpawnTest - extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned; annotation( Documentation(info = " diff --git a/Buildings/Resources/Scripts/travis/pyfmi/runSpawnFromOtherDirectory.py b/Buildings/Resources/Scripts/travis/pyfmi/runSpawnFromOtherDirectory.py index 8ed845162a2..a0e2e936751 100755 --- a/Buildings/Resources/Scripts/travis/pyfmi/runSpawnFromOtherDirectory.py +++ b/Buildings/Resources/Scripts/travis/pyfmi/runSpawnFromOtherDirectory.py @@ -46,7 +46,7 @@ def simulate(expectToFail): """ Simulate the model. If `expectedToFail = False` and the simulation fails, or - if `exptectedToFail = True` and the simulation succeeds, the + if `expectedToFail = True` and the simulation succeeds, the function raises `RuntimeError`. Otherwise it return without error. """ import subprocess @@ -66,11 +66,11 @@ def print_output(typ, stream): print_output("stdout", stdout) print_output("stderr", stderr) raise - if (process.returncode is not 0) and (not expectToFail): + if (process.returncode != 0) and (not expectToFail): print_output("stdout", stdout) print_output("stderr", stderr) raise RuntimeError("Failed to simulate fmu, but expected successful simulation.") - if (process.returncode is 0) and expectToFail: + if (process.returncode == 0) and expectToFail: print_output("stdout", stdout) print_output("stderr", stderr) raise RuntimeError("Simulation was successful, but it was expected to fail.") @@ -79,11 +79,11 @@ def print_output(typ, stream): def run_test(pathVariable): # List of files to be moved fileMoves = [ - {"src": os.path.abspath(os.path.join("Buildings", "Resources", "bin", "spawn-linux64")), + {"src": os.path.abspath(os.path.join("Buildings", "Resources", "bin", "spawn-0.3.0-d6204d26f6", "linux64")), "des": "my-bin"}, {"src": os.path.abspath(os.path.join("Buildings", "Resources", "weatherdata")), "des": "some_weather_directory_that_the_fmu_does_not_know_about"}, - {"src": os.path.abspath(os.path.join("Buildings", "Resources", "Data", "ThermalZones", "EnergyPlus")), + {"src": os.path.abspath(os.path.join("Buildings", "Resources", "Data", "ThermalZones", "EnergyPlus_9_6_0")), "des": "some_idf_directory_that_the_fmu_does_not_know_about"}, ] @@ -135,7 +135,7 @@ def run_test(pathVariable): from buildingspy.simulate.Optimica import Simulator import sys - model = "Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned" + model = "Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned" #model = "Buildings.Controls.Continuous.Examples.LimPID" fmu = model.replace('.', '_') + ".fmu" s=Simulator(model) @@ -146,7 +146,7 @@ def run_test(pathVariable): args = ["SPAWNPATH", "PATH", None] for arg in args: retVal = run_test(arg) - if retVal is not 0: + if retVal != 0: sys.exit(1) sys.exit(0) diff --git a/Buildings/Resources/bin/spawn-linux64/README.md b/Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/linux64/README.md similarity index 100% rename from Buildings/Resources/bin/spawn-linux64/README.md rename to Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/linux64/README.md diff --git a/Buildings/Resources/bin/spawn-linux64/bin/spawn-0.3.0-d6204d26f6 b/Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/linux64/bin/spawn-0.3.0-d6204d26f6 similarity index 100% rename from Buildings/Resources/bin/spawn-linux64/bin/spawn-0.3.0-d6204d26f6 rename to Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/linux64/bin/spawn-0.3.0-d6204d26f6 diff --git a/Buildings/Resources/bin/spawn-linux64/etc/Energy+.idd b/Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/linux64/etc/Energy+.idd similarity index 100% rename from Buildings/Resources/bin/spawn-linux64/etc/Energy+.idd rename to Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/linux64/etc/Energy+.idd diff --git a/Buildings/Resources/bin/spawn-linux64/lib/epfmi.so b/Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/linux64/lib/epfmi.so similarity index 100% rename from Buildings/Resources/bin/spawn-linux64/lib/epfmi.so rename to Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/linux64/lib/epfmi.so diff --git a/Buildings/Resources/bin/spawn-win64/README.md b/Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/README.md similarity index 100% rename from Buildings/Resources/bin/spawn-win64/README.md rename to Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/README.md diff --git a/Buildings/Resources/bin/spawn-win64/bin/VCRUNTIME140.dll b/Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/bin/VCRUNTIME140.dll similarity index 100% rename from Buildings/Resources/bin/spawn-win64/bin/VCRUNTIME140.dll rename to Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/bin/VCRUNTIME140.dll diff --git a/Buildings/Resources/bin/spawn-win64/bin/epfmi.dll b/Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/bin/epfmi.dll similarity index 100% rename from Buildings/Resources/bin/spawn-win64/bin/epfmi.dll rename to Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/bin/epfmi.dll diff --git a/Buildings/Resources/bin/spawn-win64/bin/spawn-0.3.0-d6204d26f6.exe b/Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/bin/spawn-0.3.0-d6204d26f6.exe similarity index 100% rename from Buildings/Resources/bin/spawn-win64/bin/spawn-0.3.0-d6204d26f6.exe rename to Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/bin/spawn-0.3.0-d6204d26f6.exe diff --git a/Buildings/Resources/bin/spawn-win64/etc/Energy+.idd b/Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/etc/Energy+.idd similarity index 100% rename from Buildings/Resources/bin/spawn-win64/etc/Energy+.idd rename to Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/etc/Energy+.idd diff --git a/Buildings/Resources/bin/spawn-win64/lib/epfmi.lib b/Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/lib/epfmi.lib similarity index 100% rename from Buildings/Resources/bin/spawn-win64/lib/epfmi.lib rename to Buildings/Resources/bin/spawn-0.3.0-d6204d26f6/win64/lib/epfmi.lib diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/BuildingInstantiate.c b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/BuildingInstantiate.c similarity index 98% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/BuildingInstantiate.c rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/BuildingInstantiate.c index 90ba377f3b9..5f084ab869c 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/BuildingInstantiate.c +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/BuildingInstantiate.c @@ -390,14 +390,16 @@ char* findSpawnExe(FMUBuilding* bui, const char* SEARCHPATH, const char* spawnEx char *saveptr; char *searchPathCopy; + const char* prefix = "/Resources/bin/"; + const char* suffix = "/bin"; #ifdef _WIN32 /* Win32 or Win64 */ - const char* binDir = "/Resources/bin/spawn-win64/bin"; + const char* binDir = "/win64"; const char delimiter[2] = ";"; #elif __APPLE__ - const char* binDir = "/Resources/bin/spawn-darwin64/bin"; + const char* binDir = "/darwin64"; const char delimiter[2] = ":"; #else - const char* binDir = "/Resources/bin/spawn-linux64/bin"; + const char* binDir = "/linux64"; const char delimiter[2] = ":"; #endif @@ -412,12 +414,15 @@ char* findSpawnExe(FMUBuilding* bui, const char* SEARCHPATH, const char* spawnEx if (bui->logLevel >= MEDIUM) SpawnFormatMessage("%.3f %s: In findSpawnExe, trying to to use buildingsLibraryRoot to find spawn.\n", bui->time, bui->modelicaNameBuilding); - len = strlen(bui->buildingsLibraryRoot) + strlen(binDir) + 1; + len = strlen(bui->buildingsLibraryRoot) + strlen(prefix) + strlen(spawnExe) + strlen(binDir) + strlen(suffix) + 1; mallocString(len, "Failed to allocate memory in findSpawnExe() for pathToExe.", &pathToExe, SpawnFormatError); memset(pathToExe, '\0', len); strcpy(pathToExe, bui->buildingsLibraryRoot); + strcat(pathToExe, prefix); + strcat(pathToExe, spawnExe); strcat(pathToExe, binDir); + strcat(pathToExe, suffix); /* Recursively call this function, but now with SEARCHPATH set */ spawnFullPath = findSpawnExe(bui, pathToExe, spawnExe); @@ -860,7 +865,7 @@ void generateAndInstantiateBuilding(FMUBuilding* bui){ void (*SpawnFormatError)(const char *string, ...) = bui->SpawnFormatError; if (bui->logLevel >= MEDIUM) - SpawnFormatMessage("%.3f %s: Entered EnergyPlusSpawnAllocateAndInstantiateBuilding.\n", + SpawnFormatMessage("%.3f %s: Entered generateAndInstantiateBuilding.\n", bui->time, bui->modelicaNameBuilding); if (bui->usePrecompiledFMU) @@ -906,7 +911,7 @@ void generateAndInstantiateBuilding(FMUBuilding* bui){ spawnFullPath = findSpawnExe(bui, env, bui->spawnExe); } if (spawnFullPath == NULL){ - SpawnFormatError("%s", "Failed to find spawn executable in Buildings Library installation, on SPAWNPATH and on PATH."); + SpawnFormatError("Failed to find spawn executable in Buildings Library installation, on SPAWNPATH and on PATH. See instructions at Buildings.ThermalZones.EnergyPlus_%s.UsersGuide.Installation", bui->idfVersion); } terminateIfSpacesInInstallation(bui); /* Generate FMU using spawnFullPath */ diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/BuildingInstantiate.h b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/BuildingInstantiate.h similarity index 100% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/BuildingInstantiate.h rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/BuildingInstantiate.h diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnFMU.c b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnFMU.c similarity index 97% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnFMU.c rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnFMU.c index e97ba10da95..b29af5c2882 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnFMU.c +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnFMU.c @@ -25,6 +25,7 @@ size_t AllocateBuildingDataStructure( double startTime, const char* modelicaNameBuilding, const char* spawnExe, + const char* idfVersion, const char* idfName, const char* epwName, double relativeSurfaceTolerance, @@ -104,6 +105,14 @@ size_t AllocateBuildingDataStructure( SpawnFormatError); strcpy(Buildings_FMUS[nFMU]->spawnExe, spawnExe); + /* Assign the idf version */ + mallocString( + (strlen(idfVersion)+1), + "Not enough memory in SpawnFMU.c. to allocate idfVersion.", + &(Buildings_FMUS[nFMU]->idfVersion), + SpawnFormatError); + strcpy(Buildings_FMUS[nFMU]->idfVersion, idfVersion); + /* Assign the idfName name */ if (usePrecompiledFMU){ mallocString( diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnFMU.h b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnFMU.h similarity index 97% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnFMU.h rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnFMU.h index 7affa737816..b80449d9ce8 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnFMU.h +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnFMU.h @@ -26,6 +26,7 @@ size_t AllocateBuildingDataStructure( const char* idfName, const char* epwName, const char* spawnExe, + const char* idfVersion, double relativeSurfaceTolerance, int usePrecompiledFMU, const char* fmuName, diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectAllocate.c b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectAllocate.c similarity index 94% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectAllocate.c rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectAllocate.c index 5fd47f1060a..37052ca4ea1 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectAllocate.c +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectAllocate.c @@ -86,12 +86,13 @@ void setExchangePointerIfAlreadyInstanciated(const char* modelicaName, const int } /* Create the structure and return a pointer to its address. */ -void* EnergyPlusSpawnAllocate( +void* allocate_Spawn_EnergyPlus_9_6_0( const int objectType, double startTime, const char* modelicaNameBuilding, const char* modelicaName, const char* spawnExe, + const char* idfVersion, const char* idfName, const char* epwName, double relativeSurfaceTolerance, @@ -132,7 +133,7 @@ void* EnergyPlusSpawnAllocate( char* doubleObjectSpec; if (logLevel >= MEDIUM){ - SpawnFormatMessage("%.3f %s: Entered EnergyPlusSpawnAllocate.\n", startTime, modelicaName); + SpawnFormatMessage("%.3f %s: Entered allocate_Spawn_EnergyPlus_9_6_0.\n", startTime, modelicaName); SpawnFormatMessage("%.3f %s: Buildings library legal.html file is at %s\n", startTime, modelicaName, buildingsRootFileLocation); } @@ -158,7 +159,7 @@ void* EnergyPlusSpawnAllocate( setExchangePointerIfAlreadyInstanciated(modelicaName, objectType, &ptrSpaObj); if (ptrSpaObj != NULL){ if (logLevel >= MEDIUM) - SpawnFormatMessage("%.3f %s: EnergyPlusSpawnAllocate called more than once for this object.\n", startTime, modelicaName); + SpawnFormatMessage("%.3f %s: allocate_Spawn_EnergyPlus_9_6_0 called more than once for this object.\n", startTime, modelicaName); /* Return pointer to this Spawn object */ return (void*) ptrSpaObj; } @@ -173,7 +174,7 @@ void* EnergyPlusSpawnAllocate( ptrSpaObj = (SpawnObject*) malloc(sizeof(SpawnObject)); if ( ptrSpaObj == NULL ) - SpawnError("Not enough memory in EnergyPlusSpawnAllocate.c. to allocate Spawn object."); + SpawnError("Not enough memory in allocate_Spawn_EnergyPlus_9_6_0.c. to allocate Spawn object."); ptrSpaObj->printUnit = printUnit; ptrSpaObj->unitPrinted = fmi2False; @@ -193,7 +194,7 @@ void* EnergyPlusSpawnAllocate( /* Assign the Modelica instance name */ mallocString( strlen(modelicaName)+1, - "Not enough memory in EnergyPlusSpawnAllocate.c. to allocate Modelica instance name.", + "Not enough memory in allocate_Spawn_EnergyPlus_9_6_0.c. to allocate Modelica instance name.", &(ptrSpaObj->modelicaName), SpawnFormatError); strcpy(ptrSpaObj->modelicaName, modelicaName); @@ -201,7 +202,7 @@ void* EnergyPlusSpawnAllocate( /* Assign the json name */ mallocString( strlen(jsonName)+1, - "Not enough memory in EnergyPlusSpawnAllocate.c. to allocate json name.", + "Not enough memory in allocate_Spawn_EnergyPlus_9_6_0.c. to allocate json name.", &(ptrSpaObj->jsonName), SpawnFormatError); strcpy(ptrSpaObj->jsonName, jsonName); @@ -209,7 +210,7 @@ void* EnergyPlusSpawnAllocate( /* Assign the json keys and values string */ mallocString( strlen(jsonKeysValues)+1, - "Not enough memory in EnergyPlusSpawnAllocate.c. to allocate the json keys and values string.", + "Not enough memory in allocate_Spawn_EnergyPlus_9_6_0.c. to allocate the json keys and values string.", &(ptrSpaObj->jsonKeysValues), SpawnFormatError); strcpy(ptrSpaObj->jsonKeysValues, jsonKeysValues); @@ -321,6 +322,7 @@ void* EnergyPlusSpawnAllocate( startTime, modelicaNameBuilding, spawnExe, + idfVersion, idfName, epwName, relativeSurfaceTolerance, diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectAllocate.h b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectAllocate.h similarity index 94% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectAllocate.h rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectAllocate.h index 149b0050cb3..a12b6da1c51 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectAllocate.h +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectAllocate.h @@ -11,12 +11,13 @@ #include "SpawnUtil.h" /* Create the structure and return a pointer to its address. */ -LBNL_Spawn_EXPORT void* EnergyPlusSpawnAllocate( +LBNL_Spawn_EXPORT void* allocate_Spawn_EnergyPlus_9_6_0( const int objectType, double startTime, const char* modelicaNameBuilding, const char* modelicaName, const char* spawnExe, + const char* idfVersion, const char* idfName, const char* epwName, double relativeSurfaceTolerance, diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectExchange.c b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectExchange.c similarity index 99% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectExchange.c rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectExchange.c index e0c21cae06b..9059562e470 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectExchange.c +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectExchange.c @@ -27,7 +27,7 @@ bool areAllSpawnObjectsInitialized(FMUBuilding* bui){ /* Exchange data between Modelica and EnergyPlus during time stepping */ -void EnergyPlusSpawnExchange( +void exchange_Spawn_EnergyPlus_9_6_0( void* object, int initialCall, const double* u, diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectExchange.h b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectExchange.h similarity index 87% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectExchange.h rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectExchange.h index 67007a62ba4..8761635e4bd 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectExchange.h +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectExchange.h @@ -12,7 +12,7 @@ #include "FMI2/fmi2_import_capi.h" -LBNL_Spawn_EXPORT void EnergyPlusSpawnExchange( +LBNL_Spawn_EXPORT void exchange_Spawn_EnergyPlus_9_6_0( void* object, int initialCall, const double* u, diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectFree.c b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectFree.c similarity index 92% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectFree.c rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectFree.c index ab8186fb95a..6a441eb4f03 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectFree.c +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectFree.c @@ -10,7 +10,7 @@ #include -void EnergyPlusSpawnObjectFree(void* object){ +void free_Spawn_EnergyPlus_9_6_0(void* object){ if ( object != NULL ){ SpawnObject* ptrSpaObj = (SpawnObject*) object; diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectFree.h b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectFree.h similarity index 80% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectFree.h rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectFree.h index c93bbaabdcd..72daaf6846a 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectFree.h +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectFree.h @@ -10,6 +10,6 @@ #include "SpawnFMU.h" #include "FMI2/fmi2_import.h" -LBNL_Spawn_EXPORT void EnergyPlusSpawnObjectFree(void* object); +LBNL_Spawn_EXPORT void free_Spawn_EnergyPlus_9_6_0(void* object); #endif diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectInstantiate.c b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectInstantiate.c similarity index 80% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectInstantiate.c rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectInstantiate.c index dc72c17f635..8f3251754ca 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectInstantiate.c +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectInstantiate.c @@ -15,7 +15,7 @@ /* This function is called for each Spawn object in the 'initial equation' section */ -void EnergyPlusSpawnInitialize( +void initialize_Spawn_EnergyPlus_9_6_0( void* object, int *nObj){ SpawnObject* ptrSpaObj = (SpawnObject*) object; @@ -23,10 +23,10 @@ void EnergyPlusSpawnInitialize( const char* modelicaName = ptrSpaObj->modelicaName; if (bui->logLevel >= MEDIUM){ - bui->SpawnFormatMessage("%.3f %s: Entered EnergyPlusSpawnInitialize.\n", bui->time, modelicaName); + bui->SpawnFormatMessage("%.3f %s: Entered initialize_Spawn_EnergyPlus_9_6_0.\n", bui->time, modelicaName); } if (bui == NULL){ - bui->SpawnFormatError("Pointer bui is NULL in EnergyPlusSpawnInitialize for %s. For Dymola 2020x, make sure you set 'Hidden.AvoidDoubleComputation=true'. See Buildings.ThermalZones.EnergyPlus.UsersGuide.", modelicaName); + bui->SpawnFormatError("Pointer bui is NULL in initialize_Spawn_EnergyPlus_9_6_0 for %s. For Dymola 2020x, make sure you set 'Hidden.AvoidDoubleComputation=true'. See Buildings.ThermalZones.EnergyPlus.UsersGuide.", modelicaName); } if (bui->fmu == NULL){ /* EnergyPlus is not yet loaded. @@ -63,7 +63,7 @@ void EnergyPlusSpawnInitialize( /* Returns the parameter values for this Spawn object */ -void EnergyPlusSpawnGetParameters( +void getParameters_Spawn_EnergyPlus_9_6_0( void* object, double *parOut){ SpawnObject* ptrSpaObj = (SpawnObject*) object; @@ -72,7 +72,7 @@ void EnergyPlusSpawnGetParameters( size_t i; if (bui->logLevel >= MEDIUM){ - bui->SpawnFormatMessage("%.3f %s: Entered EnergyPlusSpawnGetParameters.\n", bui->time, modelicaName); + bui->SpawnFormatMessage("%.3f %s: Entered getParameters_Spawn_EnergyPlus_9_6_0.\n", bui->time, modelicaName); } /* Assign the parameters for this object */ @@ -81,5 +81,5 @@ void EnergyPlusSpawnGetParameters( parOut++; /* Increment to next element */ } if (bui->logLevel >= MEDIUM) - bui->SpawnFormatMessage("%.3f %s: Leaving EnergyPlusSpawnGetParameters.\n", bui->time, ptrSpaObj->modelicaName); + bui->SpawnFormatMessage("%.3f %s: Leaving getParameters_Spawn_EnergyPlus_9_6_0.\n", bui->time, ptrSpaObj->modelicaName); } diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectInstantiate.h b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectInstantiate.h similarity index 71% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectInstantiate.h rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectInstantiate.h index dc32feb6950..cbbacef35bb 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectInstantiate.h +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnObjectInstantiate.h @@ -20,8 +20,8 @@ #include "fmilib.h" #include "JM/jm_portability.h" -LBNL_Spawn_EXPORT void EnergyPlusSpawnInitialize(void* object, int *nObj); +LBNL_Spawn_EXPORT void initialize_Spawn_EnergyPlus_9_6_0(void* object, int *nObj); -LBNL_Spawn_EXPORT void EnergyPlusSpawnGetParameters(void* object, double *parOut); +LBNL_Spawn_EXPORT void getParameters_Spawn_EnergyPlus_9_6_0(void* object, double *parOut); #endif diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnTypes.h b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnTypes.h similarity index 95% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnTypes.h rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnTypes.h index 0b8ec966190..67639ddbd4b 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnTypes.h +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnTypes.h @@ -74,7 +74,8 @@ typedef struct FMUBuilding const char* GUID; char* buildingsLibraryRoot; /* Root directory of Buildings library */ char* modelicaNameBuilding; /* Name of the Modelica instance of this zone */ - char* spawnExe; /* Name of the spawn executable without extension, such as spawn-0.2.0-d7f1e095f3 */ + char* spawnExe; /* Name of the spawn executable without extension, such as spawn-0.2.0-d7f1e095f3 */ + char* idfVersion; /* IDF version with underscores, such as 9_6_0. This must be the same as is used as suffix for Buildings.ThermalZones.EnergyPlus_ */ fmi2Byte* idfName; /* if usePrecompiledFMU == true, the user-specified fmu name, else the idf name */ fmi2Byte* weather; double relativeSurfaceTolerance; /* Relative surface tolerance for heat balance calculations */ diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnUtil.c b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnUtil.c similarity index 98% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnUtil.c rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnUtil.c index d3a3d45a2f8..11408ee305a 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnUtil.c +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/C-Sources/SpawnUtil.c @@ -656,12 +656,12 @@ void buildVariableNames( *ptrVarNames = (char**)malloc(nVar * sizeof(char*)); if (*ptrVarNames == NULL) - SpawnFormatError("Failed to allocate memory for ptrVarNames in EnergyPlusSpawnInitialize.c. for %s", name); + SpawnFormatError("Failed to allocate memory for ptrVarNames in initialize_Spawn_EnergyPlus_9_6_0.c. for %s", name); for (i=0; i -1: - version = lin[len(prefix):].strip() - return version + versionString = lin[len(prefix):].strip() + return versionString raise ValueError("Failed to find EnergyPlus version.") @@ -182,11 +185,13 @@ def update_version_in_modelica_file(spawn_exe): import re energyPlus_version = _getEnergyPlusVersion() + ep_package = f"EnergyPlus_{energyPlus_version}".replace('.', '_') for rel_file in [\ - os.path.join("Buildings", "ThermalZones", "EnergyPlus", "Building.mo"), - os.path.join("Buildings", "ThermalZones", "EnergyPlus", "package.mo"), - os.path.join("Buildings", "ThermalZones", "EnergyPlus", "UsersGuide.mo") + os.path.join("Buildings", "ThermalZones", ep_package, "Building.mo"), + os.path.join("Buildings", "ThermalZones", ep_package, "package.mo"), + os.path.join("Buildings", "ThermalZones", ep_package, "UsersGuide.mo"), + os.path.join("Buildings", "Resources", "Scripts", "travis", "pyfmi", "runSpawnFromOtherDirectory.py") ]: # Path to Building.mo abs_file = os.path.abspath( \ @@ -233,7 +238,7 @@ def update_git(spawn_exe): dists.append( { "src": f"https://spawn.s3.amazonaws.com/builds/{NAME_VERSION}-Linux.tar.gz", - "des": "spawn-linux64", + "des": f"spawn-{version}-{commit}/linux64", "files": { f"bin/{spawn_exe}": "", "README.md": "", @@ -245,7 +250,7 @@ def update_git(spawn_exe): dists.append( { "src": f"https://spawn.s3.amazonaws.com/builds/{NAME_VERSION}-win64.zip", - "des": "spawn-win64", + "des": f"spawn-{version}-{commit}/win64", "files": { "bin/epfmi.dll": "", f"bin/{spawn_exe}.exe": "", diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/output_vars_template.html b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/output_vars_template.html similarity index 100% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/output_vars_template.html rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/output_vars_template.html diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/runAllIDF.py b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/runAllIDF.py similarity index 97% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/runAllIDF.py rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/runAllIDF.py index aa2077cc654..61f8d31b6ac 100644 --- a/Buildings/Resources/src/ThermalZones/EnergyPlus/runAllIDF.py +++ b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/runAllIDF.py @@ -45,7 +45,7 @@ def _simulate(case): building( idfName=Modelica.Utilities.Files.loadResource( \"file:///{idf_full_name}\")))""" - model = f"Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneEnvironmentOutputVariable{modifier}" + model = f"Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneEnvironmentOutputVariable{modifier}" mo_text = f""" model {mo_name} extends {model}; diff --git a/Buildings/Resources/src/ThermalZones/EnergyPlus/transition_idf_files.sh b/Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/transition_idf_files.sh similarity index 100% rename from Buildings/Resources/src/ThermalZones/EnergyPlus/transition_idf_files.sh rename to Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/transition_idf_files.sh diff --git a/Buildings/ThermalZones/EnergyPlus/Actuator.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Actuator.mo similarity index 88% rename from Buildings/ThermalZones/EnergyPlus/Actuator.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Actuator.mo index 21d1cfaffbb..2739ee15fe5 100644 --- a/Buildings/ThermalZones/EnergyPlus/Actuator.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Actuator.mo @@ -1,15 +1,15 @@ -within Buildings.ThermalZones.EnergyPlus; +within Buildings.ThermalZones.EnergyPlus_9_6_0; block Actuator "Block to write to an EnergyPlus actuator" - extends Buildings.ThermalZones.EnergyPlus.BaseClasses.PartialEnergyPlusObject; - extends Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize.ObjectSynchronizer; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.PartialEnergyPlusObject; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Synchronize.ObjectSynchronizer; parameter String variableName "Actuated component unique name in the EnergyPlus idf file"; parameter String componentType "Actuated component type"; parameter String controlType "Actuated component control type"; - parameter Buildings.ThermalZones.EnergyPlus.Types.Units unit + parameter Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units unit "Unit of variable as used in Modelica" annotation (choicesAllMatching=true); Modelica.Blocks.Interfaces.RealInput u @@ -34,21 +34,22 @@ protected fixed=false, start=0) "Total number of Spawn objects in building"; - final parameter String unitString=Buildings.ThermalZones.EnergyPlus.BaseClasses.getUnitAsString(unit) + final parameter String unitString=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.getUnitAsString(unit) "Unit as a string"; - Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject( + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject( objectType=3, startTime=startTime, modelicaNameBuilding=modelicaNameBuilding, modelicaInstanceName=modelicaInstanceName, spawnExe=spawnExe, + idfVersion=idfVersion, idfName=idfName, epwName=epwName, relativeSurfaceTolerance=relativeSurfaceTolerance, epName=variableName, usePrecompiledFMU=usePrecompiledFMU, fmuName=fmuName, - buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus.BaseClasses.buildingsRootFileLocation, + buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.buildingsRootFileLocation, logLevel=logLevel, printUnit=false, jsonName="emsActuators", @@ -77,12 +78,12 @@ initial equation assert( not usePrecompiledFMU, "Use of pre-compiled FMU is not supported for block Actuator."); - nObj=Buildings.ThermalZones.EnergyPlus.BaseClasses.initialize( + nObj=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.initialize( adapter=adapter, isSynchronized=building.isSynchronized); equation - yEP=Buildings.ThermalZones.EnergyPlus.BaseClasses.exchange( + yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange( adapter=adapter, initialCall=false, nY=nY, @@ -123,10 +124,10 @@ then EnergyPlus will receive the inputs The parameter unit specifies the unit of the signal u. This unit is then converted internally to the units required by EnergyPlus before the value is sent to EnergyPlus. -See Buildings.ThermalZones.EnergyPlus.Types.Units +See Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units for the supported units. If the value of the parameter unit is left at its default value of -Buildings.ThermalZones.EnergyPlus.Types.Units.unspecified, then +Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.unspecified, then the simulation will stop with an error.

Usage

@@ -138,8 +139,8 @@ For other actuators, please see the EnergyPlus EMS Application Guide.
Configuring an actuator for lights

Consider the example - -Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.LightsControl. + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.LightsControl. In this example, Modelica overwrites the EnergyPlus Lights object. The idf-file has the following entry: @@ -171,11 +172,11 @@ Therefore, the Lights object can be overwritten by specifying the Modelica instance 

-  Buildings.ThermalZones.EnergyPlus.Actuator actLig(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.Actuator actLig(
     variableName=\"LIVING ZONE Lights\",
     componentType=\"Lights\",
     controlType=\"Electric Power Level\",
-    unit=Buildings.ThermalZones.EnergyPlus.Types.Units.Power)
+    unit=Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.Power)
       \"Actuator for lights\";

@@ -185,8 +186,8 @@ and setting its input to the required power in Watts.

Configuring an actuator for a shade

Consider the example - -Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.ShadeControl. + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.ShadeControl. In this example, the idf-file has the following entry:

@@ -210,17 +211,17 @@ to 6 to activate the interior blind. Therefore, in Modelica, the instantiation 

-  Buildings.ThermalZones.EnergyPlus.Actuator actSha(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.Actuator actSha(
     variableName=\"Zn001:Wall001:Win001\",
     componentType=\"Window Shading Control\",
     controlType=\"Control Status\",
-    unit=Buildings.ThermalZones.EnergyPlus.Types.Units.Normalized)
+    unit=Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.Normalized)
       \"Actuator for window shade\"

will write to the Window Shading Control of the EnergyPlus object FenestrationSurface:Detailed with name Zn001:Wall001:Win001. -The entry units=Buildings.ThermalZones.EnergyPlus.Types.Units.Normalized +The entry units=Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.Normalized will cause the input value of the Modelica instance actSha to be sent to EnergyPlus without any unit conversion. Hence, in the example, the input actSha.u is set to 0 or 6. diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/PartialEnergyPlusObject.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/PartialEnergyPlusObject.mo similarity index 86% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/PartialEnergyPlusObject.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/PartialEnergyPlusObject.mo index b304a5ed748..d379b559eba 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/PartialEnergyPlusObject.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/PartialEnergyPlusObject.mo @@ -1,8 +1,8 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses; partial block PartialEnergyPlusObject "Partial definitions of an EnergyPlus object" extends Modelica.Blocks.Icons.Block; - outer Buildings.ThermalZones.EnergyPlus.Building building + outer Buildings.ThermalZones.EnergyPlus_9_6_0.Building building "Building-level declarations"; protected @@ -15,6 +15,9 @@ protected constant String spawnExe=building.spawnExe "Name of the spawn executable, without extension, such as spawn-0.2.0-d7f1e095f3" annotation (HideResult=true); + constant String idfVersion = building.idfVersion + "IDF version with underscore, used for error report" + annotation (HideResult=true); final parameter String idfName=building.idfName "Name of the IDF file that contains this zone"; final parameter String epwName=building.epwName @@ -27,7 +30,7 @@ protected final parameter String fmuName=building.fmuName "Specify if a pre-compiled FMU should be used instead of EnergyPlus (mainly for development)" annotation (Dialog(tab="Debug")); - final parameter Buildings.ThermalZones.EnergyPlus.Types.LogLevels logLevel=building.logLevel + final parameter Buildings.ThermalZones.EnergyPlus_9_6_0.Types.LogLevels logLevel=building.logLevel "LogLevels of EnergyPlus output" annotation (Dialog(tab="Debug")); parameter Modelica.Units.SI.Time startTime(fixed=false) @@ -55,7 +58,7 @@ initial equation graphics={ Bitmap( extent={{58,-98},{98,-68}}, - fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png", + fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/EnergyPlusLogo.png", visible=not usePrecompiledFMU)}), Documentation( info=" diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/SpawnExternalObject.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/SpawnExternalObject.mo similarity index 90% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/SpawnExternalObject.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/SpawnExternalObject.mo index 3224947f45f..6d62ac52872 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/SpawnExternalObject.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/SpawnExternalObject.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses; class SpawnExternalObject "Class used to couple the FMU to interact with a thermal zone" extends ExternalObject; @@ -14,6 +14,8 @@ class SpawnExternalObject "Name of the Modelica instance of this object"; input String spawnExe "Name of the spawn executable, without extension, such as spawn-0.2.0-d7f1e095f3"; + input String idfVersion + "IDF version with underscores, such as 9_6_0"; input String idfName "Name of the IDF"; input String epwName @@ -28,7 +30,7 @@ class SpawnExternalObject "Specify if a pre-compiled FMU should be used instead of EnergyPlus (mainly for development)"; input String buildingsRootFileLocation "Name of top-level legal.html file of the Buildings library (used to find the spawn executable)"; - input Buildings.ThermalZones.EnergyPlus.Types.LogLevels logLevel + input Buildings.ThermalZones.EnergyPlus_9_6_0.Types.LogLevels logLevel "LogLevels of EnergyPlus output"; input Boolean printUnit "Set to true to print units for OutputVariable object. Must be false for all other objects"; @@ -61,12 +63,13 @@ class SpawnExternalObject input Real derivatives_delta[nDer] "Increments for derivative calculation"; output SpawnExternalObject adapter; - external "C" adapter=ModelicaSpawnAllocate( + external "C" adapter=allocate_Modelica_EnergyPlus_9_6_0( objectType, startTime, modelicaNameBuilding, modelicaInstanceName, spawnExe, + idfVersion, idfName, epwName, relativeSurfaceTolerance, @@ -96,9 +99,9 @@ class SpawnExternalObject derivatives_delta, nDer) annotation ( - Include="#include ", + Include="#include ", IncludeDirectory="modelica://Buildings/Resources/C-Sources", - Library={"ModelicaBuildingsEnergyPlus","fmilib_shared"}); + Library={"ModelicaBuildingsEnergyPlus_9_6_0","fmilib_shared"}); annotation ( Documentation( info=" @@ -132,11 +135,11 @@ First implementation. "Release storage" extends Modelica.Icons.Function; input SpawnExternalObject adapter; - external "C" ModelicaSpawnFree(adapter) + external "C" free_Modelica_EnergyPlus_9_6_0(adapter) annotation ( - Include="#include ", + Include="#include ", IncludeDirectory="modelica://Buildings/Resources/C-Sources", - Library={"ModelicaBuildingsEnergyPlus","fmilib_shared"}); + Library={"ModelicaBuildingsEnergyPlus_9_6_0","fmilib_shared"}); annotation ( Documentation( info=" diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/ObjectSynchronizer.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/ObjectSynchronizer.mo similarity index 84% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/ObjectSynchronizer.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/ObjectSynchronizer.mo index 49f1ce4eae7..8c865cfe293 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/ObjectSynchronizer.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/ObjectSynchronizer.mo @@ -1,7 +1,7 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Synchronize; block ObjectSynchronizer "Block that synchronizes an object" - outer Buildings.ThermalZones.EnergyPlus.Building building + outer Buildings.ThermalZones.EnergyPlus_9_6_0.Building building "Reference to outer building model"; SynchronizeBuilding synBui "Model that synchronize the Spawn objects" diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/SynchronizeBuilding.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/SynchronizeBuilding.mo similarity index 77% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/SynchronizeBuilding.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/SynchronizeBuilding.mo index 2d481fac72c..31ff78db569 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/SynchronizeBuilding.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/SynchronizeBuilding.mo @@ -1,7 +1,7 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Synchronize; model SynchronizeBuilding "Model to synchronize the Spawn objects that belong to a building" - Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize.SynchronizeConnector synchronize + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Synchronize.SynchronizeConnector synchronize "Connector that is used to synchronize objects"; annotation ( Icon( diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/SynchronizeConnector.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/SynchronizeConnector.mo similarity index 89% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/SynchronizeConnector.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/SynchronizeConnector.mo index 3bd01d69685..b5ee26bc927 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/SynchronizeConnector.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/SynchronizeConnector.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Synchronize; connector SynchronizeConnector "Connector to synchronize Spawn objects" Real do diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/package.mo similarity index 92% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/package.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/package.mo index ac8d1b7faf6..27079e2eede 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/package.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/package.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses; package Synchronize "Package with classes to synchronize Spawn objects" annotation ( Documentation( diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/package.order similarity index 100% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/Synchronize/package.order rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Synchronize/package.order diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/ThermalZoneAdapter.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/ThermalZoneAdapter.mo similarity index 91% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/ThermalZoneAdapter.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/ThermalZoneAdapter.mo index 21047d8cd7e..11adba28047 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/ThermalZoneAdapter.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/ThermalZoneAdapter.mo @@ -1,8 +1,8 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses; model ThermalZoneAdapter "Block that interacts with this EnergyPlus zone" extends Modelica.Blocks.Icons.Block; - extends Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize.ObjectSynchronizer; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Synchronize.ObjectSynchronizer; constant String modelicaNameBuilding "Name of the building to which this thermal zone belongs to" @@ -13,6 +13,9 @@ model ThermalZoneAdapter constant String spawnExe "Name of the spawn executable, without extension, such as spawn-0.2.0-d7f1e095f3" annotation (HideResult=true); + constant String idfVersion + "IDF version with underscore, used for error report" + annotation (HideResult=true); parameter String idfName "Name of the IDF file that contains this zone"; @@ -28,7 +31,7 @@ model ThermalZoneAdapter parameter String fmuName="" "Specify if a pre-compiled FMU should be used instead of EnergyPlus (mainly for development)" annotation (Dialog(tab="Debug",enable=usePrecompiledFMU)); - parameter Buildings.ThermalZones.EnergyPlus.Types.LogLevels logLevel=Buildings.ThermalZones.EnergyPlus.Types.LogLevels.Warning + parameter Buildings.ThermalZones.EnergyPlus_9_6_0.Types.LogLevels logLevel=Buildings.ThermalZones.EnergyPlus_9_6_0.Types.LogLevels.Warning "LogLevels of EnergyPlus output" annotation (Dialog(tab="Debug")); parameter Integer nFluPor @@ -95,19 +98,20 @@ protected "Total number of Spawn objects in building"; parameter Modelica.Units.SI.MassFlowRate m_flow_small(fixed=false) "Small mass flow rate used to avoid TAveInlet = 0"; - Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject( + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject( objectType=1, startTime=startTime, modelicaNameBuilding=modelicaNameBuilding, modelicaInstanceName=modelicaInstanceName, spawnExe=spawnExe, + idfVersion=idfVersion, idfName=idfName, epwName=epwName, relativeSurfaceTolerance=relativeSurfaceTolerance, epName=zoneName, usePrecompiledFMU=usePrecompiledFMU, fmuName=fmuName, - buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus.BaseClasses.buildingsRootFileLocation, + buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.buildingsRootFileLocation, logLevel=logLevel, printUnit=false, jsonName="zones", @@ -180,10 +184,10 @@ initial equation "If usePrecompiledFMU = true, must set parameter fmuName"); end if; startTime=time; - nObj=Buildings.ThermalZones.EnergyPlus.BaseClasses.initialize( + nObj=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.initialize( adapter=adapter, isSynchronized=building.isSynchronized); - {AFlo,V,mSenFac}=Buildings.ThermalZones.EnergyPlus.BaseClasses.getParameters( + {AFlo,V,mSenFac}=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.getParameters( adapter=adapter, nParOut=nParOut, isSynchronized=nObj); @@ -223,7 +227,7 @@ equation else 0 for i in 1:nFluPor)+m_flow_small*pre(TAveInlet))/(mInlet_flow+m_flow_small)); // Below, the term X_w/(1.-X_w) is for conversion from kg/kg_total_air (Modelica) to kg/kg_dry_air (EnergyPlus) - yEP=Buildings.ThermalZones.EnergyPlus.BaseClasses.exchange( + yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange( adapter=adapter, initialCall=false, nY=nY, diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mo similarity index 92% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mo index 12115e6da3b..c7ca47ae479 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation; model FMUZoneAdapterZones1 "Validation model for the class and functions that instantiate and communicate with an FMU for Model Exchange" extends Modelica.Icons.Example; @@ -6,7 +6,7 @@ model FMUZoneAdapterZones1 "Heat capacity of zone air"; inner Building building( idfName=Modelica.Utilities.Files.loadResource( - "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf"), + "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf"), epwName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw"), weaName=Modelica.Utilities.Files.loadResource( @@ -15,16 +15,17 @@ model FMUZoneAdapterZones1 usePrecompiledFMU=false) "Building model" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.ThermalZones.EnergyPlus.BaseClasses.ThermalZoneAdapter fmuZonCor( + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter fmuZonCor( modelicaNameBuilding=building.modelicaNameBuilding, final spawnExe=building.spawnExe, + final idfVersion=building.idfVersion, final idfName=building.idfName, final epwName=building.epwName, final relativeSurfaceTolerance=building.relativeSurfaceTolerance, 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, final nFluPor=2) "Adapter to EnergyPlus" @@ -102,7 +103,7 @@ First implementation. "), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones1.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mos" "Simulate and plot"), experiment( StopTime=3600, Tolerance=1e-06), diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mo similarity index 92% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mo index de70c123d96..b90ccb2905f 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation; model FMUZoneAdapterZones2 "Validation model for the class and functions that instantiate and communicate with an FMU for Model Exchange" extends Modelica.Icons.Example; @@ -7,7 +7,7 @@ model FMUZoneAdapterZones2 "Heat capacity of zone air"; inner Building building( idfName=Modelica.Utilities.Files.loadResource( - "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf"), + "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf"), epwName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw"), weaName=Modelica.Utilities.Files.loadResource( @@ -16,16 +16,17 @@ model FMUZoneAdapterZones2 usePrecompiledFMU=false) "Building model" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.ThermalZones.EnergyPlus.BaseClasses.ThermalZoneAdapter fmuZonCor( + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter fmuZonCor( final modelicaNameBuilding=building.modelicaNameBuilding, final spawnExe=building.spawnExe, + final idfVersion=building.idfVersion, final idfName=building.idfName, final epwName=building.epwName, final relativeSurfaceTolerance=building.relativeSurfaceTolerance, 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, final nFluPor=2) "Adapter to EnergyPlus" @@ -58,16 +59,17 @@ model FMUZoneAdapterZones2 displayUnit="degC")) "Zone air temperature" annotation (Placement(transformation(extent={{60,20},{80,40}}))); - Buildings.ThermalZones.EnergyPlus.BaseClasses.ThermalZoneAdapter fmuZonSou( + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter fmuZonSou( final modelicaNameBuilding=building.modelicaNameBuilding, final spawnExe=building.spawnExe, + final idfVersion=building.idfVersion, final idfName=building.idfName, final epwName=building.epwName, final relativeSurfaceTolerance=building.relativeSurfaceTolerance, 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, final nFluPor=2) "Adapter to EnergyPlus" @@ -141,7 +143,7 @@ First implementation. "), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones2.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mos" "Simulate and plot"), experiment( StopTime=3600, Tolerance=1e-06), diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mo similarity index 92% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mo index 68e3762a30c..66153f4f836 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses.Validation; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation; model FMUZoneAdapterZones3 "Validation model for the class and functions that instantiate and communicate with an FMU for Model Exchange" extends Modelica.Icons.Example; @@ -7,7 +7,7 @@ model FMUZoneAdapterZones3 "Heat capacity of zone air"; inner Building building( idfName=Modelica.Utilities.Files.loadResource( - "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf"), + "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf"), epwName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw"), weaName=Modelica.Utilities.Files.loadResource( @@ -16,16 +16,17 @@ model FMUZoneAdapterZones3 usePrecompiledFMU=false) "Building model" annotation (Placement(transformation(extent={{-80,70},{-60,90}}))); - Buildings.ThermalZones.EnergyPlus.BaseClasses.ThermalZoneAdapter fmuZonCor( + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter fmuZonCor( final modelicaNameBuilding=building.modelicaNameBuilding, final spawnExe=building.spawnExe, + final idfVersion=building.idfVersion, final idfName=building.idfName, final epwName=building.epwName, final relativeSurfaceTolerance=building.relativeSurfaceTolerance, 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, final nFluPor=2) "Adapter to EnergyPlus" @@ -58,16 +59,17 @@ model FMUZoneAdapterZones3 displayUnit="degC")) "Zone air temperature" annotation (Placement(transformation(extent={{60,20},{80,40}}))); - Buildings.ThermalZones.EnergyPlus.BaseClasses.ThermalZoneAdapter fmuZonSou( + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter fmuZonSou( final modelicaNameBuilding=building.modelicaNameBuilding, final spawnExe=building.spawnExe, + final idfVersion=building.idfVersion, final idfName=building.idfName, final epwName=building.epwName, final relativeSurfaceTolerance=building.relativeSurfaceTolerance, 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, final nFluPor=2) "Adapter to EnergyPlus" @@ -80,16 +82,17 @@ model FMUZoneAdapterZones3 displayUnit="degC")) "Zone air temperature" annotation (Placement(transformation(extent={{60,-20},{80,0}}))); - Buildings.ThermalZones.EnergyPlus.BaseClasses.ThermalZoneAdapter fmuZonNor( + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter fmuZonNor( final modelicaNameBuilding=building.modelicaNameBuilding, final spawnExe=building.spawnExe, + final idfVersion=building.idfVersion, final idfName=building.idfName, final epwName=building.epwName, final relativeSurfaceTolerance=building.relativeSurfaceTolerance, 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, final nFluPor=2) "Adapter to EnergyPlus" @@ -179,7 +182,7 @@ First implementation. "), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/BaseClasses/Validation/FMUZoneAdapterZones3.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mos" "Simulate and plot"), experiment( StopTime=3600, Tolerance=1e-06), diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/package.mo similarity index 77% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/package.mo index 7cb3f592b76..1525ae0f8eb 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/package.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses; package Validation "Collection of validation models" extends Modelica.Icons.ExamplesPackage; @@ -8,8 +8,8 @@ package Validation "Collection of validation models" info="

This package contains validation models for the classes in - -Buildings.ThermalZones.EnergyPlus.BaseClasses. + +Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.

Note that most validation models contain simple input data diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/package.order similarity index 100% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/Validation/package.order rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/package.order diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/exchange.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/exchange.mo similarity index 79% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/exchange.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/exchange.mo index 60f8b9a06e9..2aee550a1a3 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/exchange.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/exchange.mo @@ -1,8 +1,8 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses; pure function exchange "Exchange the values with the EnergyPlus thermal zone" extends Modelica.Icons.Function; - input Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject adapter + input Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter "External object"; input Boolean initialCall "Set to true if initial() is true, false otherwise"; @@ -14,12 +14,12 @@ pure function exchange "Dummy value (used to force Modelica tools to call initialize())"; output Real y[nY] "Output values. First all outputs, then all derivatives, then next event time"; -external "C" ModelicaSpawnExchange( +external "C" exchange_Modelica_EnergyPlus_9_6_0( adapter,initialCall,u,dummy,y) annotation ( - Include="#include ", + Include="#include ", IncludeDirectory="modelica://Buildings/Resources/C-Sources", - Library={"ModelicaBuildingsEnergyPlus","fmilib_shared"}); + Library={"ModelicaBuildingsEnergyPlus_9_6_0","fmilib_shared"}); annotation ( Documentation( info=" diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/getParameters.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/getParameters.mo similarity index 73% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/getParameters.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/getParameters.mo index 5f9db98963d..49a096a35a0 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/getParameters.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/getParameters.mo @@ -1,8 +1,8 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses; pure function getParameters "Get parameters for an EnergyPlus object" extends Modelica.Icons.Function; - input Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject adapter + input Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter "External object"; input Integer nParOut "Number of elements in parOut"; @@ -10,12 +10,12 @@ pure function getParameters "Set to variable that is used to synchronize the objects"; output Real parOut[nParOut] "Parameter values returned from EnergyPlus"; -external "C" ModelicaSpawnGetParameters( +external "C" getParameters_Modelica_EnergyPlus_9_6_0( adapter,isSynchronized,parOut) annotation ( - Include="#include ", + Include="#include ", IncludeDirectory="modelica://Buildings/Resources/C-Sources", - Library={"ModelicaBuildingsEnergyPlus","fmilib_shared"}); + Library={"ModelicaBuildingsEnergyPlus_9_6_0","fmilib_shared"}); annotation ( Documentation( info=" diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/getUnitAsString.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/getUnitAsString.mo similarity index 85% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/getUnitAsString.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/getUnitAsString.mo index ada8bf8cb81..bff5f3b69e0 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/getUnitAsString.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/getUnitAsString.mo @@ -1,8 +1,8 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses; pure function getUnitAsString "Return the unit enumeration as a string" extends Modelica.Icons.Function; - input Buildings.ThermalZones.EnergyPlus.Types.Units unit + input Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units unit "Unit as enumeration value"; output String unitAsString "String representation of the unit"; @@ -46,7 +46,7 @@ algorithm info="

Function that returns the string representation of a unit enumeration from -Buildings.ThermalZones.EnergyPlus.Types.Units. +Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.

", revisions=" diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/initialize.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/initialize.mo similarity index 75% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/initialize.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/initialize.mo index 72574c85991..617a4589bb1 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/initialize.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/initialize.mo @@ -1,19 +1,19 @@ -within Buildings.ThermalZones.EnergyPlus.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses; pure function initialize "Initialization for an EnergyPlus thermal zone" extends Modelica.Icons.Function; - input Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject adapter + input Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter "External object"; input Real isSynchronized "Set to variable that is used to synchronize the objects"; output Integer nObj "Returns 1 from C, used to force synchronization"; -external "C" ModelicaSpawnInitialize( +external "C" initialize_Modelica_EnergyPlus_9_6_0( adapter,isSynchronized,nObj) annotation ( - Include="#include ", + Include="#include ", IncludeDirectory="modelica://Buildings/Resources/C-Sources", - Library={"ModelicaBuildingsEnergyPlus","fmilib_shared"}); + Library={"ModelicaBuildingsEnergyPlus_9_6_0","fmilib_shared"}); annotation ( Documentation( info=" diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/package.mo similarity index 84% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/package.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/package.mo index 76fb2e25276..5c961af9770 100644 --- a/Buildings/ThermalZones/EnergyPlus/BaseClasses/package.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/package.mo @@ -1,5 +1,5 @@ -within Buildings.ThermalZones.EnergyPlus; -package BaseClasses "Package with base classes for Buildings.ThermalZones.EnergyPlus" +within Buildings.ThermalZones.EnergyPlus_9_6_0; +package BaseClasses "Package with base classes for Buildings.ThermalZones.EnergyPlus_9_6_0" extends Modelica.Icons.BasesPackage; constant String buildingsRootFileLocation= Modelica.Utilities.Files.loadResource("modelica://Buildings/legal.html") @@ -11,7 +11,7 @@ package BaseClasses "Package with base classes for Buildings.ThermalZones.Energy info="

This package contains base classes that are used to construct the models in -Buildings.ThermalZones.EnergyPlus. +Buildings.ThermalZones.EnergyPlus_9_6_0.

", revisions=" diff --git a/Buildings/ThermalZones/EnergyPlus/BaseClasses/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/package.order similarity index 100% rename from Buildings/ThermalZones/EnergyPlus/BaseClasses/package.order rename to Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/package.order diff --git a/Buildings/ThermalZones/EnergyPlus/Building.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Building.mo similarity index 93% rename from Buildings/ThermalZones/EnergyPlus/Building.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Building.mo index ee794b10794..d26eab4a109 100644 --- a/Buildings/ThermalZones/EnergyPlus/Building.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Building.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus; +within Buildings.ThermalZones.EnergyPlus_9_6_0; model Building "Model that declares a building to which EnergyPlus objects belong to" extends Modelica.Blocks.Icons.Block; @@ -7,6 +7,9 @@ model Building "Name of the spawn executable, without extension, such as spawn-0.3.0-d6204d26f6aaa" annotation (HideResult=true); + constant String idfVersion = "9_6_0" + "IDF version with underscore, used for error report"; + final constant String modelicaNameBuilding=getInstanceName() "Name of this instance" annotation (HideResult=true); @@ -30,7 +33,7 @@ model Building "Name of the weather file, in .mos format and with .mos extension" annotation(Evaluate=false); - parameter Buildings.ThermalZones.EnergyPlus.Types.LogLevels logLevel=Buildings.ThermalZones.EnergyPlus.Types.LogLevels.Warning + parameter Buildings.ThermalZones.EnergyPlus_9_6_0.Types.LogLevels logLevel=Buildings.ThermalZones.EnergyPlus_9_6_0.Types.LogLevels.Warning "Log level of EnergyPlus output" annotation (Dialog(tab="Debug")); @@ -81,8 +84,8 @@ algorithm missingInnerMessage=" Your model is using an outer \"building\" component to declare building-level parameters, but an inner \"building\" component is not defined. -Drag one instance of Buildings.ThermalZones.EnergyPlus.Building into your model, -above all declarations of Buildings.ThermalZones.EnergyPlus.ThermalZone, +Drag one instance of Buildings.ThermalZones.EnergyPlus_9_6_0.Building into your model, +above all declarations of Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone, to specify building-level parameters. This instance must have the name \"building\".", Icon( graphics={ diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/AirHeating.mo similarity index 96% rename from Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/AirHeating.mo index 5c906ae74af..5f4bcfb1c3f 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/AirHeating.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse; model AirHeating "Example model with an air-based heating system that conditions a thermal zone in EnergyPlus" extends Modelica.Icons.Example; @@ -6,7 +6,7 @@ model AirHeating "Medium model"; inner Building building( idfName=Modelica.Utilities.Files.loadResource( - "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf"), + "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf"), weaName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"), epwName=Modelica.Utilities.Files.loadResource( @@ -21,7 +21,7 @@ model AirHeating "Outdoor air mass flow rate, assuming constant infiltration air flow rate"; parameter Modelica.Units.SI.MassFlowRate mRec_flow_nominal=8*VRoo*1.2/3600 "Nominal mass flow rate for recirculated air"; - Buildings.ThermalZones.EnergyPlus.ThermalZone zon( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone zon( redeclare package Medium=Medium, zoneName="LIVING ZONE", nPorts=4) @@ -204,7 +204,7 @@ First implementation. "), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/AirHeating.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/AirHeating.mos" "Simulate and plot"), experiment( StopTime=86400, Tolerance=1e-06), diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/EquipmentSchedule.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/EquipmentSchedule.mo similarity index 75% rename from Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/EquipmentSchedule.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/EquipmentSchedule.mo index c46e3de096e..0ad54518759 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/EquipmentSchedule.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/EquipmentSchedule.mo @@ -1,10 +1,10 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse; model EquipmentSchedule "Example model with a schedule that overrides a schedule in EnergyPlus" - extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned; - Buildings.ThermalZones.EnergyPlus.Schedule schInt( + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned; + Buildings.ThermalZones.EnergyPlus_9_6_0.Schedule schInt( name="INTERMITTENT", - unit=Buildings.ThermalZones.EnergyPlus.Types.Units.Normalized) + unit=Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.Normalized) "Block that writes to the EnergyPlus schedule INTERMITTENT" annotation (Placement(transformation(extent={{-40,70},{-20,90}}))); Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse intLoaFra( @@ -35,7 +35,7 @@ First implementation. "), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/EquipmentSchedule.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/EquipmentSchedule.mos" "Simulate and plot"), experiment( StopTime=172800, Tolerance=1e-06)); diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/LightsControl.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/LightsControl.mo similarity index 92% rename from Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/LightsControl.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/LightsControl.mo index ecf2482b29e..3f5cfdae044 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/LightsControl.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/LightsControl.mo @@ -1,15 +1,15 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse; model LightsControl "Example model with one actuator that controls the lights in EnergyPlus" - extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned; - Buildings.ThermalZones.EnergyPlus.Actuator actLig( - unit=Buildings.ThermalZones.EnergyPlus.Types.Units.Power, + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned; + Buildings.ThermalZones.EnergyPlus_9_6_0.Actuator actLig( + unit=Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.Power, variableName="LIVING ZONE Lights", componentType="Lights", controlType="Electricity Rate") "Actuator for lights" annotation (Placement(transformation(extent={{100,100},{120,120}}))); - Buildings.ThermalZones.EnergyPlus.OutputVariable ligPow( + Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable ligPow( name="Lights Electricity Rate", key="LIVING ZONE Lights", isDirectDependent=true, @@ -101,7 +101,7 @@ equation annotation (Line(points={{122,110},{130,110},{130,90},{88,90},{88,70},{98,70}},color={0,0,127})); annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/LightsControl.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/LightsControl.mos" "Simulate and plot"), experiment( StopTime=172800, Tolerance=1e-06), diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mo similarity index 92% rename from Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mo index dc6dd553f34..1c85be5729d 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mo @@ -1,9 +1,9 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse; model RadiantHeatingCooling_TRoom "Example model with one thermal zone with a radiant floor where the cooling is controlled based on the room air temperature" - extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned(building( + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned(building( idfName=Modelica.Utilities.Files.loadResource( - "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf"))); + "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf"))); package MediumW=Buildings.Media.Water "Water medium"; constant Modelica.Units.SI.Area AFlo=185.8 "Floor area"; @@ -125,11 +125,11 @@ model RadiantHeatingCooling_TRoom realTrue=mCoo_flow_nominal) "Cooling water mass flow rate" annotation (Placement(transformation(extent={{-80,88},{-60,108}}))); - OpaqueConstruction attFlo( + Buildings.ThermalZones.EnergyPlus_9_6_0.OpaqueConstruction attFlo( surfaceName="Attic:LivingFloor") "Floor of the attic above the living room" annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={102,90}))); - OpaqueConstruction livFlo(surfaceName="Living:Floor") + Buildings.ThermalZones.EnergyPlus_9_6_0.OpaqueConstruction livFlo(surfaceName="Living:Floor") "Floor of the living room" annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, @@ -197,7 +197,7 @@ equation {-50,116},{-50,94},{-40,94}}, color={0,0,127})); annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TRoom.mos" "Simulate and plot"), experiment( StartTime=7776000, StopTime=9504000, @@ -210,8 +210,8 @@ that has a radiant ceiling, used for cooling, and a radiant floor, used for heat The EnergyPlus model has one conditioned zone that is above ground. This conditioned zone has an unconditioned attic. The model is constructed by extending - -Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer and adding the radiant ceiling.

@@ -247,8 +247,8 @@ This temperature is limited by the dew point of the zone air to avoid condensati

See also the model - -Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface which is controlled to track a set point for the surface temperature.

Coupling of radiant floor to EnergyPlus model

diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mo similarity index 93% rename from Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mo index 96980692f71..2b413b688da 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mo @@ -1,11 +1,11 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse; model RadiantHeatingCooling_TSurface "Example model with one thermal zone with a radiant floor where the cooling is controlled based on the surface temperature set point" extends - Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned( + Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned( building( idfName=Modelica.Utilities.Files.loadResource( - "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf"))); + "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf"))); package MediumW=Buildings.Media.Water "Water medium"; constant Modelica.Units.SI.Area AFlo=185.8 "Floor area"; @@ -126,11 +126,11 @@ model RadiantHeatingCooling_TSurface realTrue=mCoo_flow_nominal) "Cooling water mass flow rate" annotation (Placement(transformation(extent={{-80,88},{-60,108}}))); - OpaqueConstruction attFlo( + Buildings.ThermalZones.EnergyPlus_9_6_0.OpaqueConstruction attFlo( surfaceName="Attic:LivingFloor") "Floor of the attic above the living room" annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={102,90}))); - OpaqueConstruction livFlo(surfaceName="Living:Floor") + Buildings.ThermalZones.EnergyPlus_9_6_0.OpaqueConstruction livFlo(surfaceName="Living:Floor") "Floor of the living room" annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, @@ -231,7 +231,7 @@ equation {-186,-144},{-188,-144}}, color={0,0,127})); annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingCooling_TSurface.mos" "Simulate and plot"), experiment( StartTime=7776000, StopTime=9504000, @@ -244,8 +244,8 @@ that has a radiant ceiling, used for cooling, and a radiant floor, used for heat The EnergyPlus model has one conditioned zone that is above ground. This conditioned zone has an unconditioned attic. The model is constructed by extending - -Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer and adding the radiant ceiling.

@@ -284,8 +284,8 @@ This temperature is limited by the dew point of the zone air to avoid condensati

See also the model - -Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom which is controlled to track a set point for the room temperature.

Coupling of radiant floor to EnergyPlus model

diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo similarity index 93% rename from Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo index c7b6c5aa0fa..5074aca8e87 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mo @@ -1,8 +1,8 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse; model RadiantHeatingWithGroundHeatTransfer "Example model with one thermal zone with a radiant floor and ground heat transfer modeled in Modelica" extends - Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned; + Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned; package MediumW=Buildings.Media.Water "Water medium"; constant Modelica.Units.SI.Area AFlo=185.8 "Floor area"; @@ -25,7 +25,7 @@ model RadiantHeatingWithGroundHeatTransfer d=1500) "Soil properties" annotation (Placement(transformation(extent={{40,-308},{60,-288}}))); - Buildings.ThermalZones.EnergyPlus.ZoneSurface livFlo( + Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface livFlo( surfaceName="Living:Floor") "Surface of living room floor" annotation (Placement(transformation(extent={{60,-160},{80,-140}}))); @@ -145,7 +145,7 @@ equation -204},{-52,-252},{-42,-252}}, color={0,0,127})); annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/RadiantHeatingWithGroundHeatTransfer.mos" "Simulate and plot"), experiment( StopTime=432000, Tolerance=1e-06), @@ -157,8 +157,8 @@ that has a radiant floor, used for heating. The EnergyPlus model has one conditioned zone that is above ground. This conditioned zone has an unconditioned attic. This model has no cooling and hence will overheat in summer. See - -Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom for a similar model that also has cooling.

diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/ShadeControl.mo similarity index 95% rename from Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/ShadeControl.mo index 648c768b515..0c6880b8d7d 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/ShadeControl.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse; model ShadeControl "Example model with one actuator that controls a shade in EnergyPlus" extends Modelica.Icons.Example; @@ -6,7 +6,7 @@ model ShadeControl "Medium model"; inner Building building( idfName=Modelica.Utilities.Files.loadResource( - "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/EMSWindowShadeControl/EMSWindowShadeControl.idf"), + "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/EMSWindowShadeControl/EMSWindowShadeControl.idf"), epwName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw"), weaName=Modelica.Utilities.Files.loadResource( @@ -19,32 +19,32 @@ model ShadeControl each k=0) "Internal heat gains" annotation (Placement(transformation(extent={{-80,60},{-60,80}}))); - Buildings.ThermalZones.EnergyPlus.ThermalZone zonWes( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone zonWes( redeclare package Medium=Medium, zoneName="West Zone", nPorts=2) "West zone" annotation (Placement(transformation(extent={{-28,-20},{12,20}}))); - Buildings.ThermalZones.EnergyPlus.ThermalZone zonEas( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone zonEas( redeclare package Medium=Medium, zoneName="EAST ZONE", nPorts=2) "East zone" annotation (Placement(transformation(extent={{40,-20},{80,20}}))); - Buildings.ThermalZones.EnergyPlus.ThermalZone zonNor( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone zonNor( redeclare package Medium=Medium, zoneName="NORTH ZONE", nPorts=2) "North zone" annotation (Placement(transformation(extent={{0,40},{40,80}}))); - Buildings.ThermalZones.EnergyPlus.Actuator actSha( - unit=Buildings.ThermalZones.EnergyPlus.Types.Units.Normalized, + Buildings.ThermalZones.EnergyPlus_9_6_0.Actuator actSha( + unit=Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.Normalized, variableName="Zn001:Wall001:Win001", componentType="Window Shading Control", controlType="Control Status") "Actuator for window shade" annotation (Placement(transformation(extent={{100,-110},{120,-90}}))); - Buildings.ThermalZones.EnergyPlus.OutputVariable incBeaSou( + Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable incBeaSou( name="Surface Outside Face Incident Beam Solar Radiation Rate per Area", key="Zn001:Wall001:Win001", y(final unit="W/m2")) @@ -215,7 +215,7 @@ equation annotation (Line(points={{100,0},{60,0}},color={191,0,0})); annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/ShadeControl.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/ShadeControl.mos" "Simulate and plot"), experiment( StartTime=8640000, StopTime=8899200, diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Unconditioned.mo similarity index 89% rename from Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Unconditioned.mo index 27ac0b18115..e337b839b26 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Unconditioned.mo @@ -1,12 +1,12 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse; model Unconditioned "Example model with one unconditoned zone simulated in Modelica, and the other two unconditioned zones simulated in EnergyPlus" extends Modelica.Icons.Example; package Medium=Buildings.Media.Air "Medium model"; - inner Buildings.ThermalZones.EnergyPlus.Building building( + inner Buildings.ThermalZones.EnergyPlus_9_6_0.Building building( idfName=Modelica.Utilities.Files.loadResource( - "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf"), + "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf"), epwName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw"), weaName=Modelica.Utilities.Files.loadResource( @@ -18,7 +18,7 @@ model Unconditioned parameter Modelica.Units.SI.Volume VRoo=453.1 "Room volume"; parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=VRoo*1.2*0.3/3600 "Nominal mass flow rate"; - Buildings.ThermalZones.EnergyPlus.ThermalZone zon( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone zon( redeclare package Medium=Medium, zoneName="LIVING ZONE", nPorts=2) @@ -79,7 +79,7 @@ First implementation. "), __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/Unconditioned.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Unconditioned.mos" "Simulate and plot"), experiment( StopTime=432000, Tolerance=1e-06)); diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/package.mo similarity index 89% rename from Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/package.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/package.mo index fa3c005b550..a0d774e40cc 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/package.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/package.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.Examples; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples; package SingleFamilyHouse "Package with examples that illustrate the use of the EnergyPlus objects" extends Modelica.Icons.ExamplesPackage; diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/package.order similarity index 100% rename from Buildings/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse/package.order rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/package.order diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Spring.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Spring.mo similarity index 74% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Spring.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Spring.mo index 49879c8f28b..8caa5974783 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Spring.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Spring.mo @@ -1,10 +1,10 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; model ASHRAE2006Spring "Variable air volume flow system with terminal reheat and five thermal zones using a control sequence published by ASHRAE in 2006" - extends Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter; annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Spring.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Spring.mos" "Simulate and plot"), experiment( StartTime=7344000, StopTime=7776000, @@ -17,8 +17,8 @@ model ASHRAE2006Spring info="

This is the same model as - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter but configured for simulation of a few days in spring.

", diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Summer.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Summer.mo similarity index 74% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Summer.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Summer.mo index 0a4b154d6cb..dd2ce0896c3 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Summer.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Summer.mo @@ -1,10 +1,10 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; model ASHRAE2006Summer "Variable air volume flow system with terminal reheat and five thermal zones using a control sequence published by ASHRAE in 2006" - extends Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter; annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Summer.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Summer.mos" "Simulate and plot"), experiment( StartTime=16848000, StopTime=17280000, @@ -17,8 +17,8 @@ model ASHRAE2006Summer info="

This is the same model as - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter but configured for simulation of a few days in spring.

", diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Winter.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Winter.mo similarity index 88% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Winter.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Winter.mo index 2d4b3fcbf39..cdb4e26e778 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Winter.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Winter.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; model ASHRAE2006Winter "Variable air volume flow system with terminal reheat and five thermal zones using a control sequence published by ASHRAE in 2006" extends Modelica.Icons.Example; @@ -9,7 +9,7 @@ model ASHRAE2006Winter mNor_flow_nominal=ACHNor*VRooNor*conv, mWes_flow_nominal=ACHWes*VRooWes*conv, redeclare Buildings.Examples.VAVReheat.BaseClasses.ASHRAE2006 hvac, - redeclare Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.BaseClasses.Floor flo); + redeclare Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.BaseClasses.Floor flo); parameter Real ACHCor(final unit="1/h")=4 "Design air change per hour core"; @@ -24,7 +24,7 @@ model ASHRAE2006Winter annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/ASHRAE2006Winter.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/ASHRAE2006Winter.mos" "Simulate and plot"), experiment( StartTime=432000, StopTime=864000, @@ -54,8 +54,8 @@ See the model Buildings.Examples.VAVReheat.BaseClasses.PartialHVAC for a description of the HVAC system, and see the model - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.BaseClasses.Floor + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.BaseClasses.Floor for a description of the building envelope.

@@ -84,8 +84,8 @@ using a finite state machine.

A similar model but with a different control sequence can be found in - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter. + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter.

References

diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/Floor.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/Floor.mo similarity index 96% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/Floor.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/Floor.mo index 3c5ec252b80..95878607a1b 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/Floor.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/Floor.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.BaseClasses; model Floor "Model of a floor of the building" extends Buildings.Examples.VAVReheat.BaseClasses.PartialFloor( @@ -51,37 +51,37 @@ model Floor Modelica.Units.SI.Temperature TAirNor=nor.TAir "Air temperature north zone"; Modelica.Units.SI.Temperature TAirEas=eas.TAir "Air temperature east zone"; Modelica.Units.SI.Temperature TAirWes=wes.TAir "Air temperature west zone"; - ThermalZone sou( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone sou( redeclare package Medium=Medium, nPorts=5, zoneName="Perimeter_ZN_1") "South zone" annotation (Placement(transformation(extent={{144,-44},{184,-4}}))); - ThermalZone eas( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone eas( redeclare package Medium=Medium, nPorts=5, zoneName="Perimeter_ZN_2") "East zone" annotation (Placement(transformation(extent={{300,68},{340,108}}))); - ThermalZone nor( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone nor( redeclare package Medium=Medium, nPorts=5, zoneName="Perimeter_ZN_3") "North zone" annotation (Placement(transformation(extent={{144,116},{184,156}}))); - ThermalZone wes( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone wes( redeclare package Medium=Medium, nPorts=5, zoneName="Perimeter_ZN_4") "West zone" annotation (Placement(transformation(extent={{12,58},{52,98}}))); - ThermalZone cor( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone cor( redeclare package Medium=Medium, nPorts=11, zoneName="Core_ZN") "Core zone" annotation (Placement(transformation(extent={{144,60},{184,100}}))); - ThermalZone att( + Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone att( redeclare package Medium=Medium, zoneName="Attic", T_start=275.15) @@ -89,7 +89,7 @@ model Floor annotation (Placement(transformation(extent={{300,-60},{340,-20}}))); parameter String idfName=Modelica.Utilities.Files.loadResource( - "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf") + "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf") "Name of the IDF file"; parameter String epwName=Modelica.Utilities.Files.loadResource( "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw") @@ -99,7 +99,7 @@ model Floor "Name of the weather file"; protected - inner Buildings.ThermalZones.EnergyPlus.Building building( + inner Buildings.ThermalZones.EnergyPlus_9_6_0.Building building( idfName=idfName, epwName=epwName, weaName=weaName, @@ -406,8 +406,8 @@ the instances of Buildings.Airflow.Multizone.DoorOpen are made smaller. Their length has been reduced proportionally to the difference in length of the walls of the core zone of the two buildings. -See also -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice +See also +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice for a description of the differences in these buildings.

References

diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo similarity index 94% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo index d4f68dfd835..5696cb05620 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/IdealHeaterCooler.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.BaseClasses; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.BaseClasses; model IdealHeaterCooler "Model of ideal heater or cooler" extends Modelica.Blocks.Icons.Block; @@ -76,8 +76,8 @@ The heater or cooler has a PID controller that regulates the heat added or remov

To use this model, connect its heat port to the heat port of an air volume, for example, the heat port heaPorAir of - -Buildings.ThermalZones.EnergyPlus.ThermalZone. + +Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone.

Note that this model can only provide sensible cooling, but no latent cooling. diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/package.mo similarity index 56% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/package.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/package.mo index 72483a34188..5dc8b80ed2b 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/package.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/package.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; package BaseClasses "Package with base classes" extends Modelica.Icons.BasesPackage; @@ -8,8 +8,8 @@ package BaseClasses "Package with base classes" info="

This package contains base classes that are used to construct the models in - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice. + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.

")); end BaseClasses; diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/package.order similarity index 100% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/BaseClasses/package.order rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/BaseClasses/package.order diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Spring.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Spring.mo similarity index 74% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Spring.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Spring.mo index 8acb5dd3d42..e7b37cdb8e0 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Spring.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Spring.mo @@ -1,10 +1,10 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; model Guideline36Spring "Variable air volume flow system with terminal reheat and five thermal zones controlled using an ASHRAE G36 controller" - extends Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter; annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Spring.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Spring.mos" "Simulate and plot"), experiment( StartTime=7344000, StopTime=7776000, @@ -17,8 +17,8 @@ model Guideline36Spring info="

This is the same model as - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter but configured for simulation of a few days in spring.

", diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Summer.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Summer.mo similarity index 74% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Summer.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Summer.mo index a88308a974e..c237f930525 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Summer.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Summer.mo @@ -1,10 +1,10 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; model Guideline36Summer "Variable air volume flow system with terminal reheat and five thermal zones controlled using an ASHRAE G36 controller" - extends Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter; annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Summer.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Summer.mos" "Simulate and plot"), experiment( StartTime=16848000, StopTime=17280000, @@ -17,8 +17,8 @@ model Guideline36Summer info="

This is the same model as - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter but configured for simulation of a few days in summer.

", diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Winter.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Winter.mo similarity index 85% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Winter.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Winter.mo index e536a30aa43..453c938243c 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Winter.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Winter.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; model Guideline36Winter "Variable air volume flow system with terminal reheat and five thermal zones controlled using an ASHRAE G36 controller" extends Modelica.Icons.Example; @@ -9,7 +9,7 @@ model Guideline36Winter mNor_flow_nominal=ACHNor*VRooNor*conv, mWes_flow_nominal=ACHWes*VRooWes*conv, redeclare Buildings.Examples.VAVReheat.BaseClasses.Guideline36 hvac, - redeclare Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.BaseClasses.Floor flo); + redeclare Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.BaseClasses.Floor flo); parameter Real ACHCor(final unit="1/h")=4 "Design air change per hour core"; @@ -24,7 +24,7 @@ model Guideline36Winter annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Guideline36Winter.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Guideline36Winter.mos" "Simulate and plot"), experiment( StartTime=432000, StopTime=864000, @@ -50,8 +50,8 @@ See the model Buildings.Examples.VAVReheat.BaseClasses.PartialHVAC for a description of the HVAC system, and see the model - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.BaseClasses.Floor + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.BaseClasses.Floor for a description of the building envelope.

@@ -67,8 +67,8 @@ sequence is shown in the figure below.

A similar model but with a different control sequence can be found in - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter.. + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter.. Note that this model, because of the frequent time sampling, has longer computing time than diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSpring.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSpring.mo similarity index 60% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSpring.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSpring.mo index 4e87029b3c8..2c54b4f93a9 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSpring.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSpring.mo @@ -1,10 +1,10 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; model IdealHeatingCoolingSpring "Building with constant fresh air and ideal heating/cooling that exactly meets set point" - extends Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingWinter; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingWinter; annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSpring.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSpring.mos" "Simulate and plot"), experiment( StartTime=7344000, StopTime=7776000, @@ -17,8 +17,8 @@ model IdealHeatingCoolingSpring info="

This is the same model as - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingWinter + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingWinter but configured for simulation of a few days in summer.

", diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSummer.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSummer.mo similarity index 60% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSummer.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSummer.mo index 58b49437fdd..92cd20b5932 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSummer.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSummer.mo @@ -1,10 +1,10 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; model IdealHeatingCoolingSummer "Building with constant fresh air and ideal heating/cooling that exactly meets set point" - extends Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingWinter; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingWinter; annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingSummer.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingSummer.mos" "Simulate and plot"), experiment( StartTime=16848000, StopTime=17280000, @@ -17,8 +17,8 @@ model IdealHeatingCoolingSummer info="

This is the same model as - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.IdealHeatingCoolingWinter + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingWinter but configured for simulation of a few days in summer.

", diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingWinter.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingWinter.mo similarity index 94% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingWinter.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingWinter.mo index 50e9e5da880..fa4110f999f 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingWinter.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingWinter.mo @@ -1,7 +1,7 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; model IdealHeatingCoolingWinter "Building with constant fresh air and ideal heating/cooling that exactly meets set point" - extends Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Unconditioned; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Unconditioned; Controls.OBC.CDL.Continuous.Sources.Constant THeaSet[5]( each k( final unit="K", @@ -76,7 +76,7 @@ equation annotation (Line(points={{-32,158.4},{-46,158.4},{-46,146},{-58,146}},color={0,0,127})); annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/IdealHeatingCoolingWinter.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/IdealHeatingCoolingWinter.mos" "Simulate and plot"), experiment( StartTime=432000, StopTime=864000, diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Unconditioned.mo similarity index 95% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Unconditioned.mo index 39ccea7868e..a3f480d4770 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Unconditioned.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice; model Unconditioned "Open loop model of one floor" extends Modelica.Icons.Example; @@ -18,7 +18,7 @@ model Unconditioned BoundaryConditions.WeatherData.Bus weaBus "Weather data bus" annotation (Placement(transformation(extent={{-50,40},{-30,60}}))); - Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.BaseClasses.Floor flo( + Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.BaseClasses.Floor flo( redeclare package Medium=Medium, nor( T_start=275.15), @@ -94,7 +94,7 @@ equation annotation (Line(points={{24,-20},{38,-20},{38,12.7692},{37.1652,12.7692}},color={0,127,255})); annotation ( __Dymola_Commands( - file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Examples/SmallOffice/Unconditioned.mos" "Simulate and plot"), + file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/Unconditioned.mos" "Simulate and plot"), experiment( StopTime=172800, Tolerance=1e-06), diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/package.mo similarity index 66% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/package.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/package.mo index d5f1eeddb85..6652e83b94b 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/package.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/package.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus.Examples; +within Buildings.ThermalZones.EnergyPlus_9_6_0.Examples; package SmallOffice "Package with VAV models for a small office building" extends Modelica.Icons.ExamplesPackage; @@ -13,11 +13,11 @@ for a office building.

Note

The models - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter and - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter appear to be quite similar to Buildings.Examples.VAVReheat.ASHRAE2006 @@ -27,8 +27,8 @@ Buildings.Examples.VAVReheat.Guideline36, respectively, because they all have the same HVAC system, control sequences, and all have five thermal zones. However, the models in - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice are from the DOE Commercial Reference Building, Small Office, new construction, ASHRAE 90.1-2004, @@ -41,8 +41,8 @@ are from the Medium Office, new construction, ASHRAE 90.1-2004, version 1.2_4.0. Therefore, the dimensions of the thermal zones in - -Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice are considerably smaller than in Buildings.Examples.VAVReheat. diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/package.order similarity index 100% rename from Buildings/ThermalZones/EnergyPlus/Examples/SmallOffice/package.order rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/SmallOffice/package.order diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/package.mo similarity index 66% rename from Buildings/ThermalZones/EnergyPlus/Examples/package.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/package.mo index 7a792a29a12..26cfd2ad1d3 100644 --- a/Buildings/ThermalZones/EnergyPlus/Examples/package.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/package.mo @@ -1,4 +1,4 @@ -within Buildings.ThermalZones.EnergyPlus; +within Buildings.ThermalZones.EnergyPlus_9_6_0; package Examples "Collection of models that illustrate model use and test models" extends Modelica.Icons.ExamplesPackage; @@ -8,8 +8,8 @@ package Examples "Collection of models that illustrate model use and test models info="

This package contains examples for the use of models that can be found in - -Buildings.ThermalZones.EnergyPlus. + +Buildings.ThermalZones.EnergyPlus_9_6_0.

")); end Examples; diff --git a/Buildings/ThermalZones/EnergyPlus/Examples/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/package.order similarity index 100% rename from Buildings/ThermalZones/EnergyPlus/Examples/package.order rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Examples/package.order diff --git a/Buildings/ThermalZones/EnergyPlus/OpaqueConstruction.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/OpaqueConstruction.mo similarity index 86% rename from Buildings/ThermalZones/EnergyPlus/OpaqueConstruction.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/OpaqueConstruction.mo index df3c7f150eb..943ec21c419 100644 --- a/Buildings/ThermalZones/EnergyPlus/OpaqueConstruction.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/OpaqueConstruction.mo @@ -1,8 +1,8 @@ -within Buildings.ThermalZones.EnergyPlus; +within Buildings.ThermalZones.EnergyPlus_9_6_0; model OpaqueConstruction "Model to exchange heat of an opaque construction with EnergyPlus" - extends Buildings.ThermalZones.EnergyPlus.BaseClasses.PartialEnergyPlusObject; - extends Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize.ObjectSynchronizer; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.PartialEnergyPlusObject; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Synchronize.ObjectSynchronizer; parameter String surfaceName "Surface unique name in the EnergyPlus idf file"; final parameter Modelica.Units.SI.Area A(final fixed=false, min=1E-10) @@ -33,19 +33,20 @@ protected fixed=false, start=0) "Total number of Spawn objects in building"; - Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject( + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject( objectType=6, startTime=startTime, modelicaNameBuilding=modelicaNameBuilding, modelicaInstanceName=modelicaInstanceName, spawnExe=spawnExe, + idfVersion=idfVersion, idfName=idfName, epwName=epwName, relativeSurfaceTolerance=relativeSurfaceTolerance, epName=surfaceName, usePrecompiledFMU=usePrecompiledFMU, fmuName=fmuName, - buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus.BaseClasses.buildingsRootFileLocation, + buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.buildingsRootFileLocation, logLevel=logLevel, printUnit=false, jsonName="buildingSurfaceDetailed", @@ -98,10 +99,10 @@ initial equation assert( not usePrecompiledFMU, "Use of pre-compiled FMU is not supported for ZoneSurface."); - nObj=Buildings.ThermalZones.EnergyPlus.BaseClasses.initialize( + nObj=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.initialize( adapter=adapter, isSynchronized=building.isSynchronized); - {A}=Buildings.ThermalZones.EnergyPlus.BaseClasses.getParameters( + {A}=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.getParameters( adapter=adapter, nParOut=nParOut, isSynchronized=nObj); @@ -123,7 +124,7 @@ equation TFroLast=heaPorFro.T; TBacLast=heaPorBac.T; dtLast=time-pre(tLast); - yEP=Buildings.ThermalZones.EnergyPlus.BaseClasses.exchange( + yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange( adapter=adapter, initialCall=false, nY=nY, @@ -177,18 +178,18 @@ If the back-side surface is above ground, then the heat flow rate from the groun This model allows for example coupling of a radiant slab that is modeled in Modelica to the EnergyPlus thermal zone model. Examples of such radiant systems include a floor slab with embedded pipes and a radiant cooling panel that is suspended from a ceiling. The model - -Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom illustrates the use of this model for a floor and ceiling slab. + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom illustrates the use of this model for a floor and ceiling slab.

Note that if the ground heat transfer of the floor slab is modeled in Modelica, then the model - -Buildings.ThermalZones.EnergyPlus.ZoneSurface + +Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface can be used, as shown for the floor slab in - -Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer. + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer.

By convention, if a surface cools the thermal zone, @@ -225,7 +226,7 @@ If this construction is modeled with a radiant slab, that may have pipes embedde to cool the living room, then this model can be used as 

-Buildings.ThermalZones.EnergyPlus.OpaqueConstruction attFlo(surfaceName=\"Attic:LivingFloor\")
+Buildings.ThermalZones.EnergyPlus_9_6_0.OpaqueConstruction attFlo(surfaceName=\"Attic:LivingFloor\")
     \"Floor of the attic above the living room\";

@@ -234,8 +235,8 @@ surface of a radiant slab, and the heat port attFlo.heaPorBac can be connected to the downward facing surface of the radiant slab that cool the living room via the surface Living:Ceiling. This configuration is illustrated in the example - -Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom. + +Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom.

", revisions=" diff --git a/Buildings/ThermalZones/EnergyPlus/OutputVariable.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/OutputVariable.mo similarity index 96% rename from Buildings/ThermalZones/EnergyPlus/OutputVariable.mo rename to Buildings/ThermalZones/EnergyPlus_9_6_0/OutputVariable.mo index 5903237a783..b764d7aaddd 100644 --- a/Buildings/ThermalZones/EnergyPlus/OutputVariable.mo +++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/OutputVariable.mo @@ -1,8 +1,8 @@ -within Buildings.ThermalZones.EnergyPlus; +within Buildings.ThermalZones.EnergyPlus_9_6_0; model OutputVariable "Block to read an EnergyPlus output variable" - extends Buildings.ThermalZones.EnergyPlus.BaseClasses.PartialEnergyPlusObject; - extends Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize.ObjectSynchronizer; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.PartialEnergyPlusObject; + extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Synchronize.ObjectSynchronizer; parameter String name "EnergyPlus name of the output variable as in the EnergyPlus .rdd or .mdd file"; parameter String key @@ -36,19 +36,20 @@ protected fixed=false, start=0) "Total number of Spawn objects in building"; - Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject( + Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject( objectType=4, startTime=startTime, modelicaNameBuilding=modelicaNameBuilding, modelicaInstanceName=modelicaInstanceName, spawnExe=spawnExe, + idfVersion=idfVersion, idfName=idfName, epwName=epwName, relativeSurfaceTolerance=relativeSurfaceTolerance, epName=name, usePrecompiledFMU=usePrecompiledFMU, fmuName=fmuName, - buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus.BaseClasses.buildingsRootFileLocation, + buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.buildingsRootFileLocation, logLevel=logLevel, printUnit=printUnit, jsonName="outputVariables", @@ -77,7 +78,7 @@ initial equation assert( not usePrecompiledFMU, "Use of pre-compiled FMU is not supported for block OutputVariable."); - nObj=Buildings.ThermalZones.EnergyPlus.BaseClasses.initialize( + nObj=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.initialize( adapter=adapter, isSynchronized=building.isSynchronized); @@ -88,7 +89,7 @@ equation directDependency_in_internal=0; end if; when {initial(),time >= pre(tNext)} then - yEP=Buildings.ThermalZones.EnergyPlus.BaseClasses.exchange( + yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange( adapter=adapter, initialCall=false, nY=nY, @@ -158,7 +159,7 @@ for the zone LIVING ZONE, the Modelica instantiation would be 

-Buildings.ThermalZones.EnergyPlus.OutputVariable equEle(
+Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable equEle(
   name=\"Zone Electric Equipment Electricity Rate\",
   key=\"LIVING ZONE\")
   \"Block that reads output from EnergyPlus\";
@@ -169,7 +170,7 @@ To obtain the value of
 the Modelica instantiation would be
 

 
-Buildings.ThermalZones.EnergyPlus.OutputVariable TOut(
+Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable TOut(
   name=\"Site Outdoor Air Drybulb Temperature\",
   key=\"Environment\")
   \"Block that reads output from EnergyPlus\";
@@ -177,8 +178,8 @@ Buildings.ThermalZones.EnergyPlus.OutputVariable TOut(
 

 (Note that this variable could be read directly from the Modelica weather data bus,
 which can be accessed from
-
-Buildings.ThermalZones.EnergyPlus.Building.)
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Building.)
 

 

 By default, the Modelica log file will display the unit in the form
@@ -202,8 +203,8 @@ the illuminance in a room that changes instantaneously when the window blind is
 the output variable Zone Electric Equipment Electricity Rate which changes instantaneously
 when a schedule value switches it on
 (see
-
-Buildings.ThermalZones.EnergyPlus.Validation.Schedule.EquipmentScheduleOutputVariable).
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.Schedule.EquipmentScheduleOutputVariable).
 For such variables, users should set isDirectDependent=true.
 Output variables that do not depend directly on an input variable include
 continuous time states such as the inside temperature of a wall
@@ -214,15 +215,15 @@ For these variables, users should leave isDirectDependent=false.
 If a user sets isDirectDependent=true, then the model enables
 the input connector directDependency.
 Users then need to connect this input to the output(s) of these instance of
-
-Buildings.ThermalZones.EnergyPlus.Actuator
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Actuator
 or
-
-Buildings.ThermalZones.EnergyPlus.Schedule
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Schedule
 on which this output directly depends on.
 See for example
-
-Buildings.ThermalZones.EnergyPlus.Validation.Schedule.EquipmentScheduleOutputVariable.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.Schedule.EquipmentScheduleOutputVariable.
 If the output depends on multiple inputs, just multiply these inputs and connect their product
 to the connector directDependency. What the value is is irrelevant,
 but a Modelica code generator will then understand that first the input needs to be sent
@@ -244,8 +245,8 @@ to the EnergyPlus idf-file. This will produce an EnergyPlus result data dictiona
 In the table below, the name in the first column
 must be used as the value for the parameter name
 in instances of
-
-Buildings.ThermalZones.EnergyPlus.OutputVariable.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable.
 

 
 
diff --git a/Buildings/ThermalZones/EnergyPlus/Schedule.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Schedule.mo
similarity index 83%
rename from Buildings/ThermalZones/EnergyPlus/Schedule.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Schedule.mo
index 09b2ec36799..509bb0a655c 100644
--- a/Buildings/ThermalZones/EnergyPlus/Schedule.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Schedule.mo
@@ -1,11 +1,11 @@
-within Buildings.ThermalZones.EnergyPlus;
+within Buildings.ThermalZones.EnergyPlus_9_6_0;
 block Schedule
   "Block to write to an EnergyPlus schedule"
-  extends Buildings.ThermalZones.EnergyPlus.BaseClasses.PartialEnergyPlusObject;
-  extends Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize.ObjectSynchronizer;
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.PartialEnergyPlusObject;
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Synchronize.ObjectSynchronizer;
   parameter String name
     "Name of schedule";
-  parameter Buildings.ThermalZones.EnergyPlus.Types.Units unit
+  parameter Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units unit
     "Unit of variable as used in Modelica"
     annotation (choicesAllMatching=true);
   Modelica.Blocks.Interfaces.RealInput u
@@ -30,21 +30,22 @@ protected
     fixed=false,
     start=0)
     "Total number of Spawn objects in building";
-  final parameter String unitString=Buildings.ThermalZones.EnergyPlus.BaseClasses.getUnitAsString(unit)
+  final parameter String unitString=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.getUnitAsString(unit)
     "Unit as a string";
-  Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject(
     objectType=2,
     startTime=startTime,
     modelicaNameBuilding=modelicaNameBuilding,
     modelicaInstanceName=modelicaInstanceName,
     spawnExe=spawnExe,
+    idfVersion=idfVersion,
     idfName=idfName,
     epwName=epwName,
     relativeSurfaceTolerance=relativeSurfaceTolerance,
     epName=name,
     usePrecompiledFMU=usePrecompiledFMU,
     fmuName=fmuName,
-    buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus.BaseClasses.buildingsRootFileLocation,
+    buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.buildingsRootFileLocation,
     logLevel=logLevel,
     printUnit=false,
     jsonName="schedules",
@@ -64,6 +65,7 @@ protected
     nDer=nDer,
     derivatives_delta=fill(0,nDer))
     "Class to communicate with EnergyPlus";
+
   Real yEP[nY]
     "Output of exchange function";
 
@@ -71,12 +73,12 @@ initial equation
   assert(
     not usePrecompiledFMU,
     "Use of pre-compiled FMU is not supported for block Schedule.");
-  nObj=Buildings.ThermalZones.EnergyPlus.BaseClasses.initialize(
+  nObj=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.initialize(
     adapter=adapter,
     isSynchronized=building.isSynchronized);
 
 equation
-  yEP=Buildings.ThermalZones.EnergyPlus.BaseClasses.exchange(
+  yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange(
     adapter=adapter,
     initialCall=false,
     nY=nY,
@@ -139,10 +141,10 @@ then EnergyPlus will receive the inputs
 The parameter unit specifies the unit of the signal u.
 This unit is then converted internally to the units required by EnergyPlus before
 the value is sent to EnergyPlus.
-See Buildings.ThermalZones.EnergyPlus.Types.Units
+See Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units
 for the supported units.
 If the value of the parameter unit is left at its default value of
-Buildings.ThermalZones.EnergyPlus.Types.Units.unspecified, then
+Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.unspecified, then
 the simulation will stop with an error.
 
Usage

@@ -167,13 +169,13 @@ Next, instantiate the actuator in Modelica. For the above
 Schedule:Compact, the Modelica instantiation would be
 
-  Buildings.ThermalZones.EnergyPlus.Schedule schInt(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.Schedule schInt(
     name = \"INTERMITTENT\",
-    unit = Buildings.ThermalZones.EnergyPlus.Types.Units.Normalized)
+    unit = Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.Normalized)
     \"Block that writes to the EnergyPlus schedule INTERMITTENT\";
 

-The entry units=Buildings.ThermalZones.EnergyPlus.Types.Units.Normalized
+The entry units=Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.Normalized
 will cause the value to be sent to EnergyPlus without any unit conversion.
 
",
diff --git a/Buildings/ThermalZones/EnergyPlus/ThermalZone.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/ThermalZone.mo
similarity index 96%
rename from Buildings/ThermalZones/EnergyPlus/ThermalZone.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/ThermalZone.mo
index 9970a6f9cda..be625bce0a5 100644
--- a/Buildings/ThermalZones/EnergyPlus/ThermalZone.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/ThermalZone.mo
@@ -1,7 +1,7 @@
-within Buildings.ThermalZones.EnergyPlus;
+within Buildings.ThermalZones.EnergyPlus_9_6_0;
 model ThermalZone
   "Model to connect to an EnergyPlus thermal zone"
-  extends Buildings.ThermalZones.EnergyPlus.BaseClasses.PartialEnergyPlusObject;
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.PartialEnergyPlusObject;
   parameter String zoneName
     "Name of the thermal zone as specified in the EnergyPlus input";
   parameter Integer nPorts=0
@@ -82,10 +82,11 @@ protected
       273.15 + 37) "Latent heat of water vapor";
   final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=V*3/3600
     "Nominal mass flow rate (used for regularization)";
-  Buildings.ThermalZones.EnergyPlus.BaseClasses.ThermalZoneAdapter fmuZon(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter fmuZon(
     final modelicaNameBuilding=modelicaNameBuilding,
     final modelicaInstanceName=modelicaInstanceName,
     final spawnExe=spawnExe,
+    final idfVersion=idfVersion,
     final idfName=idfName,
     final epwName=epwName,
     final relativeSurfaceTolerance=relativeSurfaceTolerance,
@@ -252,7 +253,7 @@ equation
   connect(TFlu.y,TAir)
     annotation (Line(points={{41,0},{210,0}},color={0,0,127}));
   connect(heaFloSen.Q_flow,vol.Q_flow)
-    annotation (Line(points={{-30,-20},{-30,-36},{-12,-36}},color={0,0,127}));
+    annotation (Line(points={{-30,-21},{-30,-36},{-12,-36}},color={0,0,127}));
   connect(vol.XiOut[1],fmuZon.X_w)
     annotation (Line(points={{0,-31},{0,-24},{30,-24},{30,-46},{80,-46}},color={0,0,127}));
   connect(X_w.y,relHum.X_w)
@@ -352,7 +353,7 @@ equation
         Bitmap(
           visible=false,
           extent={{134,-176},{174,-146}},
-          fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png"),
+          fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/EnergyPlusLogo.png"),
         Text(
           fillColor={61,61,61},
           fillPattern=FillPattern.Solid,
@@ -371,23 +372,23 @@ Model for a thermal zone that is implemented in EnergyPlus.
 This model instantiates the FMU with the name idfName and
 connects to the thermal zone with name zoneName.
 The idfName needs to be specified in an instance of
-
-Buildings.ThermalZones.EnergyPlus.Building
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Building
 that is named building, and that is placed at this
 or at a higher hierarchy-level of the model.
 If the FMU is already instantiated by another instance of this model,
 it will use the already instantiated FMU. Hence, for each thermal zone
 in an EnergyPlus FMU, one instance of this model needs to be used.
-See 
-Buildings.ThermalZones.EnergyPlus.UsersGuide
+See 
+Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide
 for how zones are simulated that are declared in the EnergyPlus input data file
 but not in Modelica.
 

 If there are two instances that declare the same zoneName
 and have in the model hierarchy the same instance of
-
-Buildings.ThermalZones.EnergyPlus.Building,
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Building,
 then the simulation will stop with an error.
 
Main Equations

diff --git a/Buildings/ThermalZones/EnergyPlus/Types/LogLevels.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Types/LogLevels.mo
similarity index 97%
rename from Buildings/ThermalZones/EnergyPlus/Types/LogLevels.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Types/LogLevels.mo
index 4d870ecac9a..a19d53023de 100644
--- a/Buildings/ThermalZones/EnergyPlus/Types/LogLevels.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Types/LogLevels.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Types;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Types;
 type LogLevels = enumeration(
     Error
   "Errors",
diff --git a/Buildings/ThermalZones/EnergyPlus/Types/Units.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Types/Units.mo
similarity index 96%
rename from Buildings/ThermalZones/EnergyPlus/Types/Units.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Types/Units.mo
index a98ec58bd77..9532f4a95b5 100644
--- a/Buildings/ThermalZones/EnergyPlus/Types/Units.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Types/Units.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Types;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Types;
 type Units = enumeration(
     Normalized
   "Normalized, such as a control signal between 0 and 1 or status 0, 1, 2, ... (1)",
@@ -34,7 +34,7 @@ type Units = enumeration(
   annotation (Documentation(info="

 Enumeration for the units used as inputs to the block
-Buildings.ThermalZones.EnergyPlus.Schedule.
+Buildings.ThermalZones.EnergyPlus_9_6_0.Schedule.
 

 The units are converted between Modelica and EnergyPlus as shown in the table below.
diff --git a/Buildings/ThermalZones/EnergyPlus/Types/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Types/package.mo
similarity index 88%
rename from Buildings/ThermalZones/EnergyPlus/Types/package.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Types/package.mo
index cc084cb0666..e42fe57889f 100644
--- a/Buildings/ThermalZones/EnergyPlus/Types/package.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Types/package.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus;
+within Buildings.ThermalZones.EnergyPlus_9_6_0;
 package Types "Package with type definitions"
   extends Modelica.Icons.TypesPackage;
 
diff --git a/Buildings/ThermalZones/EnergyPlus/Types/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Types/package.order
similarity index 100%
rename from Buildings/ThermalZones/EnergyPlus/Types/package.order
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Types/package.order
diff --git a/Buildings/ThermalZones/EnergyPlus/UsersGuide.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/UsersGuide.mo
similarity index 69%
rename from Buildings/ThermalZones/EnergyPlus/UsersGuide.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/UsersGuide.mo
index ee83d2690a1..b4b286ad2ff 100644
--- a/Buildings/ThermalZones/EnergyPlus/UsersGuide.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/UsersGuide.mo
@@ -1,7 +1,121 @@
-within Buildings.ThermalZones.EnergyPlus;
+within Buildings.ThermalZones.EnergyPlus_9_6_0;
 package UsersGuide
   "EnergyPlus package user's guide"
   extends Modelica.Icons.Information;
+
+  class Installation
+    "Installing binaries"
+    extends Modelica.Icons.Information;
+    annotation (
+      preferredView="info",
+      Documentation(
+        info="
+
Installation of binaries

+

+The official release of the Modelica Buildings Library that can be downloaded at
+simulationresearch.lbl.gov/modelica/download.html
+contains all binaries required to simulated the models in
+Buildings.ThermalZones_9_6_0.
+You should not have to do any other installations or settings.
+

+

+However, binaries can also be downloaded and installed manually,
+the binaries can be downloaded from the following links:
+

+

 
 
 
 
 
 
 
 

+
+
+
+
+
+
+
+
+
+
+
Operating systemLink
Linux
+https://spawn.s3.amazonaws.com/builds/Spawn-light-0.3.0-d6204d26f6-Linux.tar.gz
+
Windows
+https://spawn.s3.amazonaws.com/builds/Spawn-light-0.3.0-d6204d26f6-win64.zip
+

+

+To install, proceed as follows:
+

+
+
+
+
+
+
+
+
+
+
+
+
Operating systemLink
Linux
+

+Run from a terminal
+

+
+wget https://spawn.s3.amazonaws.com/builds/Spawn-light-0.3.0-d6204d26f6-Linux.tar.gz;
+tar xzf Spawn-light-0.3.0-d6204d26f6-Linux.tar.gz;
+export PATH=${PATH}:`pwd`/Spawn-light-0.3.0-d6204d26f6-Linux/bin
+

+

+and restart your Modelica environment. You may put the last line in your ${HOME}/.bashrc file
+to make the setting persistent when you log in the next time.
+

+
Windows
+
    
+
  1. 
+Download the binary from the link above.
+
    2. 
+
  2. 
+Unzip Spawn-light-0.3.0-d6204d26f6-win64.zip at your desired location.
+
    3. 
+
  3. 
+Add the directory xyz/Spawn-light-0.3.0-d6204d26f6-win64/bin
+to your PATH environment variable.
+
    4. 
+
  4. 
+Restart your Modelica environment.
+
    5. 
+

+

+
+
How is spawn invoked?

+

+Modelica tries to invoke spawn-0.3.0-d6204d26f6[.exe] in this order:
+

+
    
+
  1. 
+On Linux, it searches for
+
    +Buildings[ x.y.z]/Resources/bin/spawn-0.3.0-d6204d26f6/linux64/bin/spawn-0.3.0-d6204d26f6
+
    
+and on Windows, it searches for
+
    +Buildings[ x.y.z]/Resources/bin/spawn-0.3.0-d6204d26f6/win64/bin/spawn-0.3.0-d6204d26f6.exe
+
    
+where Buildings[ x.y.z] is the installation folder of the Modelica Buildings Library.
+This file is distributed with the Modelica Buildings Library installation,
+together with all files needed to translate and simulate a model in a Modelica environment.
+
    2. 
+
  2. 
+If not found, it searches on the environment variable SPAWNPATH for
+spawn-0.3.0-d6204d26f6[.exe].
+
    3. 
+
  3. 
+If not found, it searches on the environment variable PATH for
+spawn-0.3.0-d6204d26f6[.exe].
+
    4. 
+

+

+If none of this succeeds, it will stop with an error.
+

+"));
+  end Installation;
+
   class GettingStarted
     "Getting started"
     extends Modelica.Icons.Information;
@@ -16,8 +130,8 @@ To instantiate one or several building models, proceed as follows:
 
    
 
  1. 
 Create an instance of
-
-Buildings.ThermalZones.EnergyPlus.Building to specify the building model.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Building to specify the building model.
 This instance is automatically named building and this
 name must not be changed.
 
    2. 
@@ -41,8 +155,8 @@ The following coupling objects can then be integrated in the model that contains
 
 
    
 If you have more than one building, you can repeat the above steps for each building and combine
 these building models in a top-level model.
 See for example
-
-Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.ThreeZonesTwoBuildings
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.ThreeZonesTwoBuildings
 for how to combine two buildings in one Modelica model.
 
    
 
    
@@ -91,12 +205,12 @@ and look at the example models below.
 
    Example models
    
 
    
 To get started, we recommend to look at the simple examples in
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse
 which illustrate the use of all these objects based on a single family house.
 Also, read the information section of the models you plan to use in
-
-Buildings.ThermalZones.EnergyPlus.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.
 
    
 
    
 We suggest looking at the examples in the following order which
@@ -104,48 +218,48 @@ starts with the simplest example and moves to more comprehensive ones.
 
    
 
      
 
    1. 
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned is modeling one
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned is modeling one
 zone, the living room, in Modelica as an unconditioned zone with a fixed amount of outside air infiltration.
 
      2. 
 
    2. 
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.AirHeating
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.AirHeating
 adds an air-based heating system that recirculates air to track a heating setpoint temperature.
 
      3. 
 
    3. 
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.EquipmentSchedule
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.EquipmentSchedule
 shows how to set the equipment schedule in Modelica and override the schedule in EnergyPlus.
 It also uses the unconditioned thermal zone to keep it simple.
 
      4. 
 
    4. 
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.LightsControl
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.LightsControl
 is showing how to set the value of an EMS Actuator, here the one that sets internal gains
 caused by the lights which are controlled by Modelica based on time of day and sun position.
 The model also shows how to read an EnergyPlus output variable, here
 for the lighting electricity consumption.
 
      5. 
 
    5. 
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.ShadeControl
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.ShadeControl
 reads from EnergyPlus the incident solar radiation, retrieves from the thermal zone its
 temperature, and based on these values, actuates the window shading control
 using an EMS actuator.
 
      6. 
 
    6. 
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer
 illustrates how to couple a radiant slab for heating in a configuration in which the
 bottom of the slab is connected to a ground heat transfer model in Modelica.
 
      7. 
 
    7. 
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface
 and
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom
 are similar to the previous model, but they add a radiant slab for cooling which interfaces
 two surfaces in EnergyPlus: The floor that connects the slab to the zone above, and the ceiling
 that connects the slab to the zone below.
@@ -156,39 +270,6 @@ based on the room temperature.
 "));
   end GettingStarted;
 
-  class InvokingEnergyPlus
-    "Getting started"
-    extends Modelica.Icons.Information;
-    annotation (
-      preferredView="info",
-      Documentation(
-        info="
-
      Invoking EnergyPlus
      
-
      
-The Modelica code tries to invoke EnergyPlus in this order:
-
      
-
        
-
      1. 
-It searches for Buildings[ x.y.z]/Resources/bin/spawn-[linux64,win64]/bin/spawn-0.3.0-d6204d26f6[.exe]
-where Buildings[ x.y.z] is the installation folder of the Modelica Buildings Library.
-This file is distributed with the Modelica Buildings Library installation,
-together with all files needed to translate and simulate a model in a Modelica environment.
-
        2. 
-
      2. 
-If not found, it searches on the environment variable SPAWNPATH for
-spawn-0.3.0-d6204d26f6[.exe].
-
        3. 
-
      3. 
-If not found, it searches on the environment variable PATH for
-spawn-0.3.0-d6204d26f6[.exe].
-
        4. 
-
      
-
      
-If none of this succeeds, it will stop with an error.
-
      
-"));
-  end InvokingEnergyPlus;
-
   class Conventions
     "Conventions"
     extends Modelica.Icons.Information;
@@ -213,21 +294,21 @@ EnergyPlus will simulate the outside air infiltration if specified in the idf fi
 
 This allows unconditioned zones such as a basement or an attic to simulate in EnergyPlus
 without having to use an instance of
-
-Buildings.ThermalZones.EnergyPlus.ThermalZone.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone.
 
      8. 
 
    8. 
 If a zone is in the idf file and modeled in Modelica using
-
-Buildings.ThermalZones.EnergyPlus.ThermalZone,
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone,
 then EnergyPlus will remove all infiltration objects for this zone.
 This is done because Modelica computes the mass balance of the zone air, and infiltration
 depends on the static pressure of the HVAC system.
 Pressure-driven infiltration can be modeled using
 
 Buildings.Airflow.Multizone, or a fixed infiltration rate can be imposed as is shown in
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.AirHeating.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.AirHeating.
 
      9. 
 
    9. 
 All EnergyPlus HVAC objects that are present in the idf file are removed when coupled to Spawn.
@@ -258,14 +339,14 @@ as declared in the idf file.
 
      
 Units between Modelica and EnergyPlus are automatically converted, if they are specified.
 The conversion is according to the table at
-
-Buildings.ThermalZones.EnergyPlus.Types.Units.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Types.Units.
 
      
 
      
 To see what units are used, set printUnits=true (the default) in the
 instance
-
-Buildings.ThermalZones.EnergyPlus.Building.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Building.
 This will cause the used units to be reported in the Modelica log file.
 
      
 
      
@@ -273,11 +354,11 @@ The thermal zone model automatically converts the units.
 
      
 
      
 To do unit conversion for values sent by
-
-Buildings.ThermalZones.EnergyPlus.Actuator
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Actuator
 and by
-
-Buildings.ThermalZones.EnergyPlus.Schedule,
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Schedule,
 set the parameter unit to the unit of the variable obtained at
 the input connector u. The value will then be converted
 before it is sent to EnergyPlus.
@@ -286,8 +367,8 @@ are reported to the Modelica log file.
 
      
 
      
 To do unit conversion for values read by
-
-Buildings.ThermalZones.EnergyPlus.OutputVariable,
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable,
 Modelica will use the units reported by EnergyPlus.
 The units that are used in the output y of this block
 are reported to the Modelica log file.
@@ -306,8 +387,8 @@ are reported to the Modelica log file.
 
      
 In Spawn there can be both connected and unconnected zones defined in the EnergyPlus input file.
 Connected zones have a corresponding zone model
-
-Buildings.ThermalZones.EnergyPlus.ThermalZone
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone
 in Modelica that communicates with the EnergyPlus zone heat balance model.
 Unconnected zones are thermal zones which are defined entirely within the EnergyPlus input file,
 and for these zones the conventional EnergyPlus algorithms are used to simulate the zone conditions,
@@ -442,13 +523,6 @@ If a simulation starts at a time smaller than 0, then an error will be is
 the simulation won't start.
      
 This will be addressed through
 issue 1938.
-
      FMUs generated with a Spawn model may still require a Buildings library installation
      
-
      
-If an FMU is generated that contains a Spawn model and then simulated on another computer,
-the simulation may fail to start because of depedencies to the Buildings library and the Spawn binaries.
-.
      
-This will be addressed through
-issue 2054.
 
      
 "));
   end KnownIssues;
@@ -475,23 +549,6 @@ Otherwise, you may get an error such as
 /usr/bin/ld: cannot find -lfmilib_shared
 collect2: error: ld returned 1 exit status
 

-
Models with multiple thermal zones

-

-For Dymola 2019FD01 and Dymola 2020, only one thermal zone can be in EnergyPlus.
-For Dymola 2020x, this limitation is removed if the flag
-

-
-Hidden.AvoidDoubleComputation=true
-

-

-is set in the Dymola command line window.
-For Dymola 2021, this flag will be set to true by default.
-

-

-This limitation only affects Dymola. OPTIMICA and JModelica can simulate Modelica models
-for which the EnergyPlus model has multiple thermal zones, or for which
-multiple buildings are simulated in EnergyPlus.
-

 "));
   end NotesForDymola;
   annotation (
@@ -514,7 +571,7 @@ EnergyPlus.
 

 

 \"Spawn
+src=\"modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/envelope-room-hvac-1600.png\"/>
 

 

 The figure above shows an overview of the exchanged coupling variables.
@@ -527,12 +584,10 @@ active facade control, or to control lights and equipment schedules that contrib
 to heat gains in the room and its surfaces.
 

 

-This implmentation uses EnergyPlus 9.6.0.
-Windows 64 bit and Linux 64 bit are supported.
 See
-
-Buildings.ThermalZones.EnergyPlus.UsersGuide.InvokingEnergyPlus
-how to install EnergyPlus and how EnergyPlus is invoked.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide.Installation
+for how to install EnergyPlus and how EnergyPlus is invoked.
 

 
References

 
    
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mo
similarity index 80%
rename from Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mo
index 354a0c503b7..11cc5c3887b 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings;
 model ThreeZonesTwoBuildings
   "Validation model for three zones that are in two buildings"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model ThreeZonesTwoBuildings
     "Medium model";
   model OneZoneBuilding
     "Model with a building with one zone"
-    extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned;
+    extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned;
     extends Modelica.Blocks.Icons.Block;
     annotation (
       Icon(
@@ -19,7 +19,7 @@ model ThreeZonesTwoBuildings
 
   model TwoZoneBuilding
     "Model with a building with two zones"
-    extends Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.TwoIdenticalZones;
+    extends Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.TwoIdenticalZones;
     extends Modelica.Blocks.Icons.Block;
     annotation (
       Icon(
@@ -51,7 +51,7 @@ First implementation.
 

 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/ThreeZonesTwoBuildings.mos" "Simulate and plot"),
     experiment(
       StopTime=86400,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mo
similarity index 77%
rename from Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mo
index 382767c6c6d..e232b8c3ed1 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings;
 model TwoIdenticalOneZoneBuildings
   "Validation model with two identical buildings, each having one thermal zone"
   extends Modelica.Icons.Example;
@@ -9,7 +9,7 @@ model TwoIdenticalOneZoneBuildings
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   model Zone
     "Model of a thermal zone"
-    extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned;
+    extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned;
     extends Modelica.Blocks.Icons.Block;
   end Zone;
   annotation (
@@ -29,7 +29,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalOneZoneBuildings.mos" "Simulate and plot"),
     experiment(
       StopTime=172800,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mo
similarity index 68%
rename from Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mo
index a6c11a2cf60..7d5e5eec84a 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings;
 model TwoIdenticalTwoZoneBuildings
   "Validation model with two identical buildings, each having two thermal zones"
   extends Modelica.Icons.Example;
@@ -9,7 +9,7 @@ model TwoIdenticalTwoZoneBuildings
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   model Zone
     "Model of a thermal zone"
-    extends Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone.TwoIdenticalZones;
+    extends Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone.TwoIdenticalZones;
     extends Modelica.Blocks.Icons.Block;
   end Zone;
   annotation (
@@ -22,8 +22,8 @@ The model has two identical buildings, each having two thermal zones.
 

 This model has been added because a building with multiple thermal zones executes
 C code that is not executed if there is only one thermal zone, as is the case in
-
-Buildings.ThermalZones.EnergyPlus.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.TwoIdenticalOneZoneBuildings.
 

 ",
       revisions="
@@ -35,7 +35,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/TwoIdenticalTwoZoneBuildings.mos" "Simulate and plot"),
     experiment(
       StopTime=172800,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/package.mo
similarity index 85%
rename from Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/package.mo
index 855c035d958..5a6a9facf96 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/package.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation;
 package MultipleBuildings "Collection of validation models for multiple EnergyPlus buildings"
   extends Modelica.Icons.Package;
 
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/package.order
similarity index 100%
rename from Buildings/ThermalZones/EnergyPlus/Validation/MultipleBuildings/package.order
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/MultipleBuildings/package.order
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/NoOutputVariable.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/NoOutputVariable.mo
similarity index 63%
rename from Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/NoOutputVariable.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/NoOutputVariable.mo
index ed67c3a4a0f..f509cef5620 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/NoOutputVariable.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/NoOutputVariable.mo
@@ -1,14 +1,14 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable;
 model NoOutputVariable
   "Failing example caused by missing Output:Variable in the idf"
-  extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned(
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned(
    building(idfName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_NoOutput.idf")));
+      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_NoOutput.idf")));
 
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/NoOutputVariable.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/NoOutputVariable.mos" "Simulate and plot"),
     experiment(
       StopTime=86400,
       Tolerance=1e-06),
@@ -18,8 +18,8 @@ This validation case tests whether Spawn works for an idf file that has no outpu
 

 

 The model is identical to
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned
 except that it uses an idf file that has no output variables.
 

 ", revisions="
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneEnvironmentOutputVariable.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneEnvironmentOutputVariable.mo
similarity index 76%
rename from Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneEnvironmentOutputVariable.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneEnvironmentOutputVariable.mo
index b4a2fea2043..e50a3663367 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneEnvironmentOutputVariable.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneEnvironmentOutputVariable.mo
@@ -1,16 +1,16 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable;
 model OneEnvironmentOutputVariable
   "Validation model that has only one output variable from the environment conditions reported to Modelica"
   extends Modelica.Icons.Example;
   inner Building building(
-    idfName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf"),
+    idfName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf"),
     epwName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw"),
     weaName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"),
     computeWetBulbTemperature=false)
     "Building model"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
 
-  Buildings.ThermalZones.EnergyPlus.OutputVariable TEnePlu(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable TEnePlu(
     name="Site Outdoor Air Drybulb Temperature",
     key="Environment",
     y(final unit="K", displayUnit="degC"))
@@ -19,7 +19,7 @@ model OneEnvironmentOutputVariable
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneEnvironmentOutputVariable.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneEnvironmentOutputVariable.mos" "Simulate and plot"),
     experiment(
       StartTime=864000,
       StopTime=950400,
@@ -32,8 +32,8 @@ Simple test case for one building in which only an EnergyPlus output variable is
 In this model, the site drybulb temperature is obtained from EnergyPlus.
 Note that this variable could be read directly from the Modelica weather data bus,
 which can be accessed from
-
-Buildings.ThermalZones.EnergyPlus.Building.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Building.
 

 ", revisions="
 
    
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariable.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariable.mo
similarity index 70%
rename from Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariable.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariable.mo
index 239c2a8ed96..9ca68cbb46b 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariable.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariable.mo
@@ -1,8 +1,8 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable;
 model OneZoneOneOutputVariable
   "Validation model for one zone with one output variable"
-  extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned;
-  Buildings.ThermalZones.EnergyPlus.OutputVariable equEle(
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned;
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable equEle(
     name="Zone Electric Equipment Electricity Rate",
     key="LIVING ZONE",
     y(final unit="W"))
@@ -26,7 +26,7 @@ First implementation.
 

 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariable.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariable.mos" "Simulate and plot"),
     experiment(
       StopTime=432000,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mo
similarity index 58%
rename from Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mo
index 6b60ef916ff..9ea70cebe58 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mo
@@ -1,14 +1,14 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable;
 model OneZoneOneOutputVariableSummer
   "Validation model for one zone with one output variable for a summer period"
-  extends Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariable;
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOneOutputVariable;
   annotation (
     Documentation(
       info="
 

 Test case identical to
-
-Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneZoneOneOutputVariable
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneZoneOneOutputVariable
 but simulating only a period in summer.
 

 

@@ -24,7 +24,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOneOutputVariableSummer.mos" "Simulate and plot"),
     experiment(
       StartTime=18748800,
       StopTime=19353600,
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOutputVariable.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOutputVariable.mo
similarity index 74%
rename from Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOutputVariable.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOutputVariable.mo
index 395f96c5771..5300692f901 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOutputVariable.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOutputVariable.mo
@@ -1,14 +1,14 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable;
 model OneZoneOutputVariable
   "Validation model that has only one output variable from a zone reported to Modelica"
-  extends Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable.OneEnvironmentOutputVariable(TEnePlu(
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable.OneEnvironmentOutputVariable(TEnePlu(
         name="Zone Mean Air Temperature",
         key="LIVING ZONE"));
 
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneOutputVariable.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneOutputVariable.mos" "Simulate and plot"),
     experiment(
       StartTime=864000,
       StopTime=950400,
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mo
similarity index 79%
rename from Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mo
index 97725d6dd00..aaee718f585 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mo
@@ -1,8 +1,8 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable;
 model OneZoneTwoDifferentOutputVariables
   "Validation model for one zone with two different output variables"
   extends OneZoneOneOutputVariable;
-  Buildings.ThermalZones.EnergyPlus.OutputVariable incBeaSou(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable incBeaSou(
     name="Surface Outside Face Incident Beam Solar Radiation Rate per Area",
     key="Living:South",
     y(final unit="W/m2"))
@@ -25,7 +25,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoDifferentOutputVariables.mos" "Simulate and plot"),
     experiment(
       StopTime=432000,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mo
similarity index 79%
rename from Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mo
index f0f39560d2d..79989260de3 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mo
@@ -1,8 +1,8 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.OutputVariable;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.OutputVariable;
 model OneZoneTwoIdenticalOutputVariables
   "Validation model for one zone with two identical output variables"
   extends OneZoneOneOutputVariable;
-  Buildings.ThermalZones.EnergyPlus.OutputVariable equEle2(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable equEle2(
     name="Zone Electric Equipment Electricity Rate",
     key="LIVING ZONE",
     y(final unit="W"))
@@ -25,7 +25,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/OneZoneTwoIdenticalOutputVariables.mos" "Simulate and plot"),
     experiment(
       StopTime=432000,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/package.mo
similarity index 84%
rename from Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/package.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/package.mo
index 8cd76e0f53f..8c505423583 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/package.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/package.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation;
 package OutputVariable "Collection of validation models for EnergyPlus output variables"
   extends Modelica.Icons.Package;
 
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/package.order
similarity index 100%
rename from Buildings/ThermalZones/EnergyPlus/Validation/OutputVariable/package.order
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/OutputVariable/package.order
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/Schedule/EquipmentScheduleOutputVariable.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/EquipmentScheduleOutputVariable.mo
similarity index 86%
rename from Buildings/ThermalZones/EnergyPlus/Validation/Schedule/EquipmentScheduleOutputVariable.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/EquipmentScheduleOutputVariable.mo
index ef63d9ef6b8..e66c0893917 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/Schedule/EquipmentScheduleOutputVariable.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/EquipmentScheduleOutputVariable.mo
@@ -1,8 +1,8 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.Schedule;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.Schedule;
 model EquipmentScheduleOutputVariable
   "Validation case with a schedule that is not sampled, and output reader of the energy affected by the scheduled value"
-  extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.EquipmentSchedule;
-  Buildings.ThermalZones.EnergyPlus.OutputVariable equEle(
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.EquipmentSchedule;
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable equEle(
     name="Zone Electric Equipment Electricity Rate",
     key="LIVING ZONE",
     isDirectDependent=true,
@@ -49,7 +49,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/Schedule/EquipmentScheduleOutputVariable.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/EquipmentScheduleOutputVariable.mos" "Simulate and plot"),
     experiment(
       StopTime=172800,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/Schedule/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/package.mo
similarity index 83%
rename from Buildings/ThermalZones/EnergyPlus/Validation/Schedule/package.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/package.mo
index d19426ea5b7..ad1e4f7ed8f 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/Schedule/package.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/package.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation;
 package Schedule "Collection of validation models for EnergyPlus schedules"
   extends Modelica.Icons.Package;
 
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/Schedule/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/package.order
similarity index 100%
rename from Buildings/ThermalZones/EnergyPlus/Validation/Schedule/package.order
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/Schedule/package.order
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/ExteriorWall.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ExteriorWall.mo
similarity index 86%
rename from Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/ExteriorWall.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ExteriorWall.mo
index eb6ce5c6185..f9c7f7428bf 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/ExteriorWall.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ExteriorWall.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.BaseClasses;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.BaseClasses;
 model ExteriorWall "Model of an exterior wall with Spawn-controlled surface conditions"
   extends Buildings.HeatTransfer.Conduction.BaseClasses.PartialConstruction;
 
@@ -11,7 +11,7 @@ model ExteriorWall "Model of an exterior wall with Spawn-controlled surface cond
   annotation (choicesAllMatching=true, Placement(transformation(extent={{60,60},
           {80,80}})));
 
-  Buildings.ThermalZones.EnergyPlus.ZoneSurface sur(surfaceName=surNam)
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface sur(surfaceName=surNam)
     "Wall interior surface"
     annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
   HeatTransfer.Conduction.MultiLayer walCon(
@@ -43,7 +43,7 @@ model ExteriorWall "Model of an exterior wall with Spawn-controlled surface cond
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={40,-30})));
-  Buildings.ThermalZones.EnergyPlus.OutputVariable extSurHea(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable extSurHea(
     name="Surface Outside Face Conduction Heat Transfer Rate",
     key=surNam)
     annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
@@ -72,7 +72,7 @@ equation
         fillPattern=FillPattern.Solid),
         Bitmap(
           extent={{58,-98},{98,-68}},
-          fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png"),
+          fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/EnergyPlusLogo.png"),
         Rectangle(
           lineColor={95,95,95},
           fillColor={95,95,95},
@@ -101,10 +101,10 @@ First implementation.
 

 This is a model of the heat transfer through an exterior wall, which is connected
 to an EnergyPlus Zone Heat Balance through 
-
-Buildings.ThermalZones.EnergyPlus.ZoneSurface object on the interior surface and a 
-
-Buildings.ThermalZones.EnergyPlus.OutputVariable to read the exterior surface temperature.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface object on the interior surface and a 
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable to read the exterior surface temperature.
 

 

 This model can be used in a Spawn simulation to substitute the heat conduction 
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/InteriorWall.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/InteriorWall.mo
similarity index 90%
rename from Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/InteriorWall.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/InteriorWall.mo
index a37c7506f6d..84d2d39a449 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/InteriorWall.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/InteriorWall.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.BaseClasses;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.BaseClasses;
 model InteriorWall "Model of an interior wall with Spawn-controlled surface conditions"
   extends Buildings.HeatTransfer.Conduction.BaseClasses.PartialConstruction;
 
@@ -12,10 +12,10 @@ model InteriorWall "Model of an interior wall with Spawn-controlled surface cond
   annotation (choicesAllMatching=true, Placement(transformation(extent={{60,60},
           {80,80}})));
 
-  Buildings.ThermalZones.EnergyPlus.ZoneSurface sur_a(surfaceName=surNam_a)
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface sur_a(surfaceName=surNam_a)
     "Wall surface (port a)"
     annotation (Placement(transformation(extent={{-10,40},{10,60}})));
-  Buildings.ThermalZones.EnergyPlus.ZoneSurface sur_b(surfaceName=surNam_b)
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface sur_b(surfaceName=surNam_b)
     "Wall surface (port b)"
     annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
   Buildings.HeatTransfer.Conduction.MultiLayer walCon(
@@ -78,7 +78,7 @@ equation
         fillPattern=FillPattern.Solid),
         Bitmap(
           extent={{58,-98},{98,-68}},
-          fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus/EnergyPlusLogo.png"),
+          fileName="modelica://Buildings/Resources/Images/ThermalZones/EnergyPlus_9_6_0/EnergyPlusLogo.png"),
         Rectangle(
           lineColor={95,95,95},
           fillColor={95,95,95},
@@ -106,8 +106,8 @@ First implementation.
 

 This is a model of the heat transfer through an interior wall, which is connected
 to an EnergyPlus Zone Heat Balance through 
-
-Buildings.ThermalZones.EnergyPlus.ZoneSurface objects on both side of
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface objects on both side of
 the wall.  
 

 

diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/ReferenceSurfaces.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ReferenceSurfaces.mo
similarity index 73%
rename from Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/ReferenceSurfaces.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ReferenceSurfaces.mo
index 6e0c4198091..714485b552f 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/ReferenceSurfaces.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ReferenceSurfaces.mo
@@ -1,11 +1,11 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.BaseClasses;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.BaseClasses;
 model ReferenceSurfaces
   "Model that contains Eplus OutputVariable used to validate ZoneSurface"
   extends Modelica.Blocks.Icons.Block;
 
-  inner Buildings.ThermalZones.EnergyPlus.Building building(
+  inner Buildings.ThermalZones.EnergyPlus_9_6_0.Building building(
     idfName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf"),
+      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf"),
     epwName=Modelica.Utilities.Files.loadResource(
       "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw"),
     weaName=Modelica.Utilities.Files.loadResource(
@@ -15,27 +15,27 @@ model ReferenceSurfaces
     "Building model"
     annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
 
-  Buildings.ThermalZones.EnergyPlus.OutputVariable TGarAir(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable TGarAir(
     name="Zone Mean Air Temperature",
     key="LIVING ZONE",
     y(unit="K")) "Garage air temperature"
     annotation (Placement(transformation(extent={{-80,-20},{-60,0}})));
-  Buildings.ThermalZones.EnergyPlus.OutputVariable TIntWalLivSur(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable TIntWalLivSur(
     name="Surface Inside Face Temperature",
     key="Living:Interior",
     y(unit="K")) "Interior wall living room surface temperature"
     annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
-  Buildings.ThermalZones.EnergyPlus.OutputVariable TIntWalGarSur(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable TIntWalGarSur(
     name="Surface Inside Face Temperature",
     key="Garage:Interior",
     y(unit="K")) "Interior wall garage surface temperature"
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
-  Buildings.ThermalZones.EnergyPlus.OutputVariable TWesWalGarSur(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable TWesWalGarSur(
     name="Surface Inside Face Temperature",
     key="Garage:WestWall",
     y(unit="K")) "West wall garage surface temperature"
     annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
-  Buildings.ThermalZones.EnergyPlus.OutputVariable TEasWalGarSur(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable TEasWalGarSur(
     name="Surface Inside Face Temperature",
     key="Garage:EastWall",
     y(unit="K")) "East wall garage surface temperature"
@@ -46,9 +46,9 @@ model ReferenceSurfaces
       info="
 

 This model simulates the envelope of a single family house with EnergyPlus and is used
-as a baseline to the 
-
-Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.SurfaceComparison
+as a baseline to the
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.SurfaceComparison
 validation model which compare that baseline to the same building, but using Spawn connectors
 for some interior and exterior walls.
 

diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/ZoneSurfaces.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ZoneSurfaces.mo
similarity index 93%
rename from Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/ZoneSurfaces.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ZoneSurfaces.mo
index 3bc88c450dc..b4de3718e0f 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/ZoneSurfaces.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ZoneSurfaces.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.BaseClasses;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.BaseClasses;
 model ZoneSurfaces
   "Example model with two EnergyPlus unconditioned zones with their separating surfaces modeled in Modelica"
   extends BaseClasses.ReferenceSurfaces;
@@ -78,8 +78,8 @@ protected
       info="
 

 This model simulates the envelope of a single family house with EnergyPlus but uses 
-
-Buildings.ThermalZones.EnergyPlus.ZoneSurface to model the heat 
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface to model the heat 
 transfer through the garage exterior (east and west facing) and interior walls.
 

 ",
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/package.mo
similarity index 55%
rename from Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/package.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/package.mo
index 43cb3403971..ce2feeaafa6 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/package.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/package.mo
@@ -1,12 +1,12 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison;
-package BaseClasses "Package with base classes for Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison"
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison;
+package BaseClasses "Package with base classes for Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison"
 extends Modelica.Icons.BasesPackage;
 
   annotation (Documentation(info="
 

 This package contains base classes that are used to construct the models in 
-
-Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison. 
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison. 
 

 ", revisions="
 
    
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/package.order
similarity index 100%
rename from Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/BaseClasses/package.order
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/package.order
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/SurfaceComparison.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/SurfaceComparison.mo
similarity index 50%
rename from Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/SurfaceComparison.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/SurfaceComparison.mo
index c24a5f5df12..eda56bd6c9f 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/SurfaceComparison.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/SurfaceComparison.mo
@@ -1,32 +1,32 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison;
 model SurfaceComparison
   "Validation model for reference surfaces and zone surfaces"
   extends Modelica.Icons.Example;
 
-  Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.BaseClasses.ReferenceSurfaces refSur
+  Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.BaseClasses.ReferenceSurfaces refSur
     "Building that models the envelope with EnergyPlus surfaces"
     annotation (Placement(transformation(extent={{-10,20},{10,40}})));
-  Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.BaseClasses.ZoneSurfaces zonSur
+  Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.BaseClasses.ZoneSurfaces zonSur
     "Building that models the envelope with Spawn surfaces"
     annotation (Placement(transformation(extent={{-12,-40},{8,-20}})));
   annotation (
     Documentation(
       info="
 
    
-This model validates that the 
-Buildings.ThermalZones.EnergyPlus.ZoneSurface objects results in similar surface heat
+This model validates that the 
+Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface objects results in similar surface heat
 transfer to the equivalent EnergyPlus surface object.
 
    
 
    
 It does so by comparing the temperature of the building in
-
-Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.BaseClasses.ReferenceSurfaces
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.BaseClasses.ReferenceSurfaces
 that only uses EnergyPlus surfaces, and the building in
-
-Buildings.ThermalZones.EnergyPlus.Validation.SurfaceComparison.BaseClasses.ZoneSurfaces
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.SurfaceComparison.BaseClasses.ZoneSurfaces
 that uses the same envelope but replaces select surfaces with 
-
-Buildings.ThermalZones.EnergyPlus.ZoneSurface objects.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface objects.
 
    
 ",
       revisions="
@@ -37,7 +37,7 @@ First implementation.
 

 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/SurfaceComparison/SurfaceComparison.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/SurfaceComparison.mos"
         "Simulate and Plot"),
     experiment(
       StopTime=2592000,
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/package.mo
similarity index 61%
rename from Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/package.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/package.mo
index c7d1a148d41..e622cdd764b 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/package.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/package.mo
@@ -1,12 +1,12 @@
-within Buildings.ThermalZones.EnergyPlus.Validation;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation;
 package SurfaceComparison "Collection of models used to validate zone surface coupling against EnergyPlus"
   extends Modelica.Icons.Package;
 
   annotation (Documentation(info="
 

 Package containing models used to compare 
-
-Buildings.ThermalZones.EnergyPlus.ZoneSurface results against equivalent EnergyPlus surfaces
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface results against equivalent EnergyPlus surfaces
 

 ", revisions="
 
    
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/package.order
similarity index 100%
rename from Buildings/ThermalZones/EnergyPlus/Validation/SurfaceComparison/package.order
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/package.order
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/Infiltration.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/Infiltration.mo
similarity index 65%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/Infiltration.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/Infiltration.mo
index b2eb616d210..4436e90500a 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/Infiltration.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/Infiltration.mo
@@ -1,20 +1,20 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone;
 model Infiltration
   "Validation model for outside air infiltration in zones not modeled in Modelica"
   extends Modelica.Icons.Example;
   package Medium=Buildings.Media.Air
     "Medium model";
 
-  Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom defInf(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom defInf(
     building(
       idfName = Modelica.Utilities.Files.loadResource(
-        "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf")))
+        "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoil.idf")))
     "Model with default infiltration in attic"
     annotation (Placement(transformation(extent={{-10,20},{10,40}})));
-  Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom higInf(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom higInf(
     building(
       idfName = Modelica.Utilities.Files.loadResource(
-        "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoilHighInfiltration.idf")))
+        "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse_TwoSpeed_ZoneAirBalance/SingleFamilyHouse_TwoSpeed_ZoneAirBalance_aboveSoilHighInfiltration.idf")))
     "Model with high infiltration in attic"
     annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
 
@@ -23,8 +23,8 @@ model Infiltration
     Documentation(info="
 
    
 This validation case simulates two instances of
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom.
 In the instance higInf, the infiltration rate of the unconditioned attic has been
 significantly increased. This leads to a different surface temperature of the attic floor,
 which can be shown by comparing the variables
@@ -41,7 +41,7 @@ First implementation for
 

 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/Infiltration.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/Infiltration.mos" "Simulate and plot"),
     experiment(
       StopTime=86400,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/InternalGain.mo
similarity index 92%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/InternalGain.mo
index 223a2d6832d..7018568862a 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/InternalGain.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone;
 model InternalGain
   "Validation model for one zone with and without internal heat gain"
   extends Modelica.Icons.Example;
@@ -38,7 +38,7 @@ protected
     parameter Modelica.Units.SI.HeatFlux qSen_flow
       "Convective sensible internal heat gain";
     parameter Modelica.Units.SI.HeatFlux qLat_flow "Latent internal heat gain";
-    Examples.SingleFamilyHouse.Unconditioned bui(
+    Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned bui(
       m_flow_nominal=bui.VRoo*10*0.3/3600,
       qIntGai(
         final k={qRad_flow,qSen_flow,qLat_flow}),
@@ -87,7 +87,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/InternalGain.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/InternalGain.mos" "Simulate and plot"),
     experiment(
       StopTime=172800,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mo
similarity index 74%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mo
index 0fd902fe29e..9bd12a65e09 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mo
@@ -1,8 +1,8 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone;
 model OneZoneCompareZoneTemperatureOutput
   "This example tests whether the zone mean air temperature is reported correctly as an EnergyPlus output"
-  extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned;
-  Buildings.ThermalZones.EnergyPlus.OutputVariable zonMeaAirTem(
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned;
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable zonMeaAirTem(
     name="Zone Mean Air Temperature",
     key="LIVING ZONE",
     y(final unit="K",
@@ -26,7 +26,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneCompareZoneTemperatureOutput.mos" "Simulate and plot"),
     experiment(
       StopTime=172800,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneOneYear.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneOneYear.mo
similarity index 77%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneOneYear.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneOneYear.mo
index 0588878fa4e..a3ad2a919a4 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneOneYear.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneOneYear.mo
@@ -1,7 +1,7 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone;
 model OneZoneOneYear
   "Validation model for one zone"
-  extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned;
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned;
   Controls.OBC.CDL.Continuous.MovingAverage TAirMea(
     delta(displayUnit="d")= 86400,
     y(final unit="K",
@@ -29,7 +29,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/OneZoneOneYear.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/OneZoneOneYear.mos" "Simulate and plot"),
     experiment(
       StopTime=31536000,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/RefBldgSmallOffice.mo
similarity index 89%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/RefBldgSmallOffice.mo
index c3a0cb2d471..0ce04f898d9 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/RefBldgSmallOffice.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone;
 model RefBldgSmallOffice
   "Validation model for six zones small office building"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model RefBldgSmallOffice
     "Medium model";
   inner Building building(
     idfName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf"),
+      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf"),
     epwName=Modelica.Utilities.Files.loadResource(
       "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw"),
     weaName=Modelica.Utilities.Files.loadResource(
@@ -28,32 +28,32 @@ model RefBldgSmallOffice
     k=0)
     "Latent heat gain"
     annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
-  Buildings.ThermalZones.EnergyPlus.ThermalZone att(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone att(
     redeclare package Medium=Medium,
     zoneName="Attic")
     "Thermal zone"
     annotation (Placement(transformation(extent={{40,74},{80,114}})));
-  Buildings.ThermalZones.EnergyPlus.ThermalZone cor(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone cor(
     redeclare package Medium=Medium,
     zoneName="Core_ZN")
     "Thermal zone"
     annotation (Placement(transformation(extent={{40,28},{80,68}})));
-  Buildings.ThermalZones.EnergyPlus.ThermalZone sou(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone sou(
     redeclare package Medium=Medium,
     zoneName="Perimeter_ZN_1")
     "Thermal zone"
     annotation (Placement(transformation(extent={{40,-18},{80,22}})));
-  Buildings.ThermalZones.EnergyPlus.ThermalZone eas(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone eas(
     redeclare package Medium=Medium,
     zoneName="Perimeter_ZN_2")
     "Thermal zone"
     annotation (Placement(transformation(extent={{40,-64},{80,-24}})));
-  Buildings.ThermalZones.EnergyPlus.ThermalZone nor(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone nor(
     redeclare package Medium=Medium,
     zoneName="Perimeter_ZN_3")
     "Thermal zone"
     annotation (Placement(transformation(extent={{40,-112},{80,-72}})));
-  Buildings.ThermalZones.EnergyPlus.ThermalZone wes(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone wes(
     redeclare package Medium=Medium,
     zoneName="Perimeter_ZN_4")
     "Thermal zone"
@@ -61,7 +61,7 @@ model RefBldgSmallOffice
   Modelica.Blocks.Sources.CombiTimeTable datRea(
     tableOnFile=true,
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.dat"),
+      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.dat"),
     smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments,
     tableName="EnergyPlus",
     columns=2:9,
@@ -124,7 +124,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/RefBldgSmallOffice.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/RefBldgSmallOffice.mos" "Simulate and plot"),
     experiment(
       StopTime=604800,
       Tolerance=1e-06),
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/TwoIdenticalZones.mo
similarity index 95%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/TwoIdenticalZones.mo
index 8ac9f886162..54c887e4696 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/TwoIdenticalZones.mo
@@ -1,10 +1,10 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone;
 model TwoIdenticalZones
   "Validation model with two identical zones"
   extends Modelica.Icons.Example;
   inner Building building(
     idfName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Validation/TwoIdenticalZones/TwoIdenticalZones.idf"),
+      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Validation/TwoIdenticalZones/TwoIdenticalZones.idf"),
     epwName=Modelica.Utilities.Files.loadResource(
       "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw"),
     weaName=Modelica.Utilities.Files.loadResource(
@@ -23,7 +23,7 @@ model TwoIdenticalZones
   Modelica.Blocks.Sources.CombiTimeTable datRea(
     tableOnFile=true,
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus/Validation/TwoIdenticalZones/TwoIdenticalZones.dat"),
+      "modelica://Buildings/Resources/Data/ThermalZones/EnergyPlus_9_6_0/Validation/TwoIdenticalZones/TwoIdenticalZones.dat"),
     smoothness=Modelica.Blocks.Types.Smoothness.ConstantSegments,
     tableName="EnergyPlus",
     columns=2:5,
@@ -39,7 +39,7 @@ model TwoIdenticalZones
     "Relative humidity in the room computed by EnergyPlus"
     annotation (Placement(transformation(extent={{0,20},{20,40}})));
 
-  Buildings.ThermalZones.EnergyPlus.OutputVariable inf1(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable inf1(
     name="Zone Infiltration Current Density Volume Flow Rate",
     key="Thermal Zone 1")
     annotation (Placement(transformation(extent={{40,-40},{60,-20}})));
@@ -64,7 +64,7 @@ model TwoIdenticalZones
     Modelica.Blocks.Routing.Multiplex3 multiplex3_1
       "Multiplex to combine signals into a vector"
       annotation (Placement(transformation(extent={{-50,30},{-30,50}})));
-    Buildings.ThermalZones.EnergyPlus.ThermalZone zon(
+    Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone zon(
       redeclare package Medium=Medium,
       zoneName=zoneName,
       nPorts=3)
@@ -176,7 +176,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/TwoIdenticalZones.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/TwoIdenticalZones.mos" "Simulate and plot"),
     experiment(
       StopTime=604800,
       Tolerance=1e-06),
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/ZoneTemperatureInitialization.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/ZoneTemperatureInitialization.mo
similarity index 72%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/ZoneTemperatureInitialization.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/ZoneTemperatureInitialization.mo
index 8b308801082..aa8d45c6c5b 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/ZoneTemperatureInitialization.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/ZoneTemperatureInitialization.mo
@@ -1,10 +1,10 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.ThermalZone;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ThermalZone;
 model ZoneTemperatureInitialization
   "This example tests whether the zone mean air temperature is initialized correctly in EnergyPlus"
-  extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned(
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned(
     zon(
       T_start=303.15));
-  Buildings.ThermalZones.EnergyPlus.OutputVariable TRad(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.OutputVariable TRad(
     key="LIVING ZONE",
     name="Zone Mean Radiant Temperature",
     y(final unit="K"))
@@ -27,7 +27,7 @@ First implementation.
 
 "),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ThermalZone/ZoneTemperatureInitialization.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/ZoneTemperatureInitialization.mos" "Simulate and plot"),
     experiment(
       StopTime=86400,
       Tolerance=1e-06));
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/package.mo
similarity index 83%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/package.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/package.mo
index 3fef92f3671..bf1b1e0fa60 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/package.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/package.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation;
 package ThermalZone "Collection of validation models for EnergyPlus thermal zones"
   extends Modelica.Icons.Package;
 
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/package.order
similarity index 100%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ThermalZone/package.order
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ThermalZone/package.order
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mo
similarity index 80%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mo
index 5b9a362abb8..563fde8f1a1 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mo
@@ -1,8 +1,8 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.ZoneSurface;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ZoneSurface;
 model OneZoneConstantFloorTemperature
   "Validation model with one thermal zone with constant floor temperature"
-  extends Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned;
-  Buildings.ThermalZones.EnergyPlus.ZoneSurface flo(
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned;
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface flo(
     surfaceName="Living:Floor")
     "Floor surface of living room"
     annotation (Placement(transformation(extent={{0,60},{20,80}})));
@@ -17,7 +17,7 @@ equation
     annotation (Line(points={{-18,70},{-2,70}},color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneConstantFloorTemperature.mos" "Simulate and plot"),
     experiment(
       StopTime=432000,
       Tolerance=1e-06),
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mo
similarity index 92%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mo
index 3f096e4cc2b..bca219c54d5 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mo
@@ -1,9 +1,9 @@
-within Buildings.ThermalZones.EnergyPlus.Validation.ZoneSurface;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.ZoneSurface;
 model OneZoneControlledFloorTemperature
   "Validation model with one thermal zone with controlled floor temperature"
   extends
-    Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.Unconditioned;
-  Buildings.ThermalZones.EnergyPlus.ZoneSurface flo(
+    Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Unconditioned;
+  Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface flo(
     surfaceName="Living:Floor")
     "Floor surface of living room"
     annotation (Placement(transformation(extent={{70,40},{90,60}})));
@@ -77,7 +77,7 @@ equation
           {-2,76}},color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/OneZoneControlledFloorTemperature.mos" "Simulate and plot"),
     experiment(
       StartTime=10800000,
       StopTime=11232000,
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/package.mo
similarity index 83%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/package.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/package.mo
index 82cc87f975c..280245e2217 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/package.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/package.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus.Validation;
+within Buildings.ThermalZones.EnergyPlus_9_6_0.Validation;
 package ZoneSurface "Collection of validation models for EnergyPlus schedules"
   extends Modelica.Icons.Package;
 
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/package.order
similarity index 100%
rename from Buildings/ThermalZones/EnergyPlus/Validation/ZoneSurface/package.order
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/ZoneSurface/package.order
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/package.mo
similarity index 80%
rename from Buildings/ThermalZones/EnergyPlus/Validation/package.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/package.mo
index c3d510c0170..f95b4a8f81b 100644
--- a/Buildings/ThermalZones/EnergyPlus/Validation/package.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/package.mo
@@ -1,4 +1,4 @@
-within Buildings.ThermalZones.EnergyPlus;
+within Buildings.ThermalZones.EnergyPlus_9_6_0;
 package Validation "Collection of validation models"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -8,8 +8,8 @@ package Validation "Collection of validation models"
       info="
 

 This package contains validation models for the classes in
-
-Buildings.ThermalZones.EnergyPlus.
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.
 

 

 Note that most validation models contain simple input data
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/package.order
similarity index 100%
rename from Buildings/ThermalZones/EnergyPlus/Validation/package.order
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/Validation/package.order
diff --git a/Buildings/ThermalZones/EnergyPlus/ZoneSurface.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/ZoneSurface.mo
similarity index 85%
rename from Buildings/ThermalZones/EnergyPlus/ZoneSurface.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/ZoneSurface.mo
index 397253cbffa..d6e2d18d042 100644
--- a/Buildings/ThermalZones/EnergyPlus/ZoneSurface.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/ZoneSurface.mo
@@ -1,8 +1,8 @@
-within Buildings.ThermalZones.EnergyPlus;
+within Buildings.ThermalZones.EnergyPlus_9_6_0;
 model ZoneSurface
   "Model to exchange heat with a inside-facing surface of a thermal zone"
-  extends Buildings.ThermalZones.EnergyPlus.BaseClasses.PartialEnergyPlusObject;
-  extends Buildings.ThermalZones.EnergyPlus.BaseClasses.Synchronize.ObjectSynchronizer;
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.PartialEnergyPlusObject;
+  extends Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Synchronize.ObjectSynchronizer;
   parameter String surfaceName
     "Surface unique name in the EnergyPlus idf file";
   final parameter Modelica.Units.SI.Area A(final fixed=false, min=1E-10)
@@ -39,19 +39,20 @@ protected
     fixed=false,
     start=0)
     "Total number of Spawn objects in building";
-  Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus.BaseClasses.SpawnExternalObject(
+  Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject(
     objectType=5,
     startTime=startTime,
     modelicaNameBuilding=modelicaNameBuilding,
     modelicaInstanceName=modelicaInstanceName,
     spawnExe=spawnExe,
+    idfVersion=idfVersion,
     idfName=idfName,
     epwName=epwName,
     relativeSurfaceTolerance=relativeSurfaceTolerance,
     epName=surfaceName,
     usePrecompiledFMU=usePrecompiledFMU,
     fmuName=fmuName,
-    buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus.BaseClasses.buildingsRootFileLocation,
+    buildingsRootFileLocation=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.buildingsRootFileLocation,
     logLevel=logLevel,
     printUnit=false,
     jsonName="zoneSurfaces",
@@ -97,10 +98,10 @@ initial equation
   assert(
     not usePrecompiledFMU,
     "Use of pre-compiled FMU is not supported for ZoneSurface.");
-  nObj=Buildings.ThermalZones.EnergyPlus.BaseClasses.initialize(
+  nObj=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.initialize(
     adapter=adapter,
     isSynchronized=building.isSynchronized);
-  {A}=Buildings.ThermalZones.EnergyPlus.BaseClasses.getParameters(
+  {A}=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.getParameters(
     adapter=adapter,
     nParOut=nParOut,
     isSynchronized=nObj);
@@ -113,7 +114,7 @@ equation
     // Initialization of output variables.
     TLast=T;
     dtLast=time-pre(tLast);
-    yEP=Buildings.ThermalZones.EnergyPlus.BaseClasses.exchange(
+    yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange(
       adapter=adapter,
       initialCall=false,
       nY=nY,
@@ -164,8 +165,8 @@ The output q_flow is equal to q_flow = Q_flow/A, where
 

 Note that for most applications that require interfacing the front-facing and back-side facing surface with the
 building model, the model
-
-Buildings.ThermalZones.EnergyPlus.OpaqueConstruction
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.OpaqueConstruction
 is easier to use.
 

 
Usage

@@ -194,7 +195,7 @@ Consider an EnergyPlus input data file that has the following entry:
 To set the temperature of this surface, this model can be used as
 

 
-Buildings.ThermalZones.EnergyPlus.ZoneSurface flo(surfaceName=\"Living:Floor\");
+Buildings.ThermalZones.EnergyPlus_9_6_0.ZoneSurface flo(surfaceName=\"Living:Floor\");
 

 

 The temperature of this surface will then be set to the value received
@@ -205,11 +206,11 @@ per unit area of the surface.
 

 

 The model
-
-Buildings.ThermalZones.EnergyPlus.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingWithGroundHeatTransfer
 illustrates this use. Note that if the ground heat transfer were modeled in EnergyPlus, then
-
-Buildings.ThermalZones.EnergyPlus.OpaqueConstruction
+
+Buildings.ThermalZones.EnergyPlus_9_6_0.OpaqueConstruction
 should have been used, which is simpler to setup.
 

 ",
diff --git a/Buildings/ThermalZones/EnergyPlus/package.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/package.mo
similarity index 81%
rename from Buildings/ThermalZones/EnergyPlus/package.mo
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/package.mo
index f8eede8f684..b3a592f87d3 100644
--- a/Buildings/ThermalZones/EnergyPlus/package.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/package.mo
@@ -1,5 +1,5 @@
 within Buildings.ThermalZones;
-package EnergyPlus "Package with models to connect to EnergyPlus 9.6.0"
+package EnergyPlus_9_6_0 "Package with models to connect to EnergyPlus"
   extends Modelica.Icons.Package;
 
   annotation (
@@ -14,7 +14,7 @@ package EnergyPlus "Package with models to connect to EnergyPlus 9.6.0"
 \"Spawn
 

 

-Package for Spawn of EnergyPlus that couples Modelica directly to EnergyPlus 9.6.0.
+Package for Spawn of EnergyPlus that couples Modelica directly to EnergyPlus.
 

 

 The models in this package allow simulating the envelope heat transfer
@@ -26,9 +26,9 @@ models, and the coupling and co-simulation is done automatically based on these
 Models are provided to connect to EnergyPlus thermal zones, actuators, output variables and schedules.
 

 

-See 
-Buildings.ThermalZones.EnergyPlus.UsersGuide
+See 
+Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide
 for more information.
 

 "));
-end EnergyPlus;
+end EnergyPlus_9_6_0;
diff --git a/Buildings/ThermalZones/EnergyPlus/package.order b/Buildings/ThermalZones/EnergyPlus_9_6_0/package.order
similarity index 100%
rename from Buildings/ThermalZones/EnergyPlus/package.order
rename to Buildings/ThermalZones/EnergyPlus_9_6_0/package.order
diff --git a/Buildings/ThermalZones/package.order b/Buildings/ThermalZones/package.order
index 2a06b5844e3..f1a8ae59741 100644
--- a/Buildings/ThermalZones/package.order
+++ b/Buildings/ThermalZones/package.order
@@ -1,3 +1,3 @@
 Detailed
-EnergyPlus
+EnergyPlus_9_6_0
 ReducedOrder
diff --git a/Buildings/package.mo b/Buildings/package.mo
index d82cf2753c0..c982de60ccf 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -871,10 +871,17 @@ have been improved in a
                        For Dymola, a conversion script makes this change.
     
 
-Buildings.ThermalZones.EnergyPlus
+Buildings.ThermalZones.EnergyPlus_9_6_0
     
 
-Buildings.ThermalZones.EnergyPlus.Building
+Buildings.ThermalZones.EnergyPlus_9_6_0
+    
+    Renamed package to add the version number for EnergyPlus. This will allow supporting more than
+                       one version of EnergyPlus.

+                       This is for #2851.
+    
+  
+  Buildings.ThermalZones.EnergyPlus_9_6_0.Building
     
     This model, which needs to be part of every model that uses EnergyPlus, now
                        requires the specification of the EnergyPlus weather data file (.epw file)
@@ -889,12 +896,12 @@ have been improved in a
                        This is for #2759.
     
   
-  Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Spring

-                       Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Summer

-                       Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.ASHRAE2006Winter

-                       Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Spring

-                       Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Summer

-                       Buildings.ThermalZones.EnergyPlus.Examples.SmallOffice.Guideline36Winter
+  Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Spring

+                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Summer

+                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter

+                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Spring

+                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Summer

+                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter
     
     Changed models to include the hydraulic configurations of the cooling coil,
                        heating coil and VAV terminal box.

@@ -10671,7 +10678,7 @@ particular package.

                     the computational fluid dynamics.
 
 
-ThermalZones.EnergyPlus.UsersGuide
+ThermalZones.EnergyPlus.UsersGuide
    
    Package for Spawn of EnergyPlus with models that use EnergyPlus to simulate
                     one or several building envelope models.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5982a2594d..19acc5ebc58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,8 @@
 ##################################################################
 cmake_policy(SET CMP0048 NEW)
 
+set(ENERGYPLUS_VERSION "9_6_0")
+
 project( Modelica-Buildings
   DESCRIPTION "Modelica Buildings Library"
   LANGUAGES C
@@ -91,31 +93,31 @@ add_definitions(-D_GNU_SOURCE)
 message("Added GNU_SOURCE")
 endif()
 
-add_library( ModelicaBuildingsEnergyPlus SHARED
-  Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnUtil.c
-  Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectFree.c
-  Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectExchange.c
-  Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectInstantiate.c
-  Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/BuildingInstantiate.c
-  Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnFMU.c
-  Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/cryptographicsHash.c
-  Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources/SpawnObjectAllocate.c
+add_library( ModelicaBuildingsEnergyPlus_${ENERGYPLUS_VERSION} SHARED
+  Buildings/Resources/src/ThermalZones/EnergyPlus_${ENERGYPLUS_VERSION}/C-Sources/SpawnUtil.c
+  Buildings/Resources/src/ThermalZones/EnergyPlus_${ENERGYPLUS_VERSION}/C-Sources/SpawnObjectFree.c
+  Buildings/Resources/src/ThermalZones/EnergyPlus_${ENERGYPLUS_VERSION}/C-Sources/SpawnObjectExchange.c
+  Buildings/Resources/src/ThermalZones/EnergyPlus_${ENERGYPLUS_VERSION}/C-Sources/SpawnObjectInstantiate.c
+  Buildings/Resources/src/ThermalZones/EnergyPlus_${ENERGYPLUS_VERSION}/C-Sources/BuildingInstantiate.c
+  Buildings/Resources/src/ThermalZones/EnergyPlus_${ENERGYPLUS_VERSION}/C-Sources/SpawnFMU.c
+  Buildings/Resources/src/ThermalZones/EnergyPlus_${ENERGYPLUS_VERSION}/C-Sources/cryptographicsHash.c
+  Buildings/Resources/src/ThermalZones/EnergyPlus_${ENERGYPLUS_VERSION}/C-Sources/SpawnObjectAllocate.c
 )
 
-target_include_directories( ModelicaBuildingsEnergyPlus
-  PRIVATE Buildings/Resources/src/ThermalZones/EnergyPlus/C-Sources
+target_include_directories( ModelicaBuildingsEnergyPlus_${ENERGYPLUS_VERSION}
+  PRIVATE Buildings/Resources/src/ThermalZones_${ENERGYPLUS_VERSION}/EnergyPlus/C-Sources
   PRIVATE Buildings/Resources/src/fmi-library/include
 )
 
 #link_directories(${CMAKE_SOURCE_DIR}/Buildings/Resources/Library/darwin64)
 
 if (WIN32)
-target_link_libraries( ModelicaBuildingsEnergyPlus
+target_link_libraries( ModelicaBuildingsEnergyPlus_${ENERGYPLUS_VERSION}
   PRIVATE ${FMILIB_SHARED}
   PRIVATE ${CMAKE_DL_LIBS}
 )
 else()
-target_link_libraries( ModelicaBuildingsEnergyPlus
+target_link_libraries( ModelicaBuildingsEnergyPlus_${ENERGYPLUS_VERSION}
   PRIVATE ${CMAKE_DL_LIBS}
 )
 endif()
@@ -123,56 +125,4 @@ endif()
 set(BUILDINGS_INSTALL_DIR "${BUILDINGS_INSTALL_PREFIX}/Resources/Library/${PLATFORM_INSTALL_PREFIX}/")
 message("Installing to: ${BUILDINGS_INSTALL_DIR}")
 
-install( TARGETS ModelicaBuildingsEnergyPlus DESTINATION ${BUILDINGS_INSTALL_DIR} )
-
-# Other stuff not compiled yet
-
-# add_jar( ConvertEIRData
-#   Buildings/Resources/src/fluid/chillers/convertEIR/src/convertEIR/BiCubicCurve.java
-#   Buildings/Resources/src/fluid/chillers/convertEIR/src/convertEIR/BiQuadraticCurve.java
-#   Buildings/Resources/src/fluid/chillers/convertEIR/src/convertEIR/ElectricEIR.java
-#   Buildings/Resources/src/fluid/chillers/convertEIR/src/convertEIR/ICurve.java
-#   Buildings/Resources/src/fluid/chillers/convertEIR/src/convertEIR/ConvertEIRData.java
-#   Buildings/Resources/src/fluid/chillers/convertEIR/src/convertEIR/Parser.java
-#   Buildings/Resources/src/fluid/chillers/convertEIR/src/convertEIR/ParserResultObject.java
-#   Buildings/Resources/src/fluid/chillers/convertEIR/src/convertEIR/QuadraticCurve.java
-#   Buildings/Resources/src/fluid/chillers/convertEIR/src/convertEIR/ReformElectricEIR.java
-# )
-# get_target_property(ConvertEIRData_JAR ConvertEIRData JAR_FILE)
-# install( PROGRAMS ${ConvertEIRData_JAR} DESTINATION ${BUILDINGS_INSTALL_PREFIX}/Resources/bin )
-#
-# add_jar( ConvertDXData
-#   Buildings/Resources/src/fluid/dxcoils/convertDXSingleDoubleSpeed/src/convertDXSingleDoubleSpeed/BiQuadraticCurve.java
-#   Buildings/Resources/src/fluid/dxcoils/convertDXSingleDoubleSpeed/src/convertDXSingleDoubleSpeed/DXSingleSpeed.java
-#   Buildings/Resources/src/fluid/dxcoils/convertDXSingleDoubleSpeed/src/convertDXSingleDoubleSpeed/ICurve.java
-#   Buildings/Resources/src/fluid/dxcoils/convertDXSingleDoubleSpeed/src/convertDXSingleDoubleSpeed/ConvertDXData.java
-#   Buildings/Resources/src/fluid/dxcoils/convertDXSingleDoubleSpeed/src/convertDXSingleDoubleSpeed/Parser.java
-#   Buildings/Resources/src/fluid/dxcoils/convertDXSingleDoubleSpeed/src/convertDXSingleDoubleSpeed/ParserResultObject.java
-#   Buildings/Resources/src/fluid/dxcoils/convertDXSingleDoubleSpeed/src/convertDXSingleDoubleSpeed/QuadraticCurve.java
-#   Buildings/Resources/src/fluid/dxcoils/convertDXSingleDoubleSpeed/src/convertDXSingleDoubleSpeed/DXCoilPerformance.java
-#   Buildings/Resources/src/fluid/dxcoils/convertDXSingleDoubleSpeed/src/convertDXSingleDoubleSpeed/DXDoubleSpeed.java
-# )
-# get_target_property(ConvertDXData_JAR ConvertDXData JAR_FILE)
-# install( PROGRAMS ${ConvertDXData_JAR} DESTINATION ${BUILDINGS_INSTALL_PREFIX}/Resources/bin )
-#
-# add_jar( ConvertWeatherData
-#   Buildings/Resources/src/convertEPW/src/ConvertWeatherData.java
-# )
-#get_target_property(ConvertWeatherData_JAR ConvertWeatherData JAR_FILE)
-#install( PROGRAMS ${ConvertWeatherData_JAR} DESTINATION ${BUILDINGS_INSTALL_PREFIX}/Resources/bin )
-#
-#
-#
-#./Buildings/Resources/Documentation/userGuide/Makefile
-#./Buildings/Resources/Scripts/travis/Makefile
-#./Buildings/Resources/src/Makefile
-
-# python / documentation related
-#./Buildings/Resources/src/fluid/heatpumps/calibration/doc/Makefile
-#./Buildings/Resources/src/fluid/heatpumps/calibration/Makefile
-#./Buildings/Resources/src/fluid/Makefile
-
-# python interpreter
-#./Buildings/Resources/src/python/Makefile.darwin
-#./Buildings/Resources/src/python/Makefile.linux
-#./Buildings/Resources/src/python/Makefile.windows.bat
+install( TARGETS ModelicaBuildingsEnergyPlus_${ENERGYPLUS_VERSION} DESTINATION ${BUILDINGS_INSTALL_DIR} )