update after save

Author: tduretz

2D/Stokes2D_DYREL_Decoupled_TwoPhases_v5.jl

@@ -295,6 +295,7 @@ end
         end
         Pt .+= γ_eff.*RPt
     end
+
     # Plotting
     p1 = pt.heatmap(xc, yc, Pf[2:end-1,2:end-1]' , aspect_ratio=1, c=:inferno, title="Pf", xlims=(-Lx/2,Lx/2), xlabel="x",ylabel="y")
     p2 = pt.heatmap(xc, yc, Pt' , aspect_ratio=1, c=:inferno, title="Pt", xlims=(-Lx/2,Lx/2), xlabel="x",ylabel="y")
@@ -305,14 +306,13 @@ end
     p3 = pt.plot!(err_evo_it/ncx, log10.(ϵ.*ones(size(err_evo_it))), label="tol")  
     p4 = pt.heatmap(xc, yc, log10.(ηc)' , aspect_ratio=1, c=:inferno, title="ηc", xlims=(-Lx/2,Lx/2), xlabel="x",ylabel="y")
     display(pt.plot(p1, p2, p3, p4))
+
     @show iter/ncx
     n   = length(ηc)
     @show η_h = 1.0 / sum(1.0/n ./ηc)
     @show η_g = exp( sum( 1.0/n*log.(ηc)))
     @show η_a = mean(ηc)
 
-    save("./results/twophases_n$(ncx).jld2", "err_evo_it", err_evo_it, "ncx", ncx, "err_evo_V", err_evo_V, "err_evo_Pt", err_evo_Pt, "err_evo_Pf", err_evo_Pf, "xc", xc, "yc", yc, "∇V", ∇V, "Pt", Pt, "Pf", Pf, "Vx", Vx, "Vy", Vy )
-
     return
 end
 

2D/Stokes2D_DYREL_Decoupled_comp_VEP_v5.jl

@@ -379,7 +379,7 @@ end
         p1 = pt.heatmap(xc, yc, log10.(EIIc'./sc.t) , aspect_ratio=1, c=:inferno, title="EII", xlims=(-Lx/2,Lx/2), xlabel="x",ylabel="y")
         p2 = pt.heatmap(xc, yc, Pt'.*sc.σ , aspect_ratio=1, c=:inferno, title="Pt", xlims=(-Lx/2,Lx/2), xlabel="x",ylabel="y")
         p3 = pt.plot(1:it, Tii_evo[1:it]*sc.σ, xlabel="time",ylabel="mean dev. stress", label=:none)
-        p4 = heatmap(xc, yc, log10.(ηc)' , aspect_ratio=1, c=:inferno, title="ηc", xlims=(-Lx/2,Lx/2))
+        p4 = pt.heatmap(xc, yc, log10.(ηc)' , aspect_ratio=1, c=:inferno, title="ηc", xlims=(-Lx/2,Lx/2))
         display(pt.plot(p1, p2, p3, p4))
         @show iter/ncx
         @show itg

2D/Stokes2D_DYREL_Decoupled_comp_v4.jl

@@ -1,5 +1,6 @@
 # Initialisation
-using Plots, Printf, Statistics, LinearAlgebra, JLD2
+using Printf, Statistics, LinearAlgebra, JLD2
+import Plots as pt
 # Macros
 @views    av(A) = 0.25*(A[1:end-1,1:end-1].+A[2:end,1:end-1].+A[1:end-1,2:end].+A[2:end,2:end])
 @views av_xa(A) =  0.5*(A[1:end-1,:].+A[2:end,:])
@@ -255,26 +256,22 @@ end
         end
         Pt .+= γ_eff.*Rp
     end
+
     # Plotting
-    p1 = heatmap(xc, yc, ∇V' , aspect_ratio=1, c=:inferno, title="∇V", xlims=(-Lx/2,Lx/2), xlabel="x", ylabel="y")
-    p2 = heatmap(xc, yc, Pt' , aspect_ratio=1, c=:inferno, title="Pt", xlims=(-Lx/2,Lx/2), xlabel="x", ylabel="y")
-    p3 = plot(title="Convergence", xlabel="DR iterations / nx",ylabel="errors") 
-    p3 = plot!(err_evo_it/ncx, log10.(err_evo_V), label="V")
-    p3 = plot!(err_evo_it/ncx, log10.(err_evo_P), label="P")
-    # p3 = plot!(err_evo_it/ncx, log10.(ϵ.*ones(size(err_evo_it))), label="tol")  
-    p4 = heatmap(xc, yc, log10.(ηc)' , aspect_ratio=1, c=:inferno, title="ηc", xlims=(-Lx/2,Lx/2), xlabel="x", ylabel="y")
-    display(plot(p1, p2, p3, p4))
+    p1 = pt.heatmap(xc, yc, ∇V' , aspect_ratio=1, c=:inferno, title="∇V", xlims=(-Lx/2,Lx/2), xlabel="x", ylabel="y")
+    p2 = pt.heatmap(xc, yc, Pt' , aspect_ratio=1, c=:inferno, title="Pt", xlims=(-Lx/2,Lx/2), xlabel="x", ylabel="y")
+    p3 = pt.plot(title="Convergence", xlabel="DR iterations / nx",ylabel="errors") 
+    p3 = pt.plot!(err_evo_it/ncx, log10.(err_evo_V), label="V")
+    p3 = pt.plot!(err_evo_it/ncx, log10.(err_evo_P), label="P")
+    p4 = pt.heatmap(xc, yc, log10.(ηc)' , aspect_ratio=1, c=:inferno, title="ηc", xlims=(-Lx/2,Lx/2), xlabel="x", ylabel="y")
+    display(pt.plot(p1, p2, p3, p4))
+
     @show iter/ncx
     n   = length(ηc)
     @show η_h = 1.0 / sum(1.0/n ./ηc)
     @show η_g = exp( sum( 1.0/n*log.(ηc)))
     @show η_a = mean(ηc)
 
-    # save("./results/compressible_K2e0_PH.jld2", "err_evo_it", err_evo_it, "ncx", ncx, "err_evo_V", err_evo_V, "err_evo_P", err_evo_P, "xc", xc, "yc", yc, "∇V", ∇V )
-    # save("./results/compressible_K2e3_PH.jld2", "err_evo_it", err_evo_it, "ncx", ncx, "err_evo_V", err_evo_V, "err_evo_P", err_evo_P, "xc", xc, "yc", yc, "∇V", ∇V )
-    # save("./results/compressible_K2e0_1step.jld2", "err_evo_it", err_evo_it, "ncx", ncx, "err_evo_V", err_evo_V, "err_evo_P", err_evo_P, "xc", xc, "yc", yc, "∇V", ∇V )
-    # save("./results/compressible_K2e3_1step.jld2", "err_evo_it", err_evo_it, "ncx", ncx, "err_evo_V", err_evo_V, "err_evo_P", err_evo_P, "xc", xc, "yc", yc, "∇V", ∇V )
-
     return
 end
 

3D/FD/Stokes3D_FD_MultiInclusion_CPU_v2.jl

@@ -688,7 +688,6 @@ function main_call()
     for i in eachindex(N)
         itPH[i], itDYREL[i], it_nx[i], wtime[i] = Stokes3D_PHDR(; n=N[i], ALE=false, restart=false, restart_step=500, end_step=1)
     end
-    jldsave("Scaling_Balls_1m6_FDM.jld2"; itPH, itDYREL, it_nx, wtime)
     @show itPH
     @show wtime
 end