Skip to content

Commit

Permalink
minor bux fixing. Updated versions to Matlab r18b and EnergyPlus 9.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dostaji4 committed Apr 18, 2019
1 parent 3dfa47d commit 7310b83
Show file tree
Hide file tree
Showing 7 changed files with 552 additions and 953 deletions.
11 changes: 8 additions & 3 deletions @mlep/mlep.m
Expand Up @@ -142,8 +142,8 @@
end

properties (Constant, Access = private)
rwTimeout = 0; % Timeout for sending/receiving data (0 = infinite) [ms]
acceptTimeout = 30000; % Timeout for waiting for the client to connect [ms]
rwTimeout = 60000; % Timeout for sending/receiving data (0 = infinite) [ms]
acceptTimeout = 10000; % Timeout for waiting for the client to connect [ms]
port = 0; % Socket port (default 0 = any free port)
host = ''; % Host name (default '' = localhost)
verboseEP = true; % Print standard output of the E+ process into Matlab
Expand Down Expand Up @@ -199,9 +199,14 @@ function initialize(obj)

% Check IDF version
if ~strcmp(obj.versionEnergyPlus,obj.idfData.version{1}{1})
warning('IDF file of version "%s" is being simulated by an EnergyPlus of version "%s".\n This may cause severe errors in the EnergyPlus simulation.\n Use IDFVersionUpdate utility to upgrade the file (<EP_dir>/PreProcess/IDFVersionUpdater/..).',...
error('IDF file of version "%s" is being simulated by an EnergyPlus of version "%s".\n This may cause severe errors in the EnergyPlus simulation.\n Use IDFVersionUpdate utility to upgrade the file (<EP_dir>/PreProcess/IDFVersionUpdater/..).',...
obj.idfData.version{1}{1}, obj.versionEnergyPlus);
end

% Check Timestep (must an integer)
assert( mod(obj.timestep,60)==0 && obj.timestep/60 >= 1 && obj.timestep/60 <= 60,...
'Illegal timestep ''%2.1f min.''found. Please correct the Timestep in the IDF file to result in an integer number of minutes between samples.',...
obj.timestep/60);

% Set working directory
if isempty(obj.workDir)
Expand Down
7 changes: 5 additions & 2 deletions Release notes.md
Expand Up @@ -13,7 +13,10 @@

### Changed
* renamed installMlep to setupMlep. Solved a critical bug therein (v1.2.1.1).
*
* disabled loading of object properties - until needed or better tested.
* updated examples to EnergyPlus version 9.1.0
* disabled IDF simulation with mismatching EnergyPlus version.
* updated simulink models to Matlab r18b. It can still be simulated by older Matlab (enable this in Simulink preferences).

## [v1.2.1]

Expand Down Expand Up @@ -41,7 +44,7 @@ Structure of the main Simulink library was changed to support signal names longe
### Added
* Bus objects now support signal names longer than 63 characters.
* Simulation and initialization are now considerably faster.
* **Vector to Bus block**. Make a bus out of a apprapriately sized vector.
* **Vector to Bus block**. Make a bus out of a appropriately sized vector.
* Browse buttons in the Simulink block mask.

### Changed
Expand Down

0 comments on commit 7310b83

Please sign in to comment.