|
367 | 367 | Sv_a, Pf_a, P_hydro_a, Sh_a = AnalyticalSolution(ρ, phase_vec, z)
|
368 | 368 |
|
369 | 369 | # 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 |
373 | 373 |
|
374 | 374 | # Create plot with stress & analytical solution
|
375 | 375 | Plot_vs_analyticalSolution(data, dir,"Compressible1D_output_1Core.png")
|
|
390 | 390 | Sv_a, Pf_a, P_hydro_a, Sh_a = AnalyticalSolution(ρ, phase_vec, z)
|
391 | 391 |
|
392 | 392 | # 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 |
396 | 396 |
|
397 | 397 | # Create plot with stress & analytical solution
|
398 | 398 | Plot_vs_analyticalSolution(data, dir,"Compressible1D_output_2Cores.png")
|
|
461 | 461 | # ---
|
462 | 462 | end
|
463 | 463 |
|
464 |
| -# t13_Rheology0D/ |
| 464 | + |
465 | 465 | @testset "t13_Rheology0D" begin
|
466 | 466 | cd(test_dir)
|
467 | 467 | dir = "t13_Rheology0D";
|
|
576 | 576 |
|
577 | 577 | end
|
578 | 578 |
|
579 |
| -# t14_1DStrengthEnvelope/ |
| 579 | + |
580 | 580 | @testset "t14_1DStrengthEnvelope" begin
|
581 | 581 | cd(test_dir)
|
582 | 582 | dir = "t14_1DStrengthEnvelope";
|
|
642 | 642 | q_num = Compute_RT_growthrate_LaMEM(λ, ParamFile, dir)
|
643 | 643 | q_anal = AnalyticalSolution_RTI_FreeSlip(λ)
|
644 | 644 |
|
645 |
| - @test norm(q_num - q_anal) ≈ 0.0015857520938151908 |
| 645 | + @test norm(q_num - q_anal) ≈ 0.001481104083594891 |
646 | 646 |
|
647 | 647 | # Plot
|
648 | 648 | λ_pl = range(1e-9,5,100)
|
@@ -863,31 +863,31 @@ end
|
863 | 863 |
|
864 | 864 | # test_M1_2D
|
865 | 865 | @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", |
867 | 867 | keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
|
868 | 868 |
|
869 | 869 | # test_M075_2D_2cores
|
870 | 870 | @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", |
872 | 872 | keywords=keywords, accuracy=acc, cores=2, opt=true, mpiexec=mpiexec)
|
873 | 873 |
|
874 | 874 | # test_variableM
|
875 | 875 | @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", |
877 | 877 | keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
|
878 | 878 |
|
879 | 879 | # heat_kfac
|
880 | 880 | keywords = ("|eRes|_2",)
|
881 | 881 | acc = ((rtol=1e-4,atol=1e-9),);
|
882 | 882 | @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", |
884 | 884 | keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
|
885 | 885 |
|
886 | 886 | # heat_rhoA
|
887 | 887 | keywords = ("|eRes|_2",)
|
888 | 888 | acc = ((rtol=1e-4,atol=1e-8),);
|
889 | 889 | @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", |
891 | 891 | keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
|
892 | 892 |
|
893 | 893 | # dyndike_4core.dat
|
|
0 commit comments