Merge branch 'master' into tearing

Author: ptaeuber

openmodelica/fmi/ModelExchange/1.0/Makefile

@@ -18,8 +18,9 @@ TanksConnectedPI.mos \
 CoupledClutches.mos \
 BooleanNetwork1.mos \
 IntegerNetwork1.mos \
+StringParameters.mos
 
-# test that currently fail. Move up when fixed. 
+# test that currently fail. Move up when fixed.
 # Run make testfailing
 FAILINGTESTFILES= \
 
@@ -42,8 +43,8 @@ test:
 	@echo
 	@echo OPENMODELICAHOME=" $(OPENMODELICAHOME) "
 	@$(TEST) $(TESTFILES)
-	
-# Cleans all files that are not listed as dependencies 
+
+# Cleans all files that are not listed as dependencies
 clean :
 	@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp
 	@rm -f $(CLEAN)
@@ -52,11 +53,11 @@ clean :
 # do it after cleaning and updating the folder
 # then you can get a list of file names (which must be dependencies
 # since you got them from repository + your own new files)
-# then add them to the DEPENDENCIES. You can find the 
-# list in deps.txt 
-getdeps: 
+# then add them to the DEPENDENCIES. You can find the
+# list in deps.txt
+getdeps:
 	@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp
-	@echo $(CLEAN) | sed -r 's/deps.txt|deps.tmp//g' | sed 's/ / \\\n/g' > deps.txt	
+	@echo $(CLEAN) | sed -r 's/deps.txt|deps.tmp//g' | sed 's/ / \\\n/g' > deps.txt
 	@echo Dependency list saved in deps.txt.
 	@echo Copy the list from deps.txt and add it to the Makefile @DEPENDENCIES
 

openmodelica/fmi/ModelExchange/1.0/StringParameters.mos

@@ -9,10 +9,7 @@ loadFile("StringParameters.mo"); getErrorString();
 translateModelFMU(StringParameters); getErrorString();
 importFMU("StringParameters.fmu"); getErrorString();
 loadFile("StringParameters_me_FMU.mo"); getErrorString();
-simulate(StringParameters_me_FMU, stopTime=3.0); getErrorString();
-val(ball,0);
-val(ball,1);
-val(ball,3);
+simulate(StringParameters_me_FMU, stopTime=3.0, simflags="-output=sball,eball"); getErrorString();
 
 // Result:
 // true
@@ -28,11 +25,11 @@ val(ball,3);
 // ""
 // record SimulationResult
 //     resultFile = "StringParameters_me_FMU_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'StringParameters_me_FMU', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'StringParameters_me_FMU', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = '-output=sball,eball'",
+//     messages = "time=3,sball=\"RedBall\",eball=\"BlueBall\"
+// "
 // end SimulationResult;
-// ""
-// 1.0
-// 0.2250205572103477
-// -0.9555203906613871
+// "[openmodelica/fmi/ModelExchange/1.0/StringParameters_me_FMU.mo:14:3-14:55:writable] Warning: Parameter eball has no value, and is fixed during initialization (fixed=true), using available start value (start="BlueBall") as default value.
+// [openmodelica/fmi/ModelExchange/1.0/StringParameters_me_FMU.mo:15:3-15:54:writable] Warning: Parameter sball has no value, and is fixed during initialization (fixed=true), using available start value (start="RedBall") as default value.
+// "
 // endResult

partest/runtests.pl

@@ -59,6 +59,7 @@
 my $check_proc_cpu = 1;
 my $withxml = 0;
 my $withxmlcmd = 0;
+my $withtxt = 0;
 my $have_dwdiff = "";
 
 {
@@ -90,6 +91,7 @@
     print("  -nocolour     Don't use colours in output.\n");
     print("  -counttests   Don't run the test; only count them.\n");
     print("  -with-xml     Output XML log.\n");
+    print("  -with-txt     Output TXT log.\n");
     print("  -failing      Run failing tests instead of working.\n");
     print("  -veryfew      Run only a very small number of tests to see if runtests.pl is working.\n");
     print("  -gitlibs      If you have installed omc using GITLIBRARIES=Yes, you can test some of those libraries.\n");
@@ -127,6 +129,9 @@
     $withxml = 1;
     $withxmlcmd = '-with-xml';
   }
+  elsif(/^-with-txt$/) {
+    $withtxt = 1;
+  }
   elsif(/^-failing$/) {
     $run_failing = 1;
   }
@@ -357,6 +362,20 @@ sub run_tests {
   foreach my $failed_test (@sorted) {
     print "\t" . $failed_test . "\n";
   }
+
+  if($withtxt) {
+    unlink("$testsuite_root/failed.log");
+    open my $TXTOUT, '>', "$testsuite_root/failed.log" or die "Couldn't open failed.log: $!";
+    binmode $TXTOUT, ":encoding(UTF-8)";
+
+    print $TXTOUT "Failed tests:\n";
+    foreach my $failed_test (@sorted) {
+      print $TXTOUT $failed_test . "\n";
+    }
+
+    print $TXTOUT "\n$tests_failed of $test_count failed\n";
+    close $TXTOUT;
+  }
 }
 
 if ($slowest) {

simulation/modelica/others/ComplexFun.mos

@@ -1,62 +1,38 @@
 // name: complexFun1
 // status: correct
 
-loadFile("ComplexFun.mo");
-getErrorString();
+loadFile("ComplexFun.mo"); getErrorString();
 
-simulate(problem1);
-getErrorString();
+simulate(problem1); getErrorString();
 
 val(x,{0.0,0.1,0.2,0.7,1.0});
-getErrorString();
 
-simulate(problem2);
-getErrorString();
+simulate(problem2); getErrorString();
 
 val(y,{0.0,0.1,0.2,0.7,1.0});
-val(z,{0.0,0.1,0.2,0.7,1.0});
-getErrorString();
+ val(z,{0.0,0.1,0.2,0.7,1.0});
 
 setCommandLineOptions("+cseEachCall"); getErrorString();
-simulate(problem1);
-getErrorString();
+simulate(problem1); getErrorString();
 
-val(x,{0.0,0.1,0.2,0.7,1.0});
-getErrorString();
+val(x,{0.0,0.1,0.2,0.7,1.0}); getErrorString();
 
-simulate(problem2);
-getErrorString();
+simulate(problem2); getErrorString();
 
 val(y,{0.0,0.1,0.2,0.7,1.0});
 val(z,{0.0,0.1,0.2,0.7,1.0});
-getErrorString();
 
 setCommandLineOptions("+d=disableSimplifyComplexFunction +cseEachCall=false"); getErrorString();
-simulate(problem1);
-getErrorString();
+simulate(problem1); getErrorString();
 
 val(x,{0.0,0.1,0.2,0.7,1.0});
-getErrorString();
 
-simulate(problem2);
-getErrorString();
-
-val(y,{0.0,0.1,0.2,0.7,1.0});
-getErrorString();
+simulate(problem2); getErrorString() == "";
 
 setCommandLineOptions("+d=disableSimplifyComplexFunction +cseEachCall"); getErrorString();
-simulate(problem1);
-getErrorString();
-
-val(x,{0.0,0.1,0.2,0.7,1.0});
-getErrorString();
-
-simulate(problem2);
-getErrorString();
-
-val(y,{0.0,0.1,0.2,0.7,1.0});
-getErrorString();
+simulate(problem1); getErrorString() == "";
 
+simulate(problem2); getErrorString() == "";
 
 // Result:
 // true
@@ -68,7 +44,6 @@ getErrorString();
 // end SimulationResult;
 // ""
 // {0.0,0.2720759220056126,0.4824045318333194,1.445553342178025,2.0}
-// ""
 // record SimulationResult
 //     resultFile = "problem2_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'problem2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
@@ -77,7 +52,6 @@ getErrorString();
 // ""
 // {-1.0,-1.216227766016838,-1.247213595499958,-1.136660026534076,-1.0}
 // {1.0,1.216227766016838,1.247213595499958,1.136660026534076,1.0}
-// ""
 // true
 // ""
 // record SimulationResult
@@ -96,7 +70,6 @@ getErrorString();
 // ""
 // {-1.0,-1.216227766016838,-1.247213595499958,-1.136660026534076,-1.0}
 // {1.0,1.216227766016838,1.247213595499958,1.136660026534076,1.0}
-// ""
 // true
 // ""
 // record SimulationResult
@@ -106,45 +79,24 @@ getErrorString();
 // end SimulationResult;
 // ""
 // {0.0,0.2720759220056126,0.4824045318333193,1.445553342178025,2.0}
-// ""
 // record SimulationResult
 //     resultFile = "",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'problem2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = "Failed to build model: problem2"
 // end SimulationResult;
-// "[CodegenCFunctions.tpl:2747:11-2747:11:writable] Error: Template error: tupleReturnVariableUpdates: Unhandled expression. -$TMP_problem2_f1.z
-// [CodegenCFunctions.tpl:2747:11-2747:11:writable] Error: Template error: tupleReturnVariableUpdates: Unhandled expression. -$TMP_problem2_f5.z
-// [CodegenCFunctions.tpl:2747:11-2747:11:writable] Error: Template error: tupleReturnVariableUpdates: Unhandled expression. -$TMP_problem2_f1.z
-// [CodegenCFunctions.tpl:2747:11-2747:11:writable] Error: Template error: tupleReturnVariableUpdates: Unhandled expression. -$TMP_problem2_f5.z
-// "
-// {0.0,-0.07207592200561265,-0.08240453183331929,-0.04555334217802521,8.980666631940483e-19}
-// ""
+// false
 // true
 // ""
 // record SimulationResult
 //     resultFile = "",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'problem1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = "Failed to build model: problem1"
 // end SimulationResult;
-// "Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
-// [SimCode/SimCodeUtil.mo:2364:7-2364:46:writable] Error: Internal error function createNonlinearResidualEquationsComplex failed for: (x, y) = ($cse1, $cse2)
-// [simulation/modelica/others/ComplexFun.mo:14:5-14:41:writable] Error: Internal error function createNonlinearResidualEquations failed for equation: (x, y) = ($cse1, $cse2)
-// [SimCode/SimCodeUtil.mo:2866:9-2866:50:writable] Error: Internal error function createOdeSystem failed for component torn nonlinear Equationsystem{{{2:4, 5}},
-// {3:2, 1} Size: 2
-// [SimCode/SimCodeUtil.mo:474:5-474:146:writable] Error: Internal error function createSimCode failed [Transformation from optimised DAE to simulation code structure failed]
-// "
-// {0.0,0.2720759220056126,0.4824045318333193,1.445553342178025,2.0}
-// ""
+// false
 // record SimulationResult
 //     resultFile = "",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'problem2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
 //     messages = "Failed to build model: problem2"
 // end SimulationResult;
-// "[SimCode/SimCodeUtil.mo:2364:7-2364:46:writable] Error: Internal error function createNonlinearResidualEquationsComplex failed for: (x, -z) = ($cse1, $cse2)
-// [simulation/modelica/others/ComplexFun.mo:31:5-31:37:writable] Error: Internal error function createNonlinearResidualEquations failed for equation: (x, -z) = ($cse1, $cse2)
-// [SimCode/SimCodeUtil.mo:4754:7-4754:46:writable] Error: Internal error complex equations currently only supported on form v = functioncall(...). Equation: (x, -z) = ($cse1, $cse2) solve for {z,x}
-// [SimCode/SimCodeUtil.mo:474:5-474:146:writable] Error: Internal error function createSimCode failed [Transformation from optimised DAE to simulation code structure failed]
-// "
-// {0.0,-0.07207592200561265,-0.08240453183331929,-0.04555334217802521,8.980666631940483e-19}
-// ""
+// false
 // endResult