Merge pull request #248 from marinlauber/fix_readvtk_fieldnames

Better restart field specification for ReadVTK extension

Author: b-fg

ext/WaterLilyReadVTKExt.jl

@@ -20,18 +20,19 @@ The time step is also updated to match the time step of the vtk file, such that
 Keyword arguments considered are `fname="WaterLily.pvd"` and `attrib=default_attrib()`.
 """
 function load!(a::AbstractSimulation, ::Val{:pvd}; kwargs...)
-    kwargs_dict = Dict(kwargs)
-    fname = get(kwargs_dict, :fname, "WaterLily.pvd")
-    attrib = get(kwargs_dict, :attrib, default_attrib())
+    fname = get(Dict(kwargs), :fname, "WaterLily.pvd")
+    attrib = get(Dict(kwargs), :attrib, default_attrib())
     vtk = VTKFile(PVDFile(fname).vtk_filenames[end])
     extent = filter(!iszero,ReadVTK.get_whole_extent(vtk)[2:2:end]);
     # check dimensions match
     text = "The dimensions of the simulation do not match the dimensions of the vtk file."
     @assert extent.+1 == collect(size(a.flow.p)) text
     # fill the arrays for pressure and velocity
     point_data = ReadVTK.get_point_data(vtk)
-    copyto!(a.flow.p, WaterLily.squeeze(Array(get_data_reshaped(point_data["Pressure"]))));
-    copyto!(a.flow.u, WaterLily.squeeze(components_last(Array(get_data_reshaped(point_data["Velocity"])))));
+    pressure = get(Dict(kwargs), :pressure, "Pressure")
+    velocity = get(Dict(kwargs), :velocity, "Velocity")
+    copyto!(a.flow.p, WaterLily.squeeze(Array(get_data_reshaped(point_data[pressure]))));
+    copyto!(a.flow.u, WaterLily.squeeze(components_last(Array(get_data_reshaped(point_data[velocity])))));
     # reset time to work with the new time step
     a.flow.Δt[end] = PVDFile(fname).timesteps[end]*a.L/a.U
     push!(a.flow.Δt,WaterLily.CFL(a.flow))