Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for event update at start of simulation step #284

Merged
merged 5 commits into from
Feb 9, 2021
Merged

Fix for event update at start of simulation step #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3adca3f
Update Dockerfile to add event check on ME2
dhblum Jan 21, 2021
3523190
Create test for event
dhblum Feb 5, 2021
7942430
Merge branch 'master' into issue274_hydronicPumpControl
dhblum Feb 5, 2021
3c6b130
Add fix and confirmed testing reference results
dhblum Feb 5, 2021
394a000
Update testcase2 reference results
dhblum Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ ENV SEPARATE_PROCESS_JVM /usr/lib/jvm/java-8-openjdk-amd64/
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
ENV PYTHONPATH $PYTHONPATH:$JMODELICA_HOME/Python:$JMODELICA_HOME/Python/pymodelica

USER root
# Edit pyfmi to event update at start of simulation for ME2
RUN sed -i "350 i \\\n if isinstance(self.model, fmi.FMUModelME2):\n self.model.event_update()" $JMODELICA_HOME/Python/pyfmi/fmi_algorithm_drivers.py

USER developer

WORKDIR $HOME
Expand Down
2,017 changes: 2,017 additions & 0 deletions testing/references/bestest_hydronic_heat_pump/results_event_test.csv
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions testing/references/testcase2/customizedkpis.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,34 @@ time,Temp_deviation,Average_power
54000.0,-0.69,1578.12
57600.0,-0.75,1479.49
61200.0,-1.81,1392.46
64800.0,-1.86,1324.61
68400.0,-1.91,1347.27
72000.0,-1.93,1389.04
75600.0,-1.94,1438.6
79200.0,-1.94,1493.82
82800.0,-1.95,1551.06
86400.0,-1.96,1621.11
90000.0,-1.97,1693.97
93600.0,-1.98,1769.73
97200.0,-1.99,1847.83
100800.0,-1.99,1924.39
104400.0,-2.0,2000.6
108000.0,-2.0,2064.45
111600.0,-2.0,2123.07
115200.0,-2.01,2178.65
118800.0,-1.99,2220.58
122400.0,-1.99,2256.89
126000.0,-1.98,2289.11
129600.0,-1.99,2334.18
133200.0,-1.99,2387.39
136800.0,-1.99,2472.48
140400.0,-2.0,2589.88
144000.0,-2.0,2737.95
147600.0,-2.01,2894.55
151200.0,-2.02,3056.09
154800.0,-2.03,3230.65
158400.0,-2.03,3408.0
162000.0,-2.03,3586.89
165600.0,-2.04,3768.28
64800.0,-1.86,1324.63
68400.0,-1.91,1347.28
72000.0,-1.93,1389.06
75600.0,-1.94,1438.61
79200.0,-1.94,1493.84
82800.0,-1.95,1551.08
86400.0,-1.96,1621.13
90000.0,-1.97,1693.98
93600.0,-1.98,1769.75
97200.0,-1.99,1847.84
100800.0,-1.99,1924.4
104400.0,-2.0,2000.61
108000.0,-2.0,2064.46
111600.0,-2.0,2123.08
115200.0,-2.01,2178.67
118800.0,-1.99,2220.59
122400.0,-1.99,2256.9
126000.0,-1.98,2289.12
129600.0,-1.99,2334.19
133200.0,-1.99,2387.4
136800.0,-1.99,2472.49
140400.0,-2.0,2589.9
144000.0,-2.0,2737.97
147600.0,-2.01,2894.56
151200.0,-2.02,3056.1
154800.0,-2.03,3230.66
158400.0,-2.03,3408.01
162000.0,-2.03,3586.9
165600.0,-2.04,3768.29
169200.0,-2.04,3946.11
172800.0,-2.04,4068.42
Loading