Changeset 1004 for trunk/modelicaml/org.openmodelica.modelicaml.simulation/src/org

Timestamp:

09/24/11 22:52:30 (13 years ago)

Author:

vasaie_p

Message:

simulation execution with omc

Location:

trunk/modelicaml/org.openmodelica.modelicaml.simulation/src/org/openmodelica/modelicaml/simulation/execution

Files:

• . (copied) (copied from trunk/modelicaml/org.openmodelica.modelicaml.simulation/src/org/openmodelica/modelicaml/simulation/simulationexecution)
• ExecuteSimulation.java (modified) (8 diffs)

trunk/modelicaml/org.openmodelica.modelicaml.simulation/src/org/openmodelica/modelicaml/simulation/execution/ExecuteSimulation.java

@@ -1 @@
-package org.openmodelica.modelicaml.simulation.simulationexecution;
+package org.openmodelica.modelicaml.simulation.execution;
 import java.io.File;
 
+import org.openmodelica.modelicaml.simulation.filehandling.cp;
 import org.openmodelica.modelicaml.simulation.omc.OpenModelicaCompilerCommunication;
 import org.openmodelica.modelicaml.simulation.xml.TestSession;
@@ -10 +11 @@
 
     /**
-     * Compiling the model code using OMC
+     * Compiling and simulating the model code using OMC
      * Error Handling : Syntax, Semantic check by OMC.
      *
-     * @return the string
+     * @return the omc return string, if the string is empty there was no error otherwise the error string is included
      */
-    private static String compileModel(File sessionFolder, File tempSimulationFolder, TestSession testSessionObj){
+    public static String executeAllModels(File sessionFolder, String omcTempWorkingFolder, TestSession testSessionObj){
         OpenModelicaCompilerCommunication omcc = new OpenModelicaCompilerCommunication();
         String omcReturnString = "";
-        String pathForOMC = tempSimulationFolder.getAbsolutePath();
         
-        while(pathForOMC.contains("\\")){
-            pathForOMC = pathForOMC.replace('\\', '/');
+        while(omcTempWorkingFolder.contains("\\")){
+            omcTempWorkingFolder = omcTempWorkingFolder.replace('\\', '/');
         }
         
@@ -27 +27 @@
         omcc.clear();
         
-        //Change directory
-        omcReturnString = omcc.cd();
+        //OMC is working in the eclipse project folder, therefore the folder must been changed to the OM installation folder where a tmp folder can be created.
+        omcReturnString = omcc.cd(omcTempWorkingFolder);        
         if(omcReturnString.contains("Error")){
             String errorString = omcc.getErrorString();
@@ -34 +34 @@
             return "cd: " + omcReturnString + "\nErrorString: " + errorString;
         }
-        else{
-            File omcWorkingDirectory = new File(omcReturnString);
-//          omcReturnString = ""; //TODO cd muss hier raus und nach oben gepackt werden!
-        }
+        else
+            omcReturnString = "";
         
         //Load package.mo
@@ -46 +44 @@
                 packageMO = packageMO.replace('\\', '/');
             }
-            //TODO [20110224] Check for true or false
+            
             if(new File(packageMO).isDirectory()){
                 omcReturnString = omcc.loadFile(packageMO.replaceAll("%20", " ") + "/package.mo"); //If the file is a directory the whole contained model will be loaded
@@ -85 +83 @@
         //Simulate model
         for(TestModel model : testSessionObj.testModels){
-            omcReturnString = omcc.buildModel(model.qualifiedName, model.start, model.stop, model.numberOfIntervals, model.tolerance, model.solver, model.outputFormat);
+            omcReturnString = omcc.simulate(model.qualifiedName, model.start, model.stop, model.numberOfIntervals, model.tolerance, model.solver, model.outputFormat);
             
             if(omcReturnString.contains("{\"\",\"\"}") || omcReturnString.contains("Error")){
@@ -107 +105 @@
      */
     public static void main(String[] args) {
-        String sessionFolderPath = "C:\\Projects\\ModelicaML\\runtime-New_configuration\\modelicaml.example.potableWaterSystem_v25\\test-gen\\test-session_20110922235427\\";
+        String sessionFolderPath = "C:\\Projects\\ModelicaML\\runtime-New_configuration\\modelicaml.example.potableWaterSystem_v26\\test-gen\\test-session_20110924175101\\";
         
         TestSession testSessionObj = TestSessionXML_Reader.readFromXML(sessionFolderPath + "test_session.xml");
-        
+        String omcTempWorkingFolder = System.getenv().get("OPENMODELICAHOME") + "/tmp"; 
         File sessionFolder = new File(sessionFolderPath);
         File tempSimulationFolder = new File(sessionFolderPath + "tmp");
-            tempSimulationFolder.mkdir();
-            tempSimulationFolder.canWrite();
-        String omcMessage = compileModel(sessionFolder, tempSimulationFolder, testSessionObj);
+        tempSimulationFolder.mkdir();
+        tempSimulationFolder.canWrite();
+        String omcMessage = executeAllModels(sessionFolder, omcTempWorkingFolder, testSessionObj);
         if(omcMessage.isEmpty()){
             
@@ -121 +119 @@
         else
             System.out.println("OMC Message: /n" + omcMessage);
+        
+        for(TestModel model : testSessionObj.testModels){
+            cp.copyFile(omcTempWorkingFolder + "/" + model.qualifiedName + ".exe", tempSimulationFolder + "/" + model.qualifiedName + ".exe");
+            cp.copyFile(omcTempWorkingFolder + "/" + model.qualifiedName + "_init.xml", tempSimulationFolder + "/" + model.qualifiedName + "_init.xml");
+            cp.copyFile(omcTempWorkingFolder + "/" + model.qualifiedName + "_res.plt", tempSimulationFolder + "/" + model.qualifiedName + "_res.plt");
+        }
     }