From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 23 Aug 2013 09:59:36 +0000 (+0000)
Subject: The default Modelica solver set to the bundled one in Windows (refs #4401).
X-Git-Tag: 1.8.1~252
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=7fddda8c53810d12f2e5f4af1231af983e7a5536;p=simantics%2Fsysdyn.git

The default Modelica solver set to the bundled one in Windows (refs #4401).
Print to the Sysdyn console which solver is used when simulating.
Some little fixes, too.

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@27770 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
index d2f2d43a..a9535e73 100644
--- a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
+++ b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
@@ -114,21 +114,20 @@ public class ModelicaManager {
     }
     
     public static File getDefaultModelicaHome() {
-        // Try to find installed openModelica
-        File omhome = getInstalledOpenModelicaHome();
-        if(omhome != null)
-            return omhome;
-
         // Get operating system
         OSType os = calculateOS();
         
-        // OPENMODELICAHOMe was not found or the folder does not exist. Try built-in OpenModelica for windows
+        // Try built-in OpenModelica for windows
         if(os.equals(OSType.WINDOWS)) {
             File builtin = getBuiltinOpenModelicaHome();
             if(builtin != null)
                 return builtin;
         }
 
+        // Try to find installed openModelica
+        File omhome = getInstalledOpenModelicaHome();
+        if(omhome != null)
+            return omhome;
 
         // OS was not windows or built-in OpenModelica did not work
         switch (os) {
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
index 604c924b..744e6316 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
@@ -177,7 +177,7 @@ public class ResourceSelectionProcessor implements SelectionProcessor<Object, Re
             // If shadow variable, display properties of the original variable
             if(backend.isInstanceOf(r, sr.Shadow)) {
                 Resource original = backend.getPossibleObject(r, sr.Shadow_original);
-                if(original != null) {
+                if(original != null && var != null) {
                     r = original;
                     Variable parent = var.getParent(backend);
                     var = parent.getPossibleChild(backend, NameUtils.getSafeName(backend, r));
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynConsole.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynConsole.java
index a985f790..c6334cfa 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynConsole.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynConsole.java
@@ -19,7 +19,7 @@ import org.simantics.modelica.IModelicaMonitor;
 
 public class SysdynConsole  implements IModelicaMonitor {
 
-    private static String SYSDYN_CONSOLE = "Sysyn modelica console";
+    private static String SYSDYN_CONSOLE = "Sysdyn modelica console";
     private MessageConsole console;
 
     public static SysdynConsole INSTANCE = new SysdynConsole();
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiment.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiment.java
index e20dda89..e6905109 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiment.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiment.java
@@ -445,7 +445,7 @@ public class SysdynExperiment extends Experiment implements IDynamicExperiment,
      * @param progressMonitor
      * @throws IOException
      */
-    public synchronized void simulate(final IModelicaMonitor monitor, final IProgressMonitor progressMonitor) throws IOException {
+    public synchronized void simulate(final IModelicaMonitor monitor, final IProgressMonitor progressMonitor, String modelName) throws IOException {
         canceled = false;
         progressMonitor.subTask("Write modelica classes");
 
@@ -454,6 +454,7 @@ public class SysdynExperiment extends Experiment implements IDynamicExperiment,
             omcVersion = ModelicaManager.getOMCVersion(home);
             omcHome = home.getAbsolutePath();
         }
+        monitor.message("Simulate " + modelName + " using OpenModelica " + omcVersion);
         
         // Get Modelica code
         String modelText = getModelicaCode(monitor, false, omcVersion);
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
index b2e05e16..d99f014f 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynGameExperiment.java
@@ -36,6 +36,7 @@ import org.simantics.db.request.Read;
 import org.simantics.fmu.FMUControlJNI;
 import org.simantics.fmu.FMUJNIException;
 import org.simantics.modelica.IModelicaMonitor;
+import org.simantics.modelica.ModelicaManager;
 import org.simantics.modelica.SimulationLocation;
 import org.simantics.modelica.data.DataSet;
 import org.simantics.modelica.data.SimulationResult;
@@ -176,7 +177,7 @@ public class SysdynGameExperiment extends SysdynExperiment {
 	
 
 	@Override
-	public synchronized void simulate(final IModelicaMonitor monitor, final IProgressMonitor progressMonitor) throws IOException {
+	public synchronized void simulate(final IModelicaMonitor monitor, final IProgressMonitor progressMonitor, String modelName) throws IOException {
 		canceled = false;
 
 		progressMonitor.subTask("Write modelica classes");
@@ -185,7 +186,14 @@ public class SysdynGameExperiment extends SysdynExperiment {
 		String modelText = getModelicaCode(monitor, true, getOpenModelicaVersion());
 		if(modelText == null)
 			return;
-
+		
+		File home = ModelicaManager.getModelicaHome();
+        if (omcHome == null || !home.getAbsolutePath().equals(omcHome)) {
+            omcVersion = ModelicaManager.getOMCVersion(home);
+            omcHome = home.getAbsolutePath();
+        }
+        monitor.message("Simulate " + modelName + " using OpenModelica " + omcVersion);
+        
 		progressMonitor.worked(1);
 
 		// Write initial files and add init-parameters
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynSensitivityAnalysisExperiment.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynSensitivityAnalysisExperiment.java
index c1b8ad50..182f0430 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynSensitivityAnalysisExperiment.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynSensitivityAnalysisExperiment.java
@@ -354,7 +354,7 @@ public class SysdynSensitivityAnalysisExperiment extends SysdynExperiment {
     
     
     @Override
-    public synchronized void simulate(IModelicaMonitor monitor, IProgressMonitor progressMonitor) throws IOException {
+    public synchronized void simulate(IModelicaMonitor monitor, IProgressMonitor progressMonitor, String modelName) throws IOException {
         
         File home = ModelicaManager.getModelicaHome();
         if (omcHome == null || !home.getAbsolutePath().equals(omcHome)) {
@@ -377,6 +377,6 @@ public class SysdynSensitivityAnalysisExperiment extends SysdynExperiment {
             } catch (NumberFormatException e) {}
         }
         
-        super.simulate(monitor, progressMonitor);
+        super.simulate(monitor, progressMonitor, modelName);
     }
 }
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/simulation/SimulationJob.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/simulation/SimulationJob.java
index 2823b33e..5daae250 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/simulation/SimulationJob.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/simulation/SimulationJob.java
@@ -45,11 +45,10 @@ public class SimulationJob extends Job {
     @Override
     protected IStatus run(IProgressMonitor monitor) {
         monitor.beginTask("Simulate " + model.getConfiguration().getLabel(), experiment.numberOfSimulationRunSteps());        
-        this.monitor.message("Simulate " + model.getConfiguration().getLabel());
         try {
             model.update();
             if(experiment instanceof SysdynExperiment) {
-            	((SysdynExperiment)experiment).simulate(this.monitor, monitor);
+            	((SysdynExperiment)experiment).simulate(this.monitor, monitor, model.getConfiguration().getLabel());
             	model.setStructureModified(false);
             }
         } catch (Exception e) {