Commit fdd92b96 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#702 Fix test P1 -> P2; add it to Scons.

parent 788c5b4a
......@@ -182,33 +182,6 @@ FiniteElementSpace2 = {
}
-- BoundaryCondition
BoundaryCondition = {
-- 0:Pseudo-elimination, 2:penalisation
-- Expected format: VALUE
-- Constraint: v >= 0 and v < 3
essentialBoundaryConditionsMethod = 0,
-- Comp1, Comp2 or Comp3
-- Expected format: {"VALUE1", "VALUE2", ...}
-- Constraint: ops_in(v, {'Comp1', 'Comp2', 'Comp3', 'Comp12', 'Comp23', 'Comp13', 'Comp123'})
component = {},
-- Variable name the boundary condition apply to
-- Expected format: {"VALUE1", "VALUE2", ...}
variable = {},
-- Variable value at this boundary.
-- Expected format: {VALUE1, VALUE2, ...}
value = {},
-- Indexes of the domains onto which essential boundary conditions are defined.
-- Expected format: {VALUE1, VALUE2, ...}
domain_index = {}
}
-- Petsc
Petsc = {
-- Absolute tolerance
......
......@@ -80,8 +80,6 @@ namespace HappyHeart
InputParameter::FEltSpace<EnumUnderlyingType(FEltSpaceIndex::fluid_velocity)>,
InputParameter::FEltSpace<EnumUnderlyingType(FEltSpaceIndex::solid_velocity)>,
InputParameter::BoundaryCondition,
InputParameter::Petsc,
InputParameter::Result::OutputDirectory
......
......@@ -93,8 +93,8 @@ namespace HappyHeart
interpolator_p1_p2_ = std::make_unique<LagrangianInterpolatorNS::P1_to_P2>(source_felt_space,
target_felt_space,
source_numbering_subset,
target_felt_space,
target_numbering_subset,
std::move(pairing));
......@@ -116,8 +116,8 @@ namespace HappyHeart
};
interpolator_p2_p1_ = std::make_unique<LagrangianInterpolatorNS::P2_to_P1>(target_felt_space,
source_felt_space,
target_numbering_subset,
source_felt_space,
source_numbering_subset,
std::move(pairing));
......
......@@ -63,8 +63,27 @@ test_conform_operator = env.Program('test_conform_operator-{0}'.format(env["LIBR
LIBS=all_libs,
LIBPATH=env['LIBPATH'])
main_test_p1_to_p2_src = Split('''
Operators/P1_to_P2/main.cpp
Operators/P1_to_P2/Model.cpp
''')
test_p1_to_p2 = env.Program('test_p1_to_p2-{0}'.format(env["LIBRARY_TYPE"]),
main_test_p1_to_p2_src,
LIBS=all_libs,
LIBPATH=env['LIBPATH'])
list_exec.extend((test, test_coloring, test_jacobian, test_conform_operator)) #test_ondomatic_numbering deactivated for the moment #523
list_exec.extend((test,
test_coloring,
test_jacobian,
test_conform_operator,
test_p1_to_p2
)) #test_ondomatic_numbering deactivated for the moment #523
Return('list_exec')
Supports Markdown
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