diff --git a/src/physics/fluxsurfaces.jl b/src/physics/fluxsurfaces.jl index 071ea930..74cf4e04 100644 --- a/src/physics/fluxsurfaces.jl +++ b/src/physics/fluxsurfaces.jl @@ -939,7 +939,7 @@ function find_magnetic_axis( PSI_interpolant(x[1], x[2]) * psi_sign catch e if isa(e, InterruptException) - retrhow(e) + rethrow(e) elseif typeof(e) <: BoundsError return T2(Inf) else @@ -2310,7 +2310,7 @@ function luce_squareness( push!(z, (norm(PD .- PO) - norm(PC .- PO)) / norm(PE .- PC)) catch e if isa(e, InterruptException) - retrhow(e) + rethrow(e) else push!(z, T(0.0)) end diff --git a/src/physics/sources.jl b/src/physics/sources.jl index 092980be..9576a592 100644 --- a/src/physics/sources.jl +++ b/src/physics/sources.jl @@ -444,13 +444,13 @@ function total_sources!( # initialize ions (get list of ions by looking both under core_profiles and core_sources) for ion in cp1d.ion - resize!(total_source1d.ion, "element[1].a" => ion.element[1].z_n, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false) + resize!(total_source1d.ion, "element[1].a" => ion.element[1].a, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false) end for source in core_sources.source if !isempty(source.profiles_1d) && source.profiles_1d[1].time <= time0 source1d = source.profiles_1d[1] for ion in source1d.ion - resize!(total_source1d.ion, "element[1].a" => ion.element[1].z_n, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false) + resize!(total_source1d.ion, "element[1].a" => ion.element[1].a, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false) end end end diff --git a/src/physics/transport.jl b/src/physics/transport.jl index 124cbfab..e455b8a0 100644 --- a/src/physics/transport.jl +++ b/src/physics/transport.jl @@ -138,13 +138,13 @@ function total_fluxes!( # initialize ions for ion in cp1d.ion - resize!(total_flux1d.ion, "element[1].a" => ion.element[1].z_n, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false) + resize!(total_flux1d.ion, "element[1].a" => ion.element[1].a, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false) end for model in core_transport.model if !isempty(model.profiles_1d) && time0 >= model.profiles_1d[1].time model1d = model.profiles_1d[time0] for ion in model1d.ion - resize!(total_flux1d.ion, "element[1].a" => ion.element[1].z_n, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false) + resize!(total_flux1d.ion, "element[1].a" => ion.element[1].a, "element[1].z_n" => ion.element[1].z_n, "label" => ion.label; wipe=false) end end end @@ -193,7 +193,7 @@ function total_fluxes!( goto(m1d, path) catch e if isa(e, InterruptException) - retrhow(e) + rethrow(e) else continue end