Merge branch 'bk-lamem_2.1.4'

Project.toml

@@ -42,6 +42,7 @@ julia = "1.10"
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 
 [targets]
-test = ["Test", "Plots"]
+test = ["Test", "CairoMakie","Plots"]

example_scripts/StrengthEnvelop.jl

@@ -1,4 +1,4 @@
-using LaMEM
+using LaMEM, CairoMakie
 
 model  = Model(Grid(nel=(4,32), x=[-1,1], z=[-30,1]), 
                Time(nstep_max=25, dt_min=1e-4, dt=1e-3, dt_max=10, time_end=100), 
@@ -24,11 +24,8 @@ run_lamem(model,1)
 
 data,_ = read_LaMEM_timestep(model, last=true)
 
-if 1==0
-    #Create plot
-    fig1 = Figure(size=(800,800))
-    ax = Axis(fig1[1,1], xlabel = "τII [MPa]", ylabel = "Depth [km]",title="Geotherm=$(Tgradient)°C/km")
-
-    lines!(ax, data.fields.j2_dev_stress[1,1,:], data.z.val[1,1,:], label="t=$time")
-    display(fig1)
-end
+#Create plot
+fig1 = Figure(size=(800,800))
+ax = Axis(fig1[1,1], xlabel = "τII [MPa]", ylabel = "Depth [km]",title="Geotherm=$(Tgradient)°C/km")
+lines!(ax, data.fields.j2_dev_stress[1,1,:], data.z.val[1,1,:], label="t=$time")
+display(fig1)

test/runtests.jl

@@ -1,15 +1,19 @@
 using Test
 using LaMEM
 
-include("test_julia_setups.jl")
-include("runLaMEM.jl")
-include("read_timestep.jl")
-include("run_lamem_save_grid_test.jl")
-include("mesh_refinement_test.jl")
-include("read_logfile.jl")
-include("test_compression.jl")
-include("test_GeoParams_integration.jl")
-include("test_examples.jl")
+@testset verbose = true "LaMEM.jl" begin
+
+    include("test_julia_setups.jl")
+    include("runLaMEM.jl")
+    include("read_timestep.jl")
+    include("run_lamem_save_grid_test.jl")
+    include("mesh_refinement_test.jl")
+    include("read_logfile.jl")
+    include("test_compression.jl")
+    include("test_GeoParams_integration.jl")
+    include("test_examples.jl")
+
+end
 
 if !Sys.iswindows()
     # clean up