[cig-commits] [commit] knepley/upgrade-petsc-interface: Moved .cfg files in share folder to settings directory. (5ecc1e4)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Feb 13 13:07:39 PST 2014
Repository : ssh://geoshell/pylith
On branch : knepley/upgrade-petsc-interface
Link : https://github.com/geodynamics/pylith/compare/97b250360a03c8691ea89896dff7ac258c62755e...f322c74370bc22f8c0ad387afd461fc3cecdbb49
>---------------------------------------------------------------
commit 5ecc1e4951b07ed97c4490e12bb191124377d9ac
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Thu Feb 13 13:04:24 2014 -0800
Moved .cfg files in share folder to settings directory.
Also updated solver settings as necessary.
>---------------------------------------------------------------
5ecc1e4951b07ed97c4490e12bb191124377d9ac
share/Makefile.am | 5 ++++-
share/debug_malloc.cfg | 5 -----
share/{solver => settings}/solver_fault_exact.cfg | 6 +++---
share/{solver => settings}/solver_fault_opt.cfg | 6 +++---
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/share/Makefile.am b/share/Makefile.am
index 8e06bd4..7070174 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -19,7 +19,10 @@
EXTRA_DIST = \
valgrind-python.supp \
valgrind-openmpi.supp \
- generateetags.py
+ generateetags.py \
+ settings/debug_malloc.cfg \
+ settings/solver_fault_exact.cfg \
+ settings/solver_fault_opt.cfg
# End of file
diff --git a/share/debug_malloc.cfg b/share/debug_malloc.cfg
deleted file mode 100644
index f9a03f6..0000000
--- a/share/debug_malloc.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Settings used to debug memory allocation/deallocation issues.
-[pylithapp.petsc]
-malloc =
-malloc_debug =
-malloc_dump =
diff --git a/share/solver/solver_fault_exact.cfg b/share/settings/solver_fault_exact.cfg
similarity index 87%
rename from share/solver/solver_fault_exact.cfg
rename to share/settings/solver_fault_exact.cfg
index 6efd888..06b036c 100644
--- a/share/solver/solver_fault_exact.cfg
+++ b/share/settings/solver_fault_exact.cfg
@@ -24,7 +24,7 @@ fs_pc_fieldsplit_type = schur
fs_pc_fieldsplit_schur_factorization_type = full
fs_fieldsplit_displacement_ksp_type = preonly
fs_fieldsplit_displacement_pc_type = lu
-fs_fieldsplit_lagrange_multipliers_pc_type = jacobi
-fs_fieldsplit_lagrange_multipliers_ksp_type = gmres
-fs_fieldsplit_lagrange_multipliers_ksp_rtol = 1.0e-11
+fs_fieldsplit_lagrange_multiplier_pc_type = jacobi
+fs_fieldsplit_lagrange_multiplier_ksp_type = gmres
+fs_fieldsplit_lagrange_multiplier_ksp_rtol = 1.0e-11
#fs_fieldsplit_lagrange_multipliers_ksp_converged_reason = true
diff --git a/share/solver/solver_fault_opt.cfg b/share/settings/solver_fault_opt.cfg
similarity index 88%
rename from share/solver/solver_fault_opt.cfg
rename to share/settings/solver_fault_opt.cfg
index 6571810..3c14602 100644
--- a/share/solver/solver_fault_opt.cfg
+++ b/share/settings/solver_fault_opt.cfg
@@ -27,7 +27,7 @@ fs_pc_fieldsplit_schur_precondition = user
fs_fieldsplit_displacement_ksp_type = gmres
fs_fieldsplit_displacement_ksp_rtol = 5.0e-10
fs_fieldsplit_displacement_pc_type = gamg
-fs_fieldsplit_lagrange_multipliers_pc_type = jacobi
-fs_fieldsplit_lagrange_multipliers_ksp_type = gmres
-fs_fieldsplit_lagrange_multipliers_ksp_rtol = 1.0e-05
+fs_fieldsplit_lagrange_multiplier_pc_type = jacobi
+fs_fieldsplit_lagrange_multiplier_ksp_type = gmres
+fs_fieldsplit_lagrange_multiplier_ksp_rtol = 1.0e-05
#fs_fieldsplit_lagrange_multipliers_ksp_converged_reason = true
More information about the CIG-COMMITS
mailing list