only activate failing tests

UniMainzGeo · Aug 29, 2024 · 45e25f4 · 45e25f4
1 parent 1b8cb63
commit 45e25f4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -31,7 +31,7 @@ include("test_utils.jl")
 # ===================
 @testset "LaMEM Testsuite" verbose=true begin
 
-
+#=
 @testset "t1_FB1_Direct" verbose=true begin
     cd(test_dir)
     dir = "t1_FB1_Direct";
@@ -69,6 +69,7 @@ end
     end
 end
 
+=#
 
 @testset "t3_Subduction" begin
     cd(test_dir)
@@ -126,6 +127,7 @@ end
 end
 
 
+#=
 @testset "t4_Localisation" begin
     cd(test_dir)
     dir = "t4_Loc";
@@ -341,7 +343,7 @@ end
                             args="-mfmax 0.15",
                             keywords=keywords, accuracy=acc, cores=2, opt=true, mpiexec=mpiexec)
 end
-
+=#
 
 # this ia a more complicated one, that requires a devoted script (with plotting)
 @testset "t10_Compressibility" begin
@@ -383,7 +385,7 @@ end
         # test_b ------- 
         #
         @test perform_lamem_test(dir,ParamFile,"Compressibility_Direct_deb-p2.expected",
-                                keywords=keywords, accuracy=acc, cores=2, deb=true, clean_dir=false, debug=true)
+                                keywords=keywords, accuracy=acc, cores=2, deb=true, clean_dir=false, debug=false)
 
 
         # extract 1D profiles
@@ -403,7 +405,7 @@ end
         # --------------
     end
 end
-
+#=
 @testset "t11_Subgrid" begin
     if test_superlu
     cd(test_dir)
@@ -835,6 +837,7 @@ end
     @test perform_lamem_test(dir,"Permeable.dat","Permeable_p1.expected",
                             keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
 end
+=#
 
 @testset "t24_Erosion_Sedimentation" begin
     cd(test_dir)
@@ -859,6 +862,7 @@ end
                             keywords=keywords, accuracy=acc, cores=2, deb=true, mpiexec=mpiexec)
 end
 
+#=
 @testset "t25_APS_Healing" begin
     cd(test_dir)
     dir = "t25_APS_Healing";
@@ -1009,7 +1013,7 @@ end
     @test perform_lamem_test(dir,"BC_velocity_2D_LR.dat","BC_velocity_2D_LR_opt-p1.expected",
                             keywords=keywords, accuracy=acc, cores=1, opt=true, mpiexec=mpiexec)
 end
-
+=#
 
 end
 
diff --git a/test/t3_SubductionGMGinput/CreateMarkers_Subduction.jl b/test/t3_SubductionGMGinput/CreateMarkers_Subduction.jl
@@ -65,7 +65,10 @@ function CreateMarkers_Subduction(dir="./", ParamFile="test.dat"; NumberCores=1,
         save_LaMEM_markers_parallel(Model3D, directory="./markers", verbose=false)                      # Create LaMEM marker input on 1 core
     else
         #> 1 cores; create partitioning file first
-        PartFile = CreatePartitioningFile_local(ParamFile, NumberCores; LaMEM_dir="../../bin/", mpiexec=mpiexec)
+        #PartFile = CreatePartitioningFile_local(ParamFile, NumberCores; LaMEM_dir="../../bin/", mpiexec=mpiexec)
+        #PartFile = create_partitioning_file(ParamFile, NumberCores; LaMEM_dir="../../bin/", mpiexec=mpiexec)
+        PartFile = run_lamem_save_grid(ParamFile, NumberCores, verbose=true)
+
         save_LaMEM_markers_parallel(Model3D, PartitioningFile=PartFile,  directory="./markers", verbose=false)     
     end
 

diff --git a/test/t3_SubductionGMGinput/CreateMarkers_SubductionVEP_parallel.jl b/test/t3_SubductionGMGinput/CreateMarkers_SubductionVEP_parallel.jl
@@ -117,9 +117,14 @@ function CreateMarkers_SubductionVEP(dir="./", ParamFile="Subduction_VEP.dat"; N
         save_LaMEM_markers_parallel(Model3D, directory="./markers", verbose=false)                      # Create LaMEM marker input on 1 core
     else
         #> 1 cores; create partitioning file first
-        #PartFile = CreatePartitioningFile(ParamFile,NumberCores, LaMEM_dir="../../bin/opt/", verbose=false);
-        PartFile = CreatePartitioningFile_local(ParamFile, NumberCores; LaMEM_dir="../../bin/", mpiexec=mpiexec)
-        save_LaMEM_markers_parallel(Model3D, PartitioningFile=PartFile,  directory="./markers", verbose=false, is64bit=is64bit)     
+        #PartFile = CreatePartitioningFile_local(ParamFile,NumberCores, LaMEM_dir="../../bin/opt/", verbose=false);
+        #PartFile = create_partitioning_file(ParamFile, NumberCores; LaMEM_dir="../../bin/")
+        #save_LaMEM_markers_parallel(Model3D, PartitioningFile=PartFile,  directory="./markers", verbose=false, is64bit=is64bit) 
+
+
+        PartFile = run_lamem_save_grid(ParamFile, cores, verbose=false)
+        save_LaMEM_markers_parallel(Model3D, PartitioningFile=PartFile, directory="./markers", verbose=false, is64bit=is64bit)
+
     end
 
     cd(cur_dir)