Commit f349942e authored by Antonio Cervone's avatar Antonio Cervone
Browse files

bugfix in test_bdf CMakeLists.txt

parent b66c8f7a
......@@ -7,7 +7,7 @@ add_custom_target (test_bdf_links
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data1;data1
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data2;data2
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data3;data3
COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/testsuite/data/mesh/inria/;Mesh
COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/testsuite/data/mesh/;Mesh
VERBATIM)
# Fake dependency to ensure that links are made prior to running the test
......
......@@ -5,78 +5,78 @@
[bdf]
endtime = 1.5
endtime = 1.5
timestep = 0.1
order = 1
[./space_discretization]
order = P2
mesh_dir = ./Mesh/ # the directory where the mesh file is
mesh_file = cube4x4.mesh # mesh file
[./space_discretization]
order = P2
mesh_dir = ./Mesh/inria/ # the directory where the mesh file is
mesh_file = cube4x4.mesh # mesh file
[../prec]
prectype = ML # ML or Ifpack
reuse = true
displayList = false
[../prec]
prectype = ML # ML or Ifpack
reuse = true
displayList = false
[./ML]
analyze_smoother = false
default_parameter_list = SA # for ML precond, none SA, DD, DD-ML, maxwell, NSSA, DD-ML-LU, DD-LU
[./ML]
analyze_smoother = false
default_parameter_list = SA # for ML precond, none SA, DD, DD-ML, maxwell, NSSA, DD-ML-LU, DD-LU
max_levels = 2
[./smoother]
# smoother type
# Aztec, IFPACK, Jacobi, ML symmetric Gauss-Seidel, symmetric Gauss-Seidel,
# ML Gauss-Seidel, Gauss-Seidel, Chebyshev, MLS, Hiptmair, Amesos-KLU,
# Amesos-Superlu, Amesos-UMFPACK, Amesos-Superludist, Amesos-MUMPS,
# user-defined, SuperLU, IFPACK-Chebyshev, self, do-nothing,
# IC, ICT, ILU, ILUT
type = IFPACK
pre_or_post = both
sweeps = 3
damping_factor = 1
[../coarse]
type = Amesos-UMFPACK
#type = Amesos-KLU
sweeps = 1
pre_or_post = both
max_size = 1024
[../repartition]
enable = 1
partitioner = ParMETIS
max_min_ration = 1.3
min_per_proc = 500
[../energy_minimization]
enable = true
type = 3
[../]
[./smoother]
# smoother type
# Aztec, IFPACK, Jacobi, ML symmetric Gauss-Seidel, symmetric Gauss-Seidel,
# ML Gauss-Seidel, Gauss-Seidel, Chebyshev, MLS, Hiptmair, Amesos-KLU,
# Amesos-Superlu, Amesos-UMFPACK, Amesos-Superludist, Amesos-MUMPS,
# user-defined, SuperLU, IFPACK-Chebyshev, self, do-nothing,
# IC, ICT, ILU, ILUT
type = IFPACK
pre_or_post = both
sweeps = 3
damping_factor = 1
[../coarse]
type = Amesos-UMFPACK
#type = Amesos-KLU
sweeps = 1
pre_or_post = both
max_size = 1024
[../repartition]
enable = 1
partitioner = ParMETIS
max_min_ration = 1.3
min_per_proc = 500
[../energy_minimization]
enable = true
type = 3
[../]
# ifpack
[../ifpack]
#prectype = Amesos
overlap = 3
overlap = 3
[./fact]
ilut_level-of-fill = 1
drop_tolerance = 1.e-5
relax_value = 0
[./fact]
ilut_level-of-fill = 1
drop_tolerance = 1.e-5
relax_value = 0
[../amesos]
solvertype = Amesos_Umfpack
[../amesos]
solvertype = Amesos_Umfpack
[../partitioner]
overlap = 2
[../partitioner]
overlap = 2
[../schwarz]
reordering_type = none #metis, rcm, none
filter_singletons = true
[../schwarz]
reordering_type = none #metis, rcm, none
filter_singletons = true
[../]
[../]
[../]
[../]
[../solver]
solver = gmres
......@@ -88,10 +88,10 @@
tol = 1.e-10 # AztecOO tolerance
[./amesos]
solvertype = Umfpack
redistribute = true
solvertype = Umfpack
redistribute = true
print_status = true
print_timing = true
print_timing = true
[exporter]
......
......@@ -5,78 +5,78 @@
[bdf]
endtime = 1.5
endtime = 1.5
timestep = 0.1
order = 2
[./space_discretization]
order = P2
mesh_dir = ./Mesh/ # the directory where the mesh file is
mesh_file = cube4x4.mesh # mesh file
[./space_discretization]
order = P2
mesh_dir = ./Mesh/inria/ # the directory where the mesh file is
mesh_file = cube4x4.mesh # mesh file
[../prec]
prectype = ML # ML or Ifpack
reuse = true
displayList = false
[../prec]
prectype = ML # ML or Ifpack
reuse = true
displayList = false
[./ML]
analyze_smoother = false
default_parameter_list = SA # for ML precond, none SA, DD, DD-ML, maxwell, NSSA, DD-ML-LU, DD-LU
[./ML]
analyze_smoother = false
default_parameter_list = SA # for ML precond, none SA, DD, DD-ML, maxwell, NSSA, DD-ML-LU, DD-LU
max_levels = 2
[./smoother]
# smoother type
# Aztec, IFPACK, Jacobi, ML symmetric Gauss-Seidel, symmetric Gauss-Seidel,
# ML Gauss-Seidel, Gauss-Seidel, Chebyshev, MLS, Hiptmair, Amesos-KLU,
# Amesos-Superlu, Amesos-UMFPACK, Amesos-Superludist, Amesos-MUMPS,
# user-defined, SuperLU, IFPACK-Chebyshev, self, do-nothing,
# IC, ICT, ILU, ILUT
type = IFPACK
pre_or_post = both
sweeps = 3
damping_factor = 1
[../coarse]
type = Amesos-UMFPACK
#type = Amesos-KLU
sweeps = 1
pre_or_post = both
max_size = 1024
[../repartition]
enable = 1
partitioner = ParMETIS
max_min_ration = 1.3
min_per_proc = 500
[../energy_minimization]
enable = true
type = 3
[../]
[./smoother]
# smoother type
# Aztec, IFPACK, Jacobi, ML symmetric Gauss-Seidel, symmetric Gauss-Seidel,
# ML Gauss-Seidel, Gauss-Seidel, Chebyshev, MLS, Hiptmair, Amesos-KLU,
# Amesos-Superlu, Amesos-UMFPACK, Amesos-Superludist, Amesos-MUMPS,
# user-defined, SuperLU, IFPACK-Chebyshev, self, do-nothing,
# IC, ICT, ILU, ILUT
type = IFPACK
pre_or_post = both
sweeps = 3
damping_factor = 1
[../coarse]
type = Amesos-UMFPACK
#type = Amesos-KLU
sweeps = 1
pre_or_post = both
max_size = 1024
[../repartition]
enable = 1
partitioner = ParMETIS
max_min_ration = 1.3
min_per_proc = 500
[../energy_minimization]
enable = true
type = 3
[../]
# ifpack
[../ifpack]
#prectype = Amesos
overlap = 3
overlap = 3
[./fact]
ilut_level-of-fill = 1
drop_tolerance = 1.e-5
relax_value = 0
[./fact]
ilut_level-of-fill = 1
drop_tolerance = 1.e-5
relax_value = 0
[../amesos]
solvertype = Amesos_Umfpack
[../amesos]
solvertype = Amesos_Umfpack
[../partitioner]
overlap = 2
[../partitioner]
overlap = 2
[../schwarz]
reordering_type = none #metis, rcm, none
filter_singletons = true
[../schwarz]
reordering_type = none #metis, rcm, none
filter_singletons = true
[../]
[../]
[../]
[../]
[../solver]
solver = gmres
......@@ -88,10 +88,10 @@
tol = 1.e-10 # AztecOO tolerance
[./amesos]
solvertype = Umfpack
redistribute = true
solvertype = Umfpack
redistribute = true
print_status = true
print_timing = true
print_timing = true
[exporter]
......
......@@ -5,78 +5,78 @@
[bdf]
endtime = 1.5
endtime = 1.5
timestep = 0.1
order = 3
[./space_discretization]
order = P2
mesh_dir = ./Mesh/ # the directory where the mesh file is
mesh_file = cube4x4.mesh # mesh file
[./space_discretization]
order = P2
mesh_dir = ./Mesh/inria/ # the directory where the mesh file is
mesh_file = cube4x4.mesh # mesh file
[../prec]
prectype = ML # ML or Ifpack
reuse = true
displayList = false
[../prec]
prectype = ML # ML or Ifpack
reuse = true
displayList = false
[./ML]
analyze_smoother = false
default_parameter_list = SA # for ML precond, none SA, DD, DD-ML, maxwell, NSSA, DD-ML-LU, DD-LU
[./ML]
analyze_smoother = false
default_parameter_list = SA # for ML precond, none SA, DD, DD-ML, maxwell, NSSA, DD-ML-LU, DD-LU
max_levels = 2
[./smoother]
# smoother type
# Aztec, IFPACK, Jacobi, ML symmetric Gauss-Seidel, symmetric Gauss-Seidel,
# ML Gauss-Seidel, Gauss-Seidel, Chebyshev, MLS, Hiptmair, Amesos-KLU,
# Amesos-Superlu, Amesos-UMFPACK, Amesos-Superludist, Amesos-MUMPS,
# user-defined, SuperLU, IFPACK-Chebyshev, self, do-nothing,
# IC, ICT, ILU, ILUT
type = IFPACK
pre_or_post = both
sweeps = 3
damping_factor = 1
[../coarse]
type = Amesos-UMFPACK
#type = Amesos-KLU
sweeps = 1
pre_or_post = both
max_size = 1024
[../repartition]
enable = 1
partitioner = ParMETIS
max_min_ration = 1.3
min_per_proc = 500
[../energy_minimization]
enable = true
type = 3
[../]
[./smoother]
# smoother type
# Aztec, IFPACK, Jacobi, ML symmetric Gauss-Seidel, symmetric Gauss-Seidel,
# ML Gauss-Seidel, Gauss-Seidel, Chebyshev, MLS, Hiptmair, Amesos-KLU,
# Amesos-Superlu, Amesos-UMFPACK, Amesos-Superludist, Amesos-MUMPS,
# user-defined, SuperLU, IFPACK-Chebyshev, self, do-nothing,
# IC, ICT, ILU, ILUT
type = IFPACK
pre_or_post = both
sweeps = 3
damping_factor = 1
[../coarse]
type = Amesos-UMFPACK
#type = Amesos-KLU
sweeps = 1
pre_or_post = both
max_size = 1024
[../repartition]
enable = 1
partitioner = ParMETIS
max_min_ration = 1.3
min_per_proc = 500
[../energy_minimization]
enable = true
type = 3
[../]
# ifpack
[../ifpack]
#prectype = Amesos
overlap = 3
overlap = 3
[./fact]
ilut_level-of-fill = 1
drop_tolerance = 1.e-5
relax_value = 0
[./fact]
ilut_level-of-fill = 1
drop_tolerance = 1.e-5
relax_value = 0
[../amesos]
solvertype = Amesos_Umfpack
[../amesos]
solvertype = Amesos_Umfpack
[../partitioner]
overlap = 2
[../partitioner]
overlap = 2
[../schwarz]
reordering_type = none #metis, rcm, none
filter_singletons = true
[../schwarz]
reordering_type = none #metis, rcm, none
filter_singletons = true
[../]
[../]
[../]
[../]
[../solver]
solver = gmres
......@@ -88,10 +88,10 @@
tol = 1.e-10 # AztecOO tolerance
[./amesos]
solvertype = Umfpack
redistribute = true
solvertype = Umfpack
redistribute = true
print_status = true
print_timing = true
print_timing = true
[exporter]
......
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