Skip to content

Commit 3220086

Browse files
committed
tests update
1 parent 7626aae commit 3220086

File tree

47 files changed

+16659
-17633
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+16659
-17633
lines changed

test/AdjointGradients.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ acc = ( (rtol=1e-7, atol=1e-6),
137137

138138
ParamFile = "t8_Subduction2D_FreeSlip_DirectSolver.dat";
139139
@test perform_lamem_test(dir,ParamFile,"t8_Subduction2D_FreeSlip_DirectSolver_p1.expected",
140-
args="-nel_y 1",
140+
args="-nel_y 2",
141141
keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
142142

143143

test/runtests.jl

+14-14
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,9 @@ end
367367
Sv_a, Pf_a, P_hydro_a, Sh_a = AnalyticalSolution(ρ, phase_vec, z)
368368

369369
# Compute difference with analytical solution
370-
@test norm(Szz_vec - Sv_a) 1.075864674505617 rtol=1e-3
371-
@test norm(Sxx_vec - Sh_a) 19.59995396792367 rtol=1e-4
372-
@test norm(Pf_vec - Pf_a) 4.67442385860321 rtol=1e-5
370+
@test norm(Szz_vec - Sv_a) 1.0769790188863786 rtol=1e-3
371+
@test norm(Sxx_vec - Sh_a) 19.596753495502448 rtol=1e-4
372+
@test norm(Pf_vec - Pf_a) 4.67681896070838 rtol=1e-5
373373

374374
# Create plot with stress & analytical solution
375375
Plot_vs_analyticalSolution(data, dir,"Compressible1D_output_1Core.png")
@@ -390,9 +390,9 @@ end
390390
Sv_a, Pf_a, P_hydro_a, Sh_a = AnalyticalSolution(ρ, phase_vec, z)
391391

392392
# Compute difference with analytical solution
393-
@test norm(Szz_vec - Sv_a) 1.075864674505617 rtol=1e-3
394-
@test norm(Sxx_vec - Sh_a) 19.59995396792367 rtol=1e-4
395-
@test norm(Pf_vec - Pf_a) 4.67442385860321 rtol=1e-5
393+
@test norm(Szz_vec - Sv_a) 1.0769790188863786 rtol=1e-3
394+
@test norm(Sxx_vec - Sh_a) 19.596753495502448 rtol=1e-4
395+
@test norm(Pf_vec - Pf_a) 4.67681896070838 rtol=1e-5
396396

397397
# Create plot with stress & analytical solution
398398
Plot_vs_analyticalSolution(data, dir,"Compressible1D_output_2Cores.png")
@@ -461,7 +461,7 @@ end
461461
# ---
462462
end
463463

464-
# t13_Rheology0D/
464+
465465
@testset "t13_Rheology0D" begin
466466
cd(test_dir)
467467
dir = "t13_Rheology0D";
@@ -576,7 +576,7 @@ end
576576

577577
end
578578

579-
# t14_1DStrengthEnvelope/
579+
580580
@testset "t14_1DStrengthEnvelope" begin
581581
cd(test_dir)
582582
dir = "t14_1DStrengthEnvelope";
@@ -642,7 +642,7 @@ end
642642
q_num = Compute_RT_growthrate_LaMEM(λ, ParamFile, dir)
643643
q_anal = AnalyticalSolution_RTI_FreeSlip(λ)
644644

645-
@test norm(q_num - q_anal) 0.0015857520938151908
645+
@test norm(q_num - q_anal) 0.001481104083594891
646646

647647
# Plot
648648
λ_pl = range(1e-9,5,100)
@@ -863,31 +863,31 @@ end
863863

864864
# test_M1_2D
865865
@test perform_lamem_test(dir,"dike_M1_2D.dat","dike_M1_2D.expected",
866-
args="-nstep_max 5 -nel_y 1",
866+
args="-nstep_max 5 -nel_y 2",
867867
keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
868868

869869
# test_M075_2D_2cores
870870
@test perform_lamem_test(dir,"dike_M075_2D_2cores.dat","dike_M075_2D_2cores.expected",
871-
args="-nstep_max 2 -nel_y 1",
871+
args="-nstep_max 2 -nel_y 2",
872872
keywords=keywords, accuracy=acc, cores=2, opt=true, mpiexec=mpiexec)
873873

874874
# test_variableM
875875
@test perform_lamem_test(dir,"dike_variableM.dat","dike_variableM.expected",
876-
args="-nstep_max 2 -nel_y 1",
876+
args="-nstep_max 2 -nel_y 2",
877877
keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
878878

879879
# heat_kfac
880880
keywords = ("|eRes|_2",)
881881
acc = ((rtol=1e-4,atol=1e-9),);
882882
@test perform_lamem_test(dir,"dike_heating_kfac.dat","dike_heating_kfac.expected",
883-
args="-nstep_max 2 -nel_y 1",
883+
args="-nstep_max 2 -nel_y 2",
884884
keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
885885

886886
# heat_rhoA
887887
keywords = ("|eRes|_2",)
888888
acc = ((rtol=1e-4,atol=1e-8),);
889889
@test perform_lamem_test(dir,"dike_heating_rhoA.dat","dike_heating_rhoA.expected",
890-
args="-nstep_max 2 -nel_y 1",
890+
args="-nstep_max 2 -nel_y 2",
891891
keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
892892

893893
# dyndike_4core.dat

test/t12_Temperature_diffusion/t12_Temperature_diffusion.dat

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# Number of cells for all segments
3333

3434
nel_x = 4
35-
nel_y = 1
35+
nel_y = 2
3636
nel_z = 128
3737

3838
# Coordinates of all segments (including start and end points)

test/t12_Temperature_diffusion/t12_Temperature_diffusion_1Dhalfspace.dat

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# Number of cells for all segments
3333

3434
nel_x = 4
35-
nel_y = 1
35+
nel_y = 2
3636
nel_z = 128
3737

3838
# Coordinates of all segments (including start and end points)

test/t15_RTI/t15_RTI.dat

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
# Number of cells for all segments
3737

3838
nel_x = 64
39-
nel_y = 1
39+
nel_y = 2
4040
nel_z = 64
4141

4242
# Coordinates of all segments (including start and end points)

0 commit comments

Comments
 (0)