Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update petsc_jll requirements #99

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

update petsc_jll requirements #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d7a46c
update petsc_jll requirements
santiagobadia Mar 15, 2024
80f3ab5
USING PT-SCOTCH instead of PARMETIS in PLaplacianTests
amartinhuertas Mar 15, 2024
d513828
tests plaplacian mumps not activated
santiagobadia Jul 9, 2024
e231d30
Merge branch 'master' of github.com:gridap/GridapPETSc.jl into update…
santiagobadia Jul 9, 2024
43c0b2a
mumps not run w artifacts in tests
santiagobadia Jul 11, 2024
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
1 change: 0 additions & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ SparseMatricesCSR = "a0a7dd2c-ebf4-11e9-1f05-cf50bc540ca1"
Gridap = "0.17, 0.18"
GridapDistributed = "0.3, 0.4"
MPI = "0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.20"
PETSc_jll = "=3.13.4, =3.15.2"
PartitionedArrays = "0.3"
SparseMatricesCSR = "0.6.6"
julia = "1.3"
Expand Down
5 changes: 2 additions & 3 deletions test/DarcyTests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ using PartitionedArrays
function main(distribute,nparts)
parts = distribute(LinearIndices((prod(nparts),)))

if PETSC.MatMumpsSetIcntl_handle[] == C_NULL
@info "Skipping DarcyTests since petsc is not configured with mumps."
if GridapPETSc.libpetsc_provider == "PETSc_jll"
@info "Skipping DarcyTests since mumps seems not to work with artifacts."
return nothing
end

Expand Down Expand Up @@ -59,4 +59,3 @@ function main(distribute,nparts)
uh, ph = xh

end

13 changes: 7 additions & 6 deletions test/PLaplacianTests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,17 @@ end

function main(distribute,nparts,solver)
if solver == :mumps
options = "-snes_type newtonls -snes_linesearch_type basic -snes_linesearch_damping 1.0 -snes_rtol 1.0e-14 -snes_atol 0.0 -snes_monitor -snes_converged_reason -ksp_converged_reason -ksp_error_if_not_converged true"
# MUMPS not testes for p-Laplacian
# options = "-snes_type newtonls -snes_linesearch_type basic -snes_linesearch_damping 1.0 -snes_rtol 1.0e-14 -snes_atol 0.0 -snes_monitor -snes_converged_reason -ksp_converged_reason -ksp_error_if_not_converged true"
elseif solver == :gmres
options = "-snes_type newtonls -snes_linesearch_type basic -snes_linesearch_damping 1.0 -snes_rtol 1.0e-14 -snes_atol 0.0 -snes_monitor -pc_type jacobi -ksp_type gmres -snes_converged_reason -ksp_converged_reason -ksp_error_if_not_converged true"
GridapPETSc.with(args=split(options)) do
main(distribute,nparts,solver,FullyAssembledRows())
main(distribute,nparts,solver,SubAssembledRows())
end
else
error()
end
GridapPETSc.with(args=split(options)) do
main(distribute,nparts,solver,FullyAssembledRows())
main(distribute,nparts,solver,SubAssembledRows())
end
end

function main(distribute,nparts,solver,strategy)
Expand All @@ -72,7 +73,7 @@ function main(distribute,nparts,solver,strategy)
U = TrialFESpace(u,V)

assem = SparseMatrixAssembler(SparseMatrixCSR{0,PetscScalar,PetscInt},
Vector{PetscScalar},U,V,strategy)
Vector{PetscScalar},U,V,strategy)

op = FEOperator(r,j,U,V,assem)

Expand Down
4 changes: 2 additions & 2 deletions test/sequential/DarcyDriver.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ options = "-ksp_converged_reason -ksp_monitor -ksp_type preonly -pc_type lu -pc_

out = GridapPETSc.with(args=split(options)) do

if PETSC.MatMumpsSetIcntl_handle[] == C_NULL
@info "Skipping DarcyDriver since petsc is not configured with mumps."
if GridapPETSc.libpetsc_provider == "PETSc_jll"
@info "Skipping DarcyDriver since mumps seems not to work with artifacts."
return nothing
end

Expand Down
Loading