fix errors introduced during merge

Author: benegee

test/Project.toml

@@ -1,4 +1,5 @@
 [deps]
+NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"

test/runtests.jl

@@ -13,7 +13,7 @@ const TRIXIATMO_NTHREADS = clamp(Sys.CPU_THREADS, 2, 3)
         include("test_trixi_consistency.jl")
     end
 
-    @time if TRIXI_TEST == "all" || TRIXI_TEST == "moist_euler"
+    @time if TRIXIATMO_TEST == "all" || TRIXIATMO_TEST == "moist_euler"
         include("test_2d_moist_euler.jl")
     end
 end

test/test_2d_moist_euler.jl

@@ -7,7 +7,7 @@ include("test_trixiatmo.jl") # TODO - This is a repetition from Trixi.jl
 
 EXAMPLES_DIR = pkgdir(TrixiAtmo, "examples") # TODO - Do we need a subdirectory for examples?
 
-@trixi_testset "elixir_moist_euler_dry_bubble.jl" begin
+@trixiatmo_testset "elixir_moist_euler_dry_bubble.jl" begin
     @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_moist_euler_dry_bubble.jl"),
                         l2=[
                             1.300428671901329e-6,
@@ -39,7 +39,7 @@ EXAMPLES_DIR = pkgdir(TrixiAtmo, "examples") # TODO - Do we need a subdirectory
     end
 end
 
-@trixi_testset "elixir_moist_euler_EC_bubble" begin
+@trixiatmo_testset "elixir_moist_euler_EC_bubble" begin
     @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_moist_euler_EC_bubble.jl"),
                         l2=[
                             0.01345154393018332,