From d096f682dd5a64350118a458ca3e77590e95e517 Mon Sep 17 00:00:00 2001 From: Ambra Abdullahi Date: Sat, 26 Mar 2016 10:39:51 +0000 Subject: [PATCH] Merge mumps into trunk --- Make.inc.in | 3 +- Makefile | 4 +- docs/html/index.html | 17 +- docs/html/node1.html | 14 +- docs/html/node10.html | 7 +- docs/html/node11.html | 26 +- docs/html/node15.html | 20 +- docs/html/node16.html | 36 +- docs/html/node17.html | 18 +- docs/html/node18.html | 134 ++--- docs/html/node19.html | 21 +- docs/html/node2.html | 9 +- docs/html/node20.html | 72 +-- docs/html/node21.html | 13 +- docs/html/node22.html | 13 +- docs/html/node23.html | 7 +- docs/html/node24.html | 7 +- docs/html/node3.html | 39 +- docs/html/node4.html | 9 +- docs/html/node5.html | 9 +- docs/html/node6.html | 33 +- docs/html/node7.html | 43 +- docs/html/node8.html | 7 +- docs/html/node9.html | 7 +- docs/html/userhtml.html | 17 +- docs/src/abstract.tex | 2 +- docs/src/bibliography.tex | 8 + docs/src/building.tex | 11 + docs/src/gettingstarted.tex | 31 +- examples/fileread/mld_dexample_1lev.f90 | 16 +- examples/fileread/mld_dexample_ml.f90 | 12 + examples/fileread/runs/ml.inp | 4 +- examples/pdegen/Makefile | 1 + examples/pdegen/mld_dexample_ml.f90 | 12 + examples/pdegen/mld_sexample_1lev.f90 | 11 +- examples/pdegen/mld_sexample_ml.f90 | 12 + examples/pdegen/runs/1lev.inp | 4 +- examples/pdegen/runs/ml.inp | 6 +- examples/pdegen/runs/script.pbs | 8 + examples/pdegen/runs/script1lev.pbs | 9 + mlprec/Makefile | 33 +- mlprec/impl/mld_ccprecset.F90 | 38 ++ mlprec/impl/mld_cprecinit.F90 | 22 +- mlprec/impl/mld_cprecset.F90 | 36 +- mlprec/impl/mld_dcprecset.F90 | 37 +- mlprec/impl/mld_dprecinit.F90 | 16 +- mlprec/impl/mld_dprecset.F90 | 56 +- mlprec/impl/mld_scprecset.F90 | 37 ++ mlprec/impl/mld_sprecinit.F90 | 22 +- mlprec/impl/mld_sprecset.F90 | 37 +- mlprec/impl/mld_zcprecset.F90 | 38 ++ mlprec/impl/mld_zprecinit.F90 | 15 +- mlprec/impl/mld_zprecset.F90 | 35 +- .../impl/smoother/mld_d_as_smoother_bld.f90 | 4 +- .../impl/smoother/mld_d_as_smoother_cnv.f90 | 2 +- mlprec/impl/solver/Makefile | 15 +- .../impl/solver/mld_c_mumps_solver_apply.F90 | 147 ++++++ .../solver/mld_c_mumps_solver_apply_vect.F90 | 84 +++ mlprec/impl/solver/mld_c_mumps_solver_bld.F90 | 189 +++++++ .../impl/solver/mld_d_mumps_solver_apply.F90 | 148 ++++++ .../solver/mld_d_mumps_solver_apply_vect.F90 | 83 +++ mlprec/impl/solver/mld_d_mumps_solver_bld.F90 | 191 +++++++ .../impl/solver/mld_s_mumps_solver_apply.F90 | 148 ++++++ .../solver/mld_s_mumps_solver_apply_vect.F90 | 82 +++ mlprec/impl/solver/mld_s_mumps_solver_bld.F90 | 190 +++++++ .../impl/solver/mld_z_mumps_solver_apply.F90 | 149 ++++++ .../solver/mld_z_mumps_solver_apply_vect.F90 | 83 +++ mlprec/impl/solver/mld_z_mumps_solver_bld.F90 | 190 +++++++ mlprec/mld_base_prec_type.F90 | 32 +- mlprec/mld_c_mumps_solver.F90 | 477 ++++++++++++++++++ mlprec/mld_d_base_solver_mod.f90 | 1 - mlprec/mld_d_mumps_solver.F90 | 477 ++++++++++++++++++ mlprec/mld_d_onelev_mod.f90 | 9 +- mlprec/mld_d_prec_type.f90 | 6 +- mlprec/mld_d_umf_solver.F90 | 4 +- mlprec/mld_s_mumps_solver.F90 | 477 ++++++++++++++++++ mlprec/mld_z_mumps_solver.F90 | 477 ++++++++++++++++++ tests/fileread/Makefile | 7 +- tests/fileread/df_sample.f90 | 7 +- tests/fileread/runs/cfs.inp | 8 +- tests/fileread/runs/dfs.inp | 10 +- tests/fileread/runs/sfs.inp | 6 +- tests/fileread/runs/zfs.inp | 6 +- tests/pdegen/Makefile | 2 +- tests/pdegen/ppde2d.f90 | 3 +- tests/pdegen/ppde3d.f90 | 3 +- tests/pdegen/runs/ppde.inp | 26 +- 87 files changed, 4517 insertions(+), 380 deletions(-) create mode 100644 examples/pdegen/runs/script.pbs create mode 100644 examples/pdegen/runs/script1lev.pbs create mode 100644 mlprec/impl/solver/mld_c_mumps_solver_apply.F90 create mode 100644 mlprec/impl/solver/mld_c_mumps_solver_apply_vect.F90 create mode 100644 mlprec/impl/solver/mld_c_mumps_solver_bld.F90 create mode 100644 mlprec/impl/solver/mld_d_mumps_solver_apply.F90 create mode 100644 mlprec/impl/solver/mld_d_mumps_solver_apply_vect.F90 create mode 100644 mlprec/impl/solver/mld_d_mumps_solver_bld.F90 create mode 100644 mlprec/impl/solver/mld_s_mumps_solver_apply.F90 create mode 100644 mlprec/impl/solver/mld_s_mumps_solver_apply_vect.F90 create mode 100644 mlprec/impl/solver/mld_s_mumps_solver_bld.F90 create mode 100644 mlprec/impl/solver/mld_z_mumps_solver_apply.F90 create mode 100644 mlprec/impl/solver/mld_z_mumps_solver_apply_vect.F90 create mode 100644 mlprec/impl/solver/mld_z_mumps_solver_bld.F90 create mode 100644 mlprec/mld_c_mumps_solver.F90 create mode 100644 mlprec/mld_d_mumps_solver.F90 create mode 100644 mlprec/mld_s_mumps_solver.F90 create mode 100644 mlprec/mld_z_mumps_solver.F90 diff --git a/Make.inc.in b/Make.inc.in index 1061aa7e..5248703e 100644 --- a/Make.inc.in +++ b/Make.inc.in @@ -16,6 +16,7 @@ INSTALL_LIBDIR=@INSTALL_LIBDIR@ INSTALL_INCLUDEDIR=@INSTALL_INCLUDEDIR@ INSTALL_DOCSDIR=@INSTALL_DOCSDIR@ + ########################################################## # # # Additional defines and libraries for multilevel # @@ -55,4 +56,4 @@ MLDCDEFINES=$(SLUFLAGS) $(UMFFLAGS) $(SLUDISTFLAGS) $(PSBCDEFINES) MLDFDEFINES=@FDEFINES@ $(PSBFDEFINES) CDEFINES=$(MLDCDEFINES) -FDEFINES=$(MLDFDEFINES) \ No newline at end of file +FDEFINES=$(MLDFDEFINES) diff --git a/Makefile b/Makefile index 84e4175a..5e66f185 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ include Make.inc -all: library + +all: library library: libdir mlp @@ -8,6 +9,7 @@ libdir: (if test ! -d lib ; then mkdir lib; fi) (if test ! -d include ; then mkdir include; fi) ($(INSTALL_DATA) Make.inc include/Make.inc.mld2p4) + mlp: cd mlprec && $(MAKE) all diff --git a/docs/html/index.html b/docs/html/index.html index 91091927..9c76bb1d 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -1,4 +1,4 @@ - + + + -MLD2P4 +MLD2P4

-User's and Reference Guide
-
A guide for the Multi-Level Domain Decomposition +User's and Reference Guide
+
A guide for the Multi-Level Domain Decomposition Parallel Preconditioners Package -based on PSBLAS
+based on PSBLAS


@@ -76,7 +77,7 @@ Oct. 12, 2015 -