Context Navigation

HybridModelTests.mo

Timestamp:

Jul 9, 2019 3:08:30 PM (5 months ago)

Author:

tgutzmann

Message:

Merge from trunk

Location:

branches/dev-mj-1626

Files:

Property svn:externals

-                      old
+                      new
 https://svn.jmodelica.org/assimulo/tags/Assimulo-3.0@875 external/Assimulo
 https://svn.jmodelica.org/PyFMI/tags/PyFMI-2.5/src/common@12158 Python/src/common
+https://svn.jmodelica.org/PyFMI/tags/PyFMI-2.5.3/src/common@13067 Python/src/common
 https://github.com/chria/casadi/branches/tested_mod@11366 ThirdParty/CasADi/CasADi
 https://svn.jmodelica.org/FMILibrary/trunk@10948 external/FMILibrary/FMILibrary
 https://svn.jmodelica.org/PyFMI/tags/PyFMI-2.5.1@12984 external/PyFMI
+https://svn.jmodelica.org/PyFMI/tags/PyFMI-2.5.3@13069 external/PyFMI

Property svn:mergeinfo changed

/branches/dev-1663 (added)	merged: 12546,12548,12559-12560,12572,12578,12585,12589,12632,12638,12649,12794,12815-12816,12818,12867,12887,12896,12932,12989,12993,13005,13008,13010-13012,13014,13016
/branches/dev-AR-logoutput (added)	merged: 13024
/trunk	merged: 13017,13019,13035,13044,13053,13060,13063,13074-13078	reverse-merged: 12980-12982

-                      r12934
+                      r13095
 ")})));
         end IndependentDownstream1;
         model PreMergeInteraction
             Boolean sample1 = sample(1, 0.4);
 …
             end when;
             b = a + 2;
         annotation(__JModelica(UnitTesting(tests={
             FClassMethodTestCase(
                 name="EventPreMerge.IndependentDownstream1",
+        annotation(__JModelica(UnitTesting(tests={
+            FClassMethodTestCase(
+                name="EventPreMerge.PreMergeInteraction",
                 description="Ensures event and pre merge interacts well with pre merge",
                 methodName="printDAEBLT",
 …
 ")})));
         end PreMergeInteraction;
         model DiscreteRealMerge
             discrete Real x;

Note: See TracChangeset for help on using the changeset viewer.