Commit 45be8c9b authored by GILLES Sebastien's avatar GILLES Sebastien

#1443 Test FromVertexMatching: add a parallelism field (from prepartitioned...

#1443 Test FromVertexMatching: add a parallelism field (from prepartitioned data is not operational yet).
parent fa4b9fb4
......@@ -4339,6 +4339,8 @@
BE9FE83F18CE0A6900177F79 /* Viewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Viewer.cpp; sourceTree = "<group>"; };
BE9FE84018CE0A6900177F79 /* Viewer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Viewer.hpp; sourceTree = "<group>"; };
BEA105E31FD2B6B40064F5E1 /* Instantiations.doxygen */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Instantiations.doxygen; sourceTree = "<group>"; };
BEA1715324992A8A0060DF09 /* main_vectorial_P1_from_prepartitioned_data.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main_vectorial_P1_from_prepartitioned_data.cpp; sourceTree = "<group>"; };
BEA1715424992AA00060DF09 /* demo_vectorial_P1_from_prepartition_data.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = demo_vectorial_P1_from_prepartition_data.lua; sourceTree = "<group>"; };
BEA197B81DDEFBF800B446C9 /* demo_vectorial_P1.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_vectorial_P1.lua; sourceTree = "<group>"; };
BEA197B91DDEFFA200B446C9 /* demo_scalar_P1.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_scalar_P1.lua; sourceTree = "<group>"; };
BEA197BA1DDF05ED00B446C9 /* demo_vectorial_P1b.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_vectorial_P1b.lua; sourceTree = "<group>"; };
......@@ -10190,6 +10192,8 @@
BEAA03C120A2F65A0070343F /* CMakeLists.txt */,
BEB54B5422D362690059FD73 /* main_vectorial_P1.cpp */,
BEA197B81DDEFBF800B446C9 /* demo_vectorial_P1.lua */,
BEA1715324992A8A0060DF09 /* main_vectorial_P1_from_prepartitioned_data.cpp */,
BEA1715424992AA00060DF09 /* demo_vectorial_P1_from_prepartition_data.lua */,
BEC77E9C1DDDC39E00F8B444 /* main_scalar_P1.cpp */,
BEA197B91DDEFFA200B446C9 /* demo_scalar_P1.lua */,
BEB54B5522D362830059FD73 /* main_vectorial_P1b.cpp */,
......@@ -21,6 +21,13 @@ add_executable(MoReFEMTestFromVertexMatching_vectorial_P1
target_link_libraries(MoReFEMTestFromVertexMatching_vectorial_P1 MoReFEMTestFromVertexMatching_lib)
# add_executable(MoReFEMTestFromVertexMatching_vectorial_P1_from_prepartitioned_data
# ${CMAKE_CURRENT_LIST_DIR}/main_vectorial_P1_from_prepartitioned_data.cpp
# )
#
# target_link_libraries(MoReFEMTestFromVertexMatching_vectorial_P1_from_prepartitioned_data
# MoReFEMTestFromVertexMatching_lib)
add_executable(MoReFEMTestFromVertexMatching_vectorial_P1b
${CMAKE_CURRENT_LIST_DIR}/main_vectorial_P1b.cpp
)
......@@ -58,6 +65,19 @@ add_test(FromVertexMatching_VectorialP1
set_tests_properties(FromVertexMatching_VectorialP1 PROPERTIES TIMEOUT 20)
#add_test(FromVertexMatching_VectorialP1_from_prepartitioned_data
# ${OPEN_MPI_INCL_DIR}/../bin/mpirun
# --oversubscribe
# -np 4
# MoReFEMTestFromVertexMatching_vectorial_P1_from_prepartitioned_data
# --
# ${MOREFEM_ROOT}
# ${MOREFEM_TEST_OUTPUT_DIR}
# )
# set_tests_properties(FromVertexMatching_VectorialP1_from_prepartitioned_data PROPERTIES TIMEOUT 20)
add_test(FromVertexMatching_VectorialP1b
${OPEN_MPI_INCL_DIR}/../bin/mpirun
--oversubscribe
......
......@@ -18,7 +18,7 @@
# include "Core/InputData/Instances/FElt/FEltSpace.hpp"
# include "Core/InputData/Instances/FElt/Unknown.hpp"
# include "Core/InputData/Instances/FElt/NumberingSubset.hpp"
# include "Core/InputData/Instances/Parallelism/Parallelism.hpp"
namespace MoReFEM
......@@ -109,6 +109,7 @@ namespace MoReFEM
InputDataNS::InitVertexMatchingInterpolator<EnumUnderlyingType(InitVertexMatchingInterpolator::unknown_on_solid)>,
InputDataNS::InitVertexMatchingInterpolator<EnumUnderlyingType(InitVertexMatchingInterpolator::unknown_on_fluid)>,
InputDataNS::Parallelism,
InputDataNS::Result
>;
......
......@@ -325,3 +325,23 @@ InitVertexMatchingInterpolator20 = {
-- Expected format: "VALUE"
interpolation_file = "${MOREFEM_ROOT}/Data/Interpolation/TestVertexMatching.hhdata"
Parallelism = {
-- What should be done for a parallel run. There are 4 possibilities:
-- 'Precompute': Precompute the data for a later parallel run and stop once it's done.
-- 'ParallelNoWrite': Run the code in parallel without using any pre-processed data and do not write down
-- the processed data.
-- 'Parallel': Run the code in parallel without using any pre-processed data and write down the processed
-- data.
-- 'RunFromPreprocessed': Run the code in parallel using pre-processed data.
-- Expected format: "VALUE"
-- Constraint: value_in(v, {'Precompute', 'ParallelNoWrite', 'Parallel', 'RunFromPreprocessed'})
policy = 'Parallel',
-- Directory in which parallelism data will be written or read (depending on the policy).
-- Expected format: "VALUE"
directory = '${MOREFEM_TEST_OUTPUT_DIR}/PrepartitionData/Test/NonConformInterpolator/FromVertexMatching/ScalarP1'
} -- Parallelism
......@@ -292,6 +292,28 @@ Result = {
} -- Result
Parallelism = {
-- What should be done for a parallel run. There are 4 possibilities:
-- 'Precompute': Precompute the data for a later parallel run and stop once it's done.
-- 'ParallelNoWrite': Run the code in parallel without using any pre-processed data and do not write down
-- the processed data.
-- 'Parallel': Run the code in parallel without using any pre-processed data and write down the processed
-- data.
-- 'RunFromPreprocessed': Run the code in parallel using pre-processed data.
-- Expected format: "VALUE"
-- Constraint: value_in(v, {'Precompute', 'ParallelNoWrite', 'Parallel', 'RunFromPreprocessed'})
policy = 'Parallel',
-- Directory in which parallelism data will be written or read (depending on the policy).
-- Expected format: "VALUE"
directory = '${MOREFEM_TEST_OUTPUT_DIR}/PrepartitionData/Test/NonConformInterpolator/FromVertexMatching/VectorialP1'
} -- Parallelism
InitVertexMatchingInterpolator10 = {
-- Finite element space for which the dofs index will be associated to each vertex.
......@@ -320,6 +342,7 @@ InitVertexMatchingInterpolator20 = {
-- File that gives for each vertex on the first mesh on the interface the index of the equivalent vertex in
-- the second mesh.
-- Expected format: "VALUE"
......
......@@ -326,3 +326,24 @@ InitVertexMatchingInterpolator20 = {
-- Expected format: "VALUE"
interpolation_file = "${MOREFEM_ROOT}/Data/Interpolation/TestVertexMatching.hhdata"
Parallelism = {
-- What should be done for a parallel run. There are 4 possibilities:
-- 'Precompute': Precompute the data for a later parallel run and stop once it's done.
-- 'ParallelNoWrite': Run the code in parallel without using any pre-processed data and do not write down
-- the processed data.
-- 'Parallel': Run the code in parallel without using any pre-processed data and write down the processed
-- data.
-- 'RunFromPreprocessed': Run the code in parallel using pre-processed data.
-- Expected format: "VALUE"
-- Constraint: value_in(v, {'Precompute', 'ParallelNoWrite', 'Parallel', 'RunFromPreprocessed'})
policy = 'Parallel',
-- Directory in which parallelism data will be written or read (depending on the policy).
-- Expected format: "VALUE"
directory = '${MOREFEM_TEST_OUTPUT_DIR}/PrepartitionData/Test/NonConformInterpolator/FromVertexMatching/VectorialP1b'
} -- Parallelism
......@@ -326,3 +326,23 @@ InitVertexMatchingInterpolator20 = {
-- Expected format: "VALUE"
interpolation_file = "${MOREFEM_ROOT}/Data/Interpolation/TestVertexMatching.hhdata"
Parallelism = {
-- What should be done for a parallel run. There are 4 possibilities:
-- 'Precompute': Precompute the data for a later parallel run and stop once it's done.
-- 'ParallelNoWrite': Run the code in parallel without using any pre-processed data and do not write down
-- the processed data.
-- 'Parallel': Run the code in parallel without using any pre-processed data and write down the processed
-- data.
-- 'RunFromPreprocessed': Run the code in parallel using pre-processed data.
-- Expected format: "VALUE"
-- Constraint: value_in(v, {'Precompute', 'ParallelNoWrite', 'Parallel', 'RunFromPreprocessed'})
policy = 'Parallel',
-- Directory in which parallelism data will be written or read (depending on the policy).
-- Expected format: "VALUE"
directory = '${MOREFEM_TEST_OUTPUT_DIR}/PrepartitionData/Test/NonConformInterpolator/FromVertexMatching/VectorialP2'
} -- Parallelism
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment