- Update to newest versions of packages

- DifferentialEquations 7.6.0 introduced a non-backwards compatible change with [#867](SciML/DifferentialEquations.jl#867). Modia was corrected to cope with this change (based on [#162](#162)).
- Newest DifferentialEquations does not longer support Measurements. Deactivated temporarily tests with measurements.

Author: MartinOtter

Manifest.toml

@@ -30,7 +30,7 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 [compat]
 DiffEqBase = "6"
 DataFrames = "1"
-DifferentialEquations = "7"
+DifferentialEquations = "7.6.0"
 FiniteDiff = "2"
 ForwardDiff = "0.10"
 JSON = "0.21"

Project.toml

@@ -52,6 +52,12 @@ functionalities of these packages.
 - SignalTables.getSignalNames(..): Order of signal names improved so that the linear listing reflects the hierarchy of the names.
 - writeSignalTable(..): attributes renamed to _attributes. All used simulate!(..) options included in Map experiment.
 - Require SignalTables 0.4.1 (since several issues fixed with writeSignalTable(..)).
+- Update to newest versions of packages.
+
+**Bug fixes**
+
+- DifferentialEquations 7.6.0 introduced a non-backwards compatible change with [#867](https://github.com/SciML/DifferentialEquations.jl/issues/867). Modia was corrected to cope with this change (based on [#162](https://github.com/ModiaSim/Modia.jl/pull/162)).
+
 
 ### Version 0.9.3
 

docs/src/index.md

@@ -6,8 +6,8 @@ include("SimpleFilters.jl")
 include("FilterCircuit.jl")    
 include("CauerLowPassFilter.jl")    
 include("Rectifier.jl")   
-include("MotorControl.jl")    
-include("Pendulum.jl")   
+@test_skip include("MotorControl.jl")     # skipped due to issue https://github.com/SciML/DifferentialEquations.jl/issues/950
+@test_skip include("Pendulum.jl")         # skipped due to issue https://github.com/SciML/DifferentialEquations.jl/issues/950
 include("ServoSystem.jl")
 
 end

examples/runexamples.jl

@@ -10,7 +10,7 @@ module Modia
 
 const path = dirname(dirname(@__FILE__))   # Absolute path of package directory
 const Version = "0.9.4-dev"
-const Date = "2023-02-01"
+const Date = "2023-03-28"
 const modelsPath = joinpath(Modia.path, "models")
 
 print(" \n\nWelcome to ")

src/Modia.jl

@@ -258,10 +258,12 @@ function simulate!(m::SimulationModel{FloatType,TimeType}, algorithm=missing; me
             eh.nFullRestartEvents, m.linearEquations)
 
         # Raise an error, if simulation was not successful
-        if !(solution.retcode == :Default || solution.retcode == :Success || solution.retcode == :Terminated)
+        #if !(solution.retcode == :Default || solution.retcode == :Success || solution.retcode == :Terminated)
+        if !(solution.retcode in [ReturnCode.Default, ReturnCode.Success, ReturnCode.Terminated])
             error("\nsolution = simulate!(", m.modelName, ", ...) failed with solution.retcode = :$(solution.retcode) at time = $finalTime.\n")
         end
 
+
         if m.eventHandler.restart != Modia.FullRestart
             break
         end

src/SimulateAndPlot.jl

@@ -5,7 +5,7 @@ Test.@testset "Test basic functionality" begin
     include("TestVariables.jl")
     include("TestFirstOrder.jl")
     include("TestFirstOrder2.jl")
-    include("TestPendulum.jl")    
+    @test_skip include("TestPendulum.jl")    # skipped due to issue https://github.com/SciML/DifferentialEquations.jl/issues/950
     include("TestSource.jl")
     include("TestLinearEquations.jl")
     include("TestStateSelection.jl")
@@ -19,12 +19,12 @@ end
 Test.@testset "Test units, uncertainties" begin
     include("TestUnitAsString.jl")
     include("TestUnits.jl")
-    include("TestUncertainties.jl")
-    include("TestUnitsAndUncertainties.jl")
-    include("TestTwoInertiasAndIdealGear.jl")
+    @test_skip include("TestUncertainties.jl")              # skipped due to issue https://github.com/SciML/DifferentialEquations.jl/issues/950
+    @test_skip include("TestUnitsAndUncertainties.jl")      # skipped due to issue https://github.com/SciML/DifferentialEquations.jl/issues/950
+    @test_skip include("TestTwoInertiasAndIdealGear.jl")    # skipped due to issue https://github.com/SciML/DifferentialEquations.jl/issues/950
     include("TestTwoInertiasAndIdealGearWithUnits.jl")
-    include("TestTwoInertiasAndIdealGearWithUnitsAndUncertainties.jl")
-    include("TestTwoInertiasAndIdealGearWithMonteCarlo.jl")
+    @test_skip include("TestTwoInertiasAndIdealGearWithUnitsAndUncertainties.jl")    # skipped due to issue https://github.com/SciML/DifferentialEquations.jl/issues/950
+    include("TestTwoInertiasAndIdealGearWithMonteCarlo.jl") 
     include("TestTwoInertiasAndIdealGearWithUnitsAndMonteCarlo.jl")
     include("TestLinearEquationSystemWithUnitsAndMonteCarlo.jl")
 end