update paths for example artifacts

CliMA · Dec 1, 2021 · a198aef · a198aef
1 parent d6be4d7
commit a198aef
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 17 deletions.
diff --git a/examples/bickleyjet/bickleyjet_cg.jl b/examples/bickleyjet/bickleyjet_cg.jl
@@ -145,4 +145,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/energy.png", "Total Energy")
+linkfig(
+ relpath(joinpath(path, "energy.png"), joinpath(@__DIR__, "../..")),
+ "Total Energy",
+)
diff --git a/examples/bickleyjet/bickleyjet_cg_invariant_hypervisc.jl b/examples/bickleyjet/bickleyjet_cg_invariant_hypervisc.jl
@@ -146,4 +146,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/energy.png", "Total Energy")
+linkfig(
+ relpath(joinpath(path, "energy.png"), joinpath(@__DIR__, "../..")),
+ "Total Energy",
+)
diff --git a/examples/bickleyjet/bickleyjet_cg_unsmesh.jl b/examples/bickleyjet/bickleyjet_cg_unsmesh.jl
@@ -131,10 +131,10 @@ mkpath(path)
 anim = Plots.@animate for u in sol.u
  Plots.plot(u.ρθ, clim = (-1, 1))
 end
-Plots.mp4(anim, joinpath(path, "tracer_uns2dmesh.mp4"), fps = 10)
+Plots.mp4(anim, joinpath(path, "tracer.mp4"), fps = 10)
 
 Es = [total_energy(u, parameters) for u in sol.u]
-Plots.png(Plots.plot(Es), joinpath(path, "energy_uns2dmesh.png"))
+Plots.png(Plots.plot(Es), joinpath(path, "energy.png"))
 
 
 function linkfig(figpath, alt = "")
@@ -146,4 +146,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/energy_uns2dmesh.png", "Total Energy")
+linkfig(
+ relpath(joinpath(path, "energy.png"), joinpath(@__DIR__, "../..")),
+ "Total Energy",
+)
diff --git a/examples/bickleyjet/bickleyjet_dg.jl b/examples/bickleyjet/bickleyjet_dg.jl
@@ -250,4 +250,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/energy.png", "Total Energy")
+linkfig(
+ relpath(joinpath(path, "energy.png"), joinpath(@__DIR__, "../..")),
+ "Total Energy",
+)
diff --git a/examples/column/advect.jl b/examples/column/advect.jl
@@ -209,4 +209,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/advect_end.png", "Advect End Simulation")
+linkfig(
+ relpath(joinpath(path, "advect_end.png"), joinpath(@__DIR__, "../..")),
+ "Advect End Simulation",
+)
diff --git a/examples/column/advect_diffusion.jl b/examples/column/advect_diffusion.jl
@@ -154,6 +154,9 @@ function linkfig(figpath, alt = "")
 end
 
 linkfig(
- "output/$(dirname)/advect_diffusion_end.png",
+ relpath(
+ joinpath(path, "advect_diffusion_end.png"),
+ joinpath(@__DIR__, "../.."),
+ ),
  "Advection-Diffusion End Simulation",
 )
diff --git a/examples/column/ekman.jl b/examples/column/ekman.jl
@@ -191,4 +191,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/ekman_end.png", "ekman End")
+linkfig(
+ relpath(joinpath(path, "ekman_end.png"), joinpath(@__DIR__, "../..")),
+ "Ekman End",
+)
diff --git a/examples/column/heat.jl b/examples/column/heat.jl
@@ -86,4 +86,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/heat_end.png", "Heat End Simulation")
+linkfig(
+ relpath(joinpath(path, "heat_end.png"), joinpath(@__DIR__, "../..")),
+ "Heat End Simulation",
+)
diff --git a/examples/column/hydrostatic.jl b/examples/column/hydrostatic.jl
@@ -209,4 +209,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/hydrostatic_end.png", "Hydrostatic End")
+linkfig(
+ "examples/column/output/$(dirname)/hydrostatic_end.png",
+ "Hydrostatic End",
+)
diff --git a/examples/column/hydrostatic_ekman.jl b/examples/column/hydrostatic_ekman.jl
@@ -257,4 +257,10 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/hydrostatic_ekman_end.png", "ekman end")
+linkfig(
+ relpath(
+ joinpath(path, "hydrostatic_ekman_end.png"),
+ joinpath(@__DIR__, "../.."),
+ ),
+ "ekman end",
+)
diff --git a/examples/column/hydrostatic_implicit.jl b/examples/column/hydrostatic_implicit.jl
@@ -324,4 +324,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/hydrostatic_end.png", "Hydrostatic End")
+linkfig(
+ relpath(joinpath(path, "hydrostatic_end.png"), joinpath(@__DIR__, "../..")),
+ "Hydrostatic End",
+)
diff --git a/examples/column/step.jl b/examples/column/step.jl
@@ -213,6 +213,14 @@ function linkfig(figpath, alt = "")
 end
 
 linkfig(
- "output/$(dirname)/advect_step_function_end.png",
+ "examples/column/output/$(dirname)/advect_step_function_end.png",
+ "Advect End Simulation",
+)
+
+linkfig(
+ relpath(
+ joinpath(path, "advect_step_function_end.png"),
+ joinpath(@__DIR__, "../.."),
+ ),
  "Advect End Simulation",
 )
diff --git a/examples/column/wave.jl b/examples/column/wave.jl
@@ -96,4 +96,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/wave_end.png", "Wave End")
+linkfig(
+ relpath(joinpath(path, "wave_end.png"), joinpath(@__DIR__, "../..")),
+ "Wave End",
+)
diff --git a/examples/hybrid/bubble.jl b/examples/hybrid/bubble.jl
@@ -204,7 +204,7 @@ function rhs!(dY, Y, _, t)
  Yfρ = @. If(Yc.ρ)
 
  ### HYPERVISCOSITY
- # 1) compute hyperviscosity coefficients 
+ # 1) compute hyperviscosity coefficients
  @. dYc.ρθ = hdiv(hgrad(θ))
  @. dYc.ρuₕ = hdiv(hgrad(uₕ))
  @. dρw = hdiv(hgrad(w))
@@ -245,7 +245,7 @@ function rhs!(dY, Y, _, t)
  uₕf = @. If(Yc.ρuₕ / Yc.ρ) # requires boundary conditions
  @. dρw -= hdiv(uₕf ⊗ ρw)
 
- ### UPWIND FLUX CORRECTION 
+ ### UPWIND FLUX CORRECTION
  upwind_correction = true
  if upwind_correction
  @. dYc.ρ += fcc(w, Yc.ρ)