optimize error calcs

tristanmontoya · Oct 21, 2023 · 3197d8d · 3197d8d
1 parent 1822de9
commit 3197d8d
Show file tree

Hide file tree

Showing 6 changed files with 1,311 additions and 1,315 deletions.
diff --git a/examples/euler_1d_gauss_collocation.ipynb b/examples/euler_1d_gauss_collocation.ipynb
diff --git a/examples/euler_vortex_2d.ipynb b/examples/euler_vortex_2d.ipynb
diff --git a/src/Analysis/Analysis.jl b/src/Analysis/Analysis.jl
@@ -23,7 +23,7 @@ module Analysis
     using ..File
     using ..Visualize
 
-    export AbstractAnalysis, AbstractAnalysisResults, analyze, save_analysis, tabulate_analysis, tabulate_analysis_for_paper
+    export AbstractAnalysis, AbstractAnalysisResults, analyze, analyze_new, save_analysis, tabulate_analysis, tabulate_analysis_for_paper
 
     abstract type AbstractAnalysis end
     abstract type AbstractAnalysisResults end

diff --git a/src/Analysis/conservation.jl b/src/Analysis/conservation.jl
@@ -174,8 +174,7 @@ function evaluate_conservation_residual(
 end
 
 @inline @views function evaluate_conservation_residual(
-    analysis::EntropyConservationAnalysis, 
-    u::Array{Float64,3},
+    analysis::EntropyConservationAnalysis, u::Array{Float64,3},
     dudt::Array{Float64,3})
     (; mass_solver, conservation_law, N_c, N_e, V, WJ) = analysis
 

diff --git a/src/Analysis/error.jl b/src/Analysis/error.jl
@@ -52,17 +52,22 @@ function analyze(analysis::ErrorAnalysis{d}, sol::Array{Float64,3},
 
     (; N_c, N_e, WJ_err, V_err, x_err, total_volume, results_path) = analysis 
 
-    u_exact = evaluate(exact_solution, x_err, t)
-    nodal_error = Tuple(u_exact[:,e,:] - Matrix(V_err * sol[:,e,:]) 
-        for e in 1:N_c)
-
-    squared_error = [sum(dot(nodal_error[e][:,k], WJ_err[k]*nodal_error[e][:,
-        k]) for k in 1:N_e) for e in 1:N_c]
+    u_approx = Matrix{Float64}(undef, size(V_err,1), N_c)
+    error = zeros(N_c)
+    @inbounds @views for k in 1:N_e
+        u_exact = evaluate(exact_solution, 
+            Tuple(x_err[m][:,k] for m in 1:d), t)
+        mul!(u_approx, V_err, sol[:,:,k])
+        for e in 1:N_c
+            error_nodal = u_exact[:,e,k] .- u_approx[:,e]
+            error[e] += dot(error_nodal, WJ_err[k]*error_nodal)
+        end
+    end
 
     if normalize
-        error = sqrt.(squared_error ./ total_volume)
+        error = sqrt.(error ./ total_volume)
     else
-        error = sqrt.(squared_error)
+        error = sqrt.(error)
     end
 
     if write_to_file

diff --git a/src/ConservationLaws/euler_navierstokes.jl b/src/ConservationLaws/euler_navierstokes.jl
@@ -93,7 +93,7 @@ end
     u::AbstractVector{Float64}) where {d}
     (; γ, γ_minus_1, inv_γ_minus_1) = conservation_law
     p = γ_minus_1 * (u[end] - (0.5/u[1]) * (sum(u[m+1]^2 for m in 1:d)))
-    return -u[1]*log(p/u[1]^γ)*inv_γ_minus_1
+    return -u[1]*log(p/(u[1]^γ))*inv_γ_minus_1
 end
 
 @inline function conservative_to_entropy!(