Merge remote-tracking branch 'origin/master'

Author: ChrisRackauckas

src/DiffEqBase.jl

@@ -160,4 +160,6 @@ export ConvergenceSetup
 
 export ContinuousCallback, DiscreteCallback, CallbackSet
 
+export copy_non_array_fields
+
 end # module

src/data_array.jl

@@ -15,6 +15,11 @@ size(A::DEDataArray)   = size(A.x)
    :($(assignments...); dest)
 end
 
+@generated function copy_non_array_fields{T<:DEDataArray}(previous::T, arr::AbstractArray)
+  assignments = [:(getfield(previous,$i)) for i=2:nfields(T)]
+  :(T(arr,$(assignments...)))
+end
+
 getindex( A::DEDataArray,    i::Int) = (A.x[i])
 setindex!(A::DEDataArray, x, i::Int) = (A.x[i] = x)
 getindex( A::DEDataArray,    i::Int...) = (A.x[i...])

src/integrator_interface.jl

@@ -1,24 +1,24 @@
-resize!(i::DEIntegrator,ii::Int) = error("This method has not been implemented for the integrator")
-deleteat!(i::DEIntegrator,ii) = error("This method has not been implemented for the integrator")
-addat!(i::DEIntegrator,ii,val=zeros(length(idxs))) = error("This method has not been implemented for the integrator")
-user_cache(i::DEIntegrator) = error("This method has not been implemented for the integrator")
-u_cache(i::DEIntegrator) = error("This method has not been implemented for the integrator")
-du_cache(i::DEIntegrator) = error("This method has not been implemented for the integrator")
-full_cache(i::DEIntegrator) = error("This method has not been implemented for the integrator")
-resize_non_user_cache!(i::DEIntegrator,ii::Int) = error("This method has not been implemented for the integrator")
-deleteat_non_user_cache!(i::DEIntegrator,idxs) = error("This method has not been implemented for the integrator")
-addat_non_user_cache!(i::DEIntegrator,idxs) = error("This method has not been implemented for the integrator")
-terminate!(i::DEIntegrator) = error("This method has not been implemented for the integrator")
-get_du(i::DEIntegrator) = error("This method has not been implemented for the integrator")
-get_dt(i::DEIntegrator) = error("This method has not been implemented for the integrator")
-get_proposed_dt(i::DEIntegrator) = error("This method has not been implemented for the integrator")
-modify_proposed_dt!(i::DEIntegrator) = error("This method has not been implemented for the integrator")
-u_modified!(i::DEIntegrator,bool) = error("This method has not been implemented for the integrator")
-savevalues!(i::DEIntegrator) = error("This method has not been implemented for the integrator")
-add_tstop!(i::DEIntegrator,t) = error("This method has not been implemented for the integrator")
-add_saveat!(i::DEIntegrator,t) = error("This method has not been implemented for the integrator")
-set_abstol!(i::DEIntegrator,t) = error("This method has not been implemented for the integrator")
-set_reltol!(i::DEIntegrator,t) = error("This method has not been implemented for the integrator")
+resize!(i::DEIntegrator,ii::Int) = error("resize!: method has not been implemented for the integrator")
+deleteat!(i::DEIntegrator,ii) = error("deleteat!: method has not been implemented for the integrator")
+addat!(i::DEIntegrator,ii,val=zeros(length(idxs))) = error("addat!: method has not been implemented for the integrator")
+user_cache(i::DEIntegrator) = error("user_cache: method has not been implemented for the integrator")
+u_cache(i::DEIntegrator) = error("u_cache: method has not been implemented for the integrator")
+du_cache(i::DEIntegrator) = error("du_cache: method has not been implemented for the integrator")
+full_cache(i::DEIntegrator) = error("full_cache: method has not been implemented for the integrator")
+resize_non_user_cache!(i::DEIntegrator,ii::Int) = error("resize_non_user_cache!: method has not been implemented for the integrator")
+deleteat_non_user_cache!(i::DEIntegrator,idxs) = error("deleteat_non_user_cache!: method has not been implemented for the integrator")
+addat_non_user_cache!(i::DEIntegrator,idxs) = error("addat_non_user_cache!: method has not been implemented for the integrator")
+terminate!(i::DEIntegrator) = error("terminate!: method has not been implemented for the integrator")
+get_du(i::DEIntegrator) = error("get_du: method has not been implemented for the integrator")
+get_dt(i::DEIntegrator) = error("get_dt: method has not been implemented for the integrator")
+get_proposed_dt(i::DEIntegrator) = error("get_proposed_dt: method has not been implemented for the integrator")
+modify_proposed_dt!(i::DEIntegrator) = error("modify_proposed_dt!: method has not been implemented for the integrator")
+u_modified!(i::DEIntegrator,bool) = error("u_modified!: method has not been implemented for the integrator")
+savevalues!(i::DEIntegrator) = error("savevalues!: method has not been implemented for the integrator")
+add_tstop!(i::DEIntegrator,t) = error("add_tstop!: method has not been implemented for the integrator")
+add_saveat!(i::DEIntegrator,t) = error("add_saveat!: method has not been implemented for the integrator")
+set_abstol!(i::DEIntegrator,t) = error("set_abstol!: method has not been implemented for the integrator")
+set_reltol!(i::DEIntegrator,t) = error("set_reltol!: method has not been implemented for the integrator")
 
 ### Addat isn't a real thing. Let's make it a real thing Gretchen