moves mergedefaults to utils

Author: ValentinKaisermayer

src/systems/diffeqs/abstractodesystem.jl

@@ -559,17 +559,6 @@ function process_DEProblem(constructor, sys::AbstractODESystem,u0map,parammap;
     ps = parameters(sys)
     defs = defaults(sys)
     iv = get_iv(sys)
-    function mergedefaults(defaults, varmap, vars)
-        defs = if varmap isa Dict
-            merge(defaults, varmap)
-        elseif eltype(varmap) <: Pair
-            merge(defaults, Dict(varmap))
-        elseif eltype(varmap) <: Number
-            merge(defaults, Dict(zip(vars, varmap)))
-        else
-            defaults
-        end
-    end
 
     pdefs = mergedefaults(defs, parammap, ps)
     u0defs = mergedefaults(defs, u0map, dvs)

src/utils.jl

@@ -459,3 +459,15 @@ function get_substitutions_and_solved_states(sys; no_postprocess=false)
     end
     return pre, sol_states
 end
+
+function mergedefaults(defaults, varmap, vars)
+    defs = if varmap isa Dict
+        merge(defaults, varmap)
+    elseif eltype(varmap) <: Pair
+        merge(defaults, Dict(varmap))
+    elseif eltype(varmap) <: Number
+        merge(defaults, Dict(zip(vars, varmap)))
+    else
+        defaults
+    end
+end