Merge pull request #690 from SciML/myb/fix

Fix nested diff

Author: YingboMa

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "4.3.0"
+version = "4.3.1"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/differentials.jl

@@ -87,7 +87,13 @@ function expand_derivatives(O::Term, simplify=true; occurances=nothing)
             if isequal(o.op.x, D.x)
                 return O
             else
-                return expand_derivatives(o.op(expand_derivatives(D(o.args[1]), false)), simplify)
+                inner = expand_derivatives(D(o.args[1]), false)
+                # if the inner expression is not expandable either, return
+                if operation(inner) isa Differential
+                    return O
+                else
+                    return expand_derivatives(o.op(inner), simplify)
+                end
             end
         end
 

test/derivatives.jl

@@ -113,3 +113,12 @@ test_equal(expand_derivatives(Differential(x)(L) - ∂ₜ(Differential(∂ₜ(x)
 
 @variables x2(t)
 @test isequal(expand_derivatives(Differential(x)(2 * x + x2 * x)), 2 + x2)
+
+@parameters x y
+@variables u(..)
+@derivatives Dy'~y
+@derivatives Dx'~x
+dxyu = Dx(Dy(u(x,y)))
+@test isequal(expand_derivatives(dxyu), dxyu)
+dxxu = Dx(Dx(u(x,y)))
+@test isequal(expand_derivatives(dxxu), dxxu)