From b2e1b90c9c64cdb26226c318a51909202ff7f424 Mon Sep 17 00:00:00 2001 From: Marco Artiano <57838732+MarcoArtiano@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:40:37 +0200 Subject: [PATCH 1/8] Update examples/elixir_moist_euler_dry_bubble.jl Co-authored-by: Hendrik Ranocha --- examples/elixir_moist_euler_dry_bubble.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/elixir_moist_euler_dry_bubble.jl b/examples/elixir_moist_euler_dry_bubble.jl index 1256a9c..8571896 100644 --- a/examples/elixir_moist_euler_dry_bubble.jl +++ b/examples/elixir_moist_euler_dry_bubble.jl @@ -1,7 +1,7 @@ using OrdinaryDiffEq using Trixi using TrixiAtmo -using TrixiAtmo: FluxLMARS, source_terms_geopotential, cons2drypot +using TrixiAtmo: source_terms_geopotential, cons2drypot ############################################################################### # semidiscretization of the compressible moist Euler equations From 9021e28eea68da6fd7a17b148f9fa36ac107cfdd Mon Sep 17 00:00:00 2001 From: Marco Artiano <57838732+MarcoArtiano@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:40:42 +0200 Subject: [PATCH 2/8] Update examples/elixir_moist_euler_moist_bubble.jl Co-authored-by: Hendrik Ranocha --- examples/elixir_moist_euler_moist_bubble.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/elixir_moist_euler_moist_bubble.jl b/examples/elixir_moist_euler_moist_bubble.jl index 956c4a2..4d18f4c 100644 --- a/examples/elixir_moist_euler_moist_bubble.jl +++ b/examples/elixir_moist_euler_moist_bubble.jl @@ -1,7 +1,6 @@ using OrdinaryDiffEq using Trixi, TrixiAtmo using TrixiAtmo: cons2aeqpot, saturation_pressure, source_terms_moist_bubble, - FluxLMARS using NLsolve: nlsolve ############################################################################### From c53a3cdacf6eea61c3bd9d48f5668ceab13ea193 Mon Sep 17 00:00:00 2001 From: Marco Artiano <57838732+MarcoArtiano@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:40:47 +0200 Subject: [PATCH 3/8] Update examples/elixir_moist_euler_nonhydrostatic_gravity_waves.jl Co-authored-by: Hendrik Ranocha --- examples/elixir_moist_euler_nonhydrostatic_gravity_waves.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/elixir_moist_euler_nonhydrostatic_gravity_waves.jl b/examples/elixir_moist_euler_nonhydrostatic_gravity_waves.jl index dd8de4f..4646a8b 100644 --- a/examples/elixir_moist_euler_nonhydrostatic_gravity_waves.jl +++ b/examples/elixir_moist_euler_nonhydrostatic_gravity_waves.jl @@ -3,7 +3,7 @@ using Trixi, TrixiAtmo using TrixiAtmo: CompressibleMoistEulerEquations2D, source_terms_geopotential, source_terms_phase_change, source_terms_nonhydrostatic_rayleigh_sponge, - cons2drypot, FluxLMARS + cons2drypot ############################################################################### # semidiscretization of the compressible moist Euler equation From 3cf8db19daffdeb54b09a4efe9dedaed7482c6bb Mon Sep 17 00:00:00 2001 From: Marco Artiano <57838732+MarcoArtiano@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:40:52 +0200 Subject: [PATCH 4/8] Update src/TrixiAtmo.jl Co-authored-by: Hendrik Ranocha --- src/TrixiAtmo.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TrixiAtmo.jl b/src/TrixiAtmo.jl index e4f64c3..f466f99 100644 --- a/src/TrixiAtmo.jl +++ b/src/TrixiAtmo.jl @@ -26,7 +26,7 @@ include("semidiscretization/semidiscretization_hyperbolic_2d_manifold_in_3d.jl") export CompressibleMoistEulerEquations2D export CompressibleEulerPotentialTemperatureEquations2D -export flux_chandrashekar, FluxLMARS, flux_theta +export flux_chandrashekar, flux_theta export examples_dir From d2a23b116201cdb800d9c364ae7a1f088ca88867 Mon Sep 17 00:00:00 2001 From: Marco Artiano <57838732+MarcoArtiano@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:41:01 +0200 Subject: [PATCH 5/8] Update examples/elixir_moist_euler_moist_bubble.jl Co-authored-by: Hendrik Ranocha --- examples/elixir_moist_euler_moist_bubble.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/elixir_moist_euler_moist_bubble.jl b/examples/elixir_moist_euler_moist_bubble.jl index 4d18f4c..d406bab 100644 --- a/examples/elixir_moist_euler_moist_bubble.jl +++ b/examples/elixir_moist_euler_moist_bubble.jl @@ -1,6 +1,6 @@ using OrdinaryDiffEq using Trixi, TrixiAtmo -using TrixiAtmo: cons2aeqpot, saturation_pressure, source_terms_moist_bubble, +using TrixiAtmo: cons2aeqpot, saturation_pressure, source_terms_moist_bubble using NLsolve: nlsolve ############################################################################### From dbbd06a4c9542abbc9f16d65feaff5a82178f8c6 Mon Sep 17 00:00:00 2001 From: Marco Artiano <57838732+MarcoArtiano@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:42:37 +0200 Subject: [PATCH 6/8] Update elixir_euler_potential_temperature_dry_bubble.jl --- examples/elixir_euler_potential_temperature_dry_bubble.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/elixir_euler_potential_temperature_dry_bubble.jl b/examples/elixir_euler_potential_temperature_dry_bubble.jl index 0ec083a..84c2f2b 100644 --- a/examples/elixir_euler_potential_temperature_dry_bubble.jl +++ b/examples/elixir_euler_potential_temperature_dry_bubble.jl @@ -1,7 +1,7 @@ using OrdinaryDiffEq using Trixi using TrixiAtmo -using TrixiAtmo: FluxLMARS, source_terms_gravity, flux_theta +using TrixiAtmo: source_terms_gravity, flux_theta function initial_condition_warm_bubble(x, t, equations::CompressibleEulerPotentialTemperatureEquations2D) From 41ec9bf0597b786974b47e238290e88fcbe6b655 Mon Sep 17 00:00:00 2001 From: Marco Artiano <57838732+MarcoArtiano@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:56:47 +0200 Subject: [PATCH 7/8] Update test_trixi_consistency.jl --- test/test_trixi_consistency.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_trixi_consistency.jl b/test/test_trixi_consistency.jl index 3596d9c..30981d2 100644 --- a/test/test_trixi_consistency.jl +++ b/test/test_trixi_consistency.jl @@ -1,5 +1,7 @@ module TestTrixiConsistency +using Trixi + include("test_trixiatmo.jl") EXAMPLES_DIR = TrixiAtmo.examples_dir() From de71e98c9271fcb13eac7916cc82a6db4aafba2f Mon Sep 17 00:00:00 2001 From: Marco Artiano <57838732+MarcoArtiano@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:52:10 +0200 Subject: [PATCH 8/8] Update test_trixi_consistency.jl --- test/test_trixi_consistency.jl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/test_trixi_consistency.jl b/test/test_trixi_consistency.jl index 30981d2..477a3b8 100644 --- a/test/test_trixi_consistency.jl +++ b/test/test_trixi_consistency.jl @@ -1,7 +1,5 @@ module TestTrixiConsistency -using Trixi - include("test_trixiatmo.jl") EXAMPLES_DIR = TrixiAtmo.examples_dir() @@ -51,7 +49,7 @@ isdir(outdir) && rm(outdir, recursive = true) trixi_include(trixi_elixir, equations = equations_moist, volume_flux = flux_chandrashekar, - surface_flux = FluxLMARS(360.0), + surface_flux = Trixi.FluxLMARS(360.0), maxiters = maxiters) errors_atmo = Main.analysis_callback(Main.sol)