Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions modules/elasticity/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,97 @@ if(FEMUTILS_HAS_SOLVER_BACKEND_PETSC)
-A,//fem/matrix-format=AF-BSR
inputs/bar.2D.traction.bodyforce.arc)

set(SOLVER_PETSC_DIRECT_CG
-A,//fem/linear-system/@name=PETScLinearSystem
-A,//fem/linear-system/solver=cg
-A,//fem/linear-system/atol=1e-9
-A,//fem/linear-system/rtol=0)

set(SOLVER_PETSC_DIRECT_GMRES
-A,//fem/linear-system/@name=PETScLinearSystem
-A,//fem/linear-system/solver=gmres
-A,//fem/linear-system/atol=1e-9
-A,//fem/linear-system/rtol=0)

arcanefem_add_gpu_test(NAME [elasticity]3D_Dirichlet_bodyforce_traction_petsc-direct_bsr COMMAND ./Elasticity ARGS
-A,//fem/matrix-format=BSR
${SOLVER_PETSC_DIRECT_CG}
inputs/bar.3D.Dirichlet.traction.bodyForce.arc)

arcanefem_add_gpu_test(NAME [elasticity]3D_Dirichlet_bodyforce_traction_petsc-direct_af-bsr COMMAND ./Elasticity ARGS
-A,//fem/matrix-format=AF-BSR
${SOLVER_PETSC_DIRECT_CG}
inputs/bar.3D.Dirichlet.traction.bodyForce.arc)

arcanefem_add_gpu_test(NAME [elasticity]3D_Dirichlet_bodyforce_petsc-direct_bsr COMMAND ./Elasticity ARGS
-A,//fem/solution-comparison-file=check/bar.3D.Dirichlet.bodyForce.txt
-A,//fem/matrix-format=BSR
${SOLVER_PETSC_DIRECT_CG}
inputs/bar.3D.Dirichlet.bodyForce.arc)

arcanefem_add_gpu_test(NAME [elasticity]3D_Dirichlet_bodyforce_petsc-direct_af-bsr COMMAND ./Elasticity ARGS
-A,//fem/solution-comparison-file=check/bar.3D.Dirichlet.bodyForce.txt
-A,//fem/matrix-format=AF-BSR
${SOLVER_PETSC_DIRECT_CG}
inputs/bar.3D.Dirichlet.bodyForce.arc)

arcanefem_add_gpu_test(NAME [elasticity]3D_sphere_Dirichlet_bodyforce_petsc-direct_af-bsr COMMAND ./Elasticity ARGS
-A,//fem/matrix-format=AF-BSR
${SOLVER_PETSC_DIRECT_CG}
inputs/3D.sphere.dirichlet.traction.bodyforce.tetra.arc)

arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_pointBC_RowElimination_petsc-direct_bsr COMMAND ./Elasticity ARGS
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
-A,//fem/matrix-format=BSR
${SOLVER_PETSC_DIRECT_GMRES}
-A,//fem/boundary-conditions/dirichlet[1]/enforce-Dirichlet-method=RowElimination
-A,//fem/boundary-conditions/dirichlet[2]/enforce-Dirichlet-method=RowElimination
-A,//fem/boundary-conditions/dirichlet-point[1]/enforce-Dirichlet-method=RowElimination
-A,//fem/boundary-conditions/dirichlet-point[2]/enforce-Dirichlet-method=RowElimination
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)

arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_pointBC_RowElimination_petsc-direct_af-bsr COMMAND ./Elasticity ARGS
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
-A,//fem/matrix-format=AF-BSR
${SOLVER_PETSC_DIRECT_GMRES}
-A,//fem/boundary-conditions/dirichlet[1]/enforce-Dirichlet-method=RowElimination
-A,//fem/boundary-conditions/dirichlet[2]/enforce-Dirichlet-method=RowElimination
-A,//fem/boundary-conditions/dirichlet-point[1]/enforce-Dirichlet-method=RowElimination
-A,//fem/boundary-conditions/dirichlet-point[2]/enforce-Dirichlet-method=RowElimination
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)

arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_pointBC_RowColElimination_petsc-direct_af-bsr COMMAND ./Elasticity ARGS
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
-A,//fem/matrix-format=AF-BSR
${SOLVER_PETSC_DIRECT_GMRES}
-A,//fem/boundary-conditions/dirichlet[1]/enforce-Dirichlet-method=RowColumnElimination
-A,//fem/boundary-conditions/dirichlet[2]/enforce-Dirichlet-method=RowColumnElimination
-A,//fem/boundary-conditions/dirichlet-point[1]/enforce-Dirichlet-method=RowColumnElimination
-A,//fem/boundary-conditions/dirichlet-point[2]/enforce-Dirichlet-method=RowColumnElimination
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)

arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_pointBC_petsc-direct_bsr COMMAND ./Elasticity ARGS
-A,//fem/solution-comparison-file=check/bar.2D.PointDirichlet.Dirichlet.bodyForce.txt
-A,//fem/matrix-format=BSR
${SOLVER_PETSC_DIRECT_CG}
-A,//fem/boundary-conditions/dirichlet[1]/enforce-Dirichlet-method=Penalty
-A,//fem/boundary-conditions/dirichlet[2]/enforce-Dirichlet-method=Penalty
-A,//fem/boundary-conditions/dirichlet-point[1]/enforce-Dirichlet-method=Penalty
-A,//fem/boundary-conditions/dirichlet-point[2]/enforce-Dirichlet-method=Penalty
inputs/bar.2D.PointDirichlet.Dirichlet.bodyForce.arc)

arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_traction_bsr_petsc-direct COMMAND ./Elasticity ARGS
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.traction.txt
-A,//fem/matrix-format=BSR
${SOLVER_PETSC_DIRECT_CG}
inputs/bar.2D.Dirichlet.traction.arc)

arcanefem_add_gpu_test(NAME [elasticity]Dirichlet_traction_bodyforce_af-bsr_petsc-direct COMMAND ./Elasticity ARGS
-A,//fem/solution-comparison-file=check/bar.2D.traction.bodyforce.txt
-A,//fem/matrix-format=AF-BSR
${SOLVER_PETSC_DIRECT_CG}
inputs/bar.2D.traction.bodyforce.arc)

if(FEMUTILS_HAS_PARALLEL_SOLVER)
add_test(NAME [elasticity]Dirichlet_2p COMMAND ${MPIEXEC_EXECUTABLE} -n 2 ./Elasticity
-A,//fem/solution-comparison-file=check/bar.2D.Dirichlet.bodyForce.txt
Expand Down
8 changes: 4 additions & 4 deletions modules/elasticity/Dirichlet.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
inline void FemModule::
_applyDirichlet(VariableDoFReal& rhs_values, const IndexedNodeDoFConnectivityView& node_dof)
{

// check if Hypre solver is used and delegate to GPU for dirichlet assembly
auto use_hypre = options()->linearSystem.serviceName() == "HypreLinearSystem";
if (use_hypre) {
// check if Hypre|PETSc solver is used and delegate to GPU for dirichlet assembly
auto use_gpu = options()->linearSystem.serviceName() == "HypreLinearSystem" ||
options()->linearSystem.serviceName() == "PETScLinearSystem";
if (use_gpu) {
_assembleDirichletsGpu();
return;
}
Expand Down
7 changes: 3 additions & 4 deletions modules/elasticity/FemModule.cc
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,13 @@ void FemModule::_initBsr()
info() << "[ArcaneFem-Info] Started module _initBsr()";
Real elapsedTime = platform::getRealTime();

bool use_csr_in_linear_system =
options()->linearSystem.serviceName() == "HypreLinearSystem" ||
bool use_csr_in_linearsystem = options()->linearSystem.serviceName() == "HypreLinearSystem" ||
options()->linearSystem.serviceName() == "PETScLinearSystem";

if (m_matrix_format == "BSR")
m_bsr_format.initialize(defaultMesh(), m_dof_per_node, use_csr_in_linear_system, 0);
m_bsr_format.initialize(defaultMesh(), m_dof_per_node, use_csr_in_linearsystem, 0);
else
m_bsr_format.initialize(defaultMesh(), m_dof_per_node, use_csr_in_linear_system, 1);
m_bsr_format.initialize(defaultMesh(), m_dof_per_node, use_csr_in_linearsystem, 1);

elapsedTime = platform::getRealTime() - elapsedTime;
ArcaneFemFunctions::GeneralFunctions::printArcaneFemTime(traceMng(),"initialize-bsr-matrix", elapsedTime);
Expand Down