Changeset 13386

Timestamp:

2012-10-15T12:23:11+02:00 (12 years ago)

Author:

lochel

Message:

• rename package for linear_system/MissV.mos
• load model from string

Location:

trunk/testsuite/simulation/modelica

Files:

• linear_system/MissV.mos (modified) (5 diffs)
• nonlinear_system/NonlinearFailed.mo (deleted)
• nonlinear_system/NonlinearFailed.mos (modified) (1 diff)
• nonlinear_system/NonlinearMixed.mo (deleted)
• nonlinear_system/NonlinearMixed.mos (modified) (1 diff)

trunk/testsuite/simulation/modelica/linear_system/MissV.mos

@@ -2 +2 @@
 // keywords: linear system of equations
 // status: correct
-// teardown_command: rm -rf initializationTests.MissV* _initializationTests.MissV* output.log
+// teardown_command: rm -rf linear_system.MissV* _linear_system.MissV* output.log
 //
 // Solving of a linear system of equations
@@ -10 +10 @@
 
 loadString("
-package initializationTests
+package linear_system
   model MissV
     Real pb(start = 12000000);
@@ -25 +25 @@
     Qa + Qb = 0;
   end MissV;
-end initializationTests;
+end linear_system;
 "); getErrorString();
-instantiateModel(initializationTests.MissV); getErrorString();
-simulate(initializationTests.MissV,startTime=0.0, stopTime=1.0, numberOfIntervals=500, tolerance=1e-5); getErrorString();
+instantiateModel(linear_system.MissV); getErrorString();
+simulate(linear_system.MissV,startTime=0.0, stopTime=1.0, numberOfIntervals=500, tolerance=1e-5); getErrorString();
 
 val(pa, 1.0);
@@ -36 +36 @@
 // true
 // ""
-// "class initializationTests.MissV
+// "class linear_system.MissV
 //   Real pb(start = 12000000.0);
 //   Real Qb;
@@ -48 +48 @@
 //   pa = pb;
 //   Qa + Qb = 0.0;
-// end initializationTests.MissV;
+// end linear_system.MissV;
 // "
 // ""
 // record SimulationResult
-//     resultFile = "initializationTests.MissV_res.mat",
-//     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'initializationTests.MissV', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
+//     resultFile = "linear_system.MissV_res.mat",
+//     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 0.00001, method = 'dassl', fileNamePrefix = 'linear_system.MissV', storeInTemp = false, noClean = false, options = '', outputFormat = 'mat', variableFilter = '.*', measureTime = false, cflags = '', simflags = ''",
 //     messages = ""
 // end SimulationResult;

trunk/testsuite/simulation/modelica/nonlinear_system/NonlinearFailed.mos

@@ -3 +3 @@
 // teardown_command: rm -f NonLinSysFailed*
 
-loadFile("NonlinearFailed.mo");
+loadString("
+model NonLinSysFailed
+  Real x;
+equation
+  1.1 = sin(x);
+end NonLinSysFailed;
+");
 simulate(NonLinSysFailed);
 

trunk/testsuite/simulation/modelica/nonlinear_system/NonlinearMixed.mos

@@ -3 +3 @@
 // teardown_command: rm -f NonlinearMixed_*
 
-loadFile("NonlinearMixed.mo");
+loadString("
+model NonlinearMixed
+  Real x( start=0);
+  Real y( start=0);
+  Real z( start=0);
+  discrete Boolean a( start=false);
+  Real xx(start=0);
+equation
+  a = x < -1;
+  (x+y)^2 = if a then time else 0;
+  (y+z)^2 = if a then 0 else time;
+  (z+x)^2 = 0;
+  der(xx) = if time<0.5 then 1 else 0;
+end NonlinearMixed;
+");
 simulate(NonlinearMixed);
 val(x,{0.0,0.5});