From: jsimomaa <jsimomaa@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 16 Oct 2014 07:02:45 +0000 (+0000)
Subject: Merged trunk@30214 to branches/sysdyn-1.8 on 2014-10-16 for 1.8.2 release.
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=f36d92236a2f506f91f347f4a6873cbd7fc58950;p=simantics%2Fsysdyn.git

Merged trunk@30214 to branches/sysdyn-1.8 on 2014-10-16 for 1.8.2 release.

refs #5267

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@30416 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index cde7423c..4b49d056 100644
Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ
diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 63dd7f0f..eda75ae2 100644
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -48,12 +48,14 @@ SYSDYN.SysdynModel <T MOD.StructuralModel
     >-- SYSDYN.SysdynModel.timeUnit --> L0.String <R L0.HasProperty : L0.FunctionalRelation
     >-- SYSDYN.SysdynModel.lastExportFileName --> L0.String <R L0.HasProperty : L0.FunctionalRelation
     >-- SYSDYN.SysdynModel.lastExportFilePath --> L0.String <R L0.HasProperty : L0.FunctionalRelation
+    >-- SYSDYN.SysdynModel.useModelicaLibraries --> SYSDYN.SysdynModel <R L0.IsRelatedTo : L0.Tag
+        @L0.symmetric
 //    >-- SYSDYN.SysdynModel.exeFile --> L0.ByteArray <R L0.HasProperty
     @L0.assert SYSDYN.SysdynModel.startTime 0.0
     @L0.assert SYSDYN.SysdynModel.stopTime 10.0
     @L0.assert SYSDYN.SysdynModel.solver "euler"
     @L0.assert SYSDYN.SysdynModel.timeUnit "month"    
-    
+
 //#####################################################################
 // Configuration
 //#####################################################################
diff --git a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
index ef6f571d..3a3cc77e 100644
--- a/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
+++ b/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
@@ -655,6 +655,7 @@ public class SysdynResource {
     public final Resource SysdynModel_timeUnit_Inverse;
     public final Resource SysdynModel_tolerance;
     public final Resource SysdynModel_tolerance_Inverse;
+    public final Resource SysdynModel_useModelicaLibraries;
     public final Resource SysdynModel_variableFilter;
     public final Resource SysdynModel_variableFilter_Inverse;
     public final Resource SysdynModelicaFunction;
@@ -1439,6 +1440,7 @@ public class SysdynResource {
         public static final String SysdynModel_timeUnit_Inverse = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/timeUnit/Inverse";
         public static final String SysdynModel_tolerance = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/tolerance";
         public static final String SysdynModel_tolerance_Inverse = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/tolerance/Inverse";
+        public static final String SysdynModel_useModelicaLibraries = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/useModelicaLibraries";
         public static final String SysdynModel_variableFilter = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/variableFilter";
         public static final String SysdynModel_variableFilter_Inverse = "http://www.simantics.org/Sysdyn-1.1/SysdynModel/variableFilter/Inverse";
         public static final String SysdynModelicaFunction = "http://www.simantics.org/Sysdyn-1.1/SysdynModelicaFunction";
@@ -2233,6 +2235,7 @@ public class SysdynResource {
         SysdynModel_timeUnit_Inverse = getResourceOrNull(graph, URIs.SysdynModel_timeUnit_Inverse);
         SysdynModel_tolerance = getResourceOrNull(graph, URIs.SysdynModel_tolerance);
         SysdynModel_tolerance_Inverse = getResourceOrNull(graph, URIs.SysdynModel_tolerance_Inverse);
+        SysdynModel_useModelicaLibraries = getResourceOrNull(graph, URIs.SysdynModel_useModelicaLibraries);
         SysdynModel_variableFilter = getResourceOrNull(graph, URIs.SysdynModel_variableFilter);
         SysdynModel_variableFilter_Inverse = getResourceOrNull(graph, URIs.SysdynModel_variableFilter_Inverse);
         SysdynModelicaFunction = getResourceOrNull(graph, URIs.SysdynModelicaFunction);