Checkin of Hypre 2.10.0b

Author: IanLee1521

CHANGELOG

@@ -7,14 +7,89 @@
 # terms of the GNU Lesser General Public License (as published by the Free
 # Software Foundation) version 2.1 dated February 1999.
 #
-# $Revision: 2.128 $
+# $Revision$
 #EHEADER**********************************************************************
 
 #=============================================================================
 # This file chronicles user-level changes to hypre, beginning with the most
 # recent release.
 #=============================================================================
 
+
+Version 2.10.0b released 2015/01/22
+
+- Added new interpolation that allows the incorporation of near null-space
+  vectors for systems problems.
+
+- Added additive V-cycle and new mult-additive and simplified mult-additive
+  V-cycle.
+
+- Fixed several bugs in BoomerAMG and removed some inefficiencies.
+
+- Fixed potential bug and memory leaks in the AMS and ADS solvers.
+
+- Added threading to the IJ interface and some AMG setup routines.
+
+- Added new non-Galerkin coarse grid construction scheme to reduce communication
+  and complexity.
+
+- Extended GLVis visualization to all 2D and 3D example codes.
+
+- Changed the configure settings to use --disable-global-partition by default.
+  The equivalent old option --with-no-global-partition is still available, but
+  users should migrate to the new one.
+
+#====================================
+
+Version 2.9.4a released 2013/11/21
+
+- Minor bug fix in AMS and other minor changes.
+
+#====================================
+
+Version 2.9.3a released 2013/10/15
+
+- Extended AMS to work for AMR problems on quad/hex meshes by removing an
+  assumption that the discrete gradient G only has +-1 entries.  Also changed
+  default smoother in AMS to l1-GS.
+
+- Added a hi-D capability to Struct and SStruct.  Use the --enable-maxdim option
+  to configure the library for higher-than-3D usage.
+
+- Added complex system support to a subset of the library, including most of the
+  matrix-vector class functions and the Krylov solvers.  Currently does not
+  support the FEI or babel components.  Use the --enable-complex option to set.
+
+#====================================
+
+Version 2.9.2a released 2013/02/15
+
+- Added HYPRE_AMSSet*AMGCoarseRelaxType for specifying the coarsest level
+  relaxation for the AMG subspace solvers in AMS.  Since the subspace matrices
+  are often singular, the default value uses l1-GS on the coarsest level, which
+  is different from BoomerAMG's default (exact solve).
+
+- Fixed a bug in the IJ interface related to setting off-processor values when
+  hypre is configured to use the assumed partition.
+
+- Fixed a bug in BoomerAMG when using C-F L1-Jacobi on coarsest grid, and fixed
+  a memory bug related to interpolation.
+
+#====================================
+
+Version 2.9.1a released 2013/01/16
+
+- Added a HYPRE_BoomerAMGSetRedundant() switch to allow for an agglomeration
+  approach for solving the coarsest grid system.
+
+- Changed how BoomerAMG handles zero diagonal entries.
+
+- Made a few minor bug fixes in BoomerAMG.
+
+- Fixed a configuration problem with external blas and lapack.
+
+#====================================
+
 Version 2.9.0b released 2012/10/30
 
 - Changed the behavior of the BoomerAMG interpolation routines when a zero
@@ -47,22 +122,22 @@ Version 2.8.1a released 2012/03/19
 
 - For non-cell data, fixed a memory problem with SStructGraphAddEntries() and an
   accumulation problem with SStructMatrixAddValues().
-  
+
 - Improved the penalty scaling factor for AMS's discrete divergence term (which is
   added to the matrix to robustly handle problems with pure void regions).
-  
+
 - Added threading to various routines in BoomerAMG.
-  
+
 - Fixed the SStructGridSetPeriodic() routine to work for all object types,
   including HYPRE_PARCSR which previously did not work.
-  
+
 - Made two changes to GMRES: 1) Added GMRESSetSkipRealResidualCheck to skip the
   evaluation and check of the final residual in GMRES. This can be useful in
   situations where restart is not expected to be beneficial. 2) Independent of the
   above, added a check to see if consecutive real GMRES residuals decrease (in the
   "false convergence" case). If not, we conclude that restart leads to pollution
   from round-off errors and exit GMRES.
-  
+
 - Implemented a CMake build system for the library and the test drivers.
 
 #====================================
@@ -338,8 +413,8 @@ Version 2.2.0b released, 2007/09/20.
 
 Version 2.1.0a released, 2007/06/25.
 
-- Added the CGC and CGC-E coarsening algorithms, which have been developed 
-  and implemented by Michael Griebel, Bram Metsch and Alex Schweitzer of 
+- Added the CGC and CGC-E coarsening algorithms, which have been developed
+  and implemented by Michael Griebel, Bram Metsch and Alex Schweitzer of
   the University of Bonn.
 
 - Added several new solver types to AMS and improved the AMS/FEI integration.
@@ -350,7 +425,7 @@ Version 2.1.0a released, 2007/06/25.
 
 - Added a 'make check' target that does a simple code verification test.
 
-- Added truncation for interpolation according to the number of elements to the 
+- Added truncation for interpolation according to the number of elements to the
   ParCSR Hybrid AMG Solver.
 
 - Renovated the hypre fei implementation for use in ARES.
@@ -419,7 +494,7 @@ Version 1.12.0a released, 2006/07/26.
 - First release of Maxwell, a semi-structured Maxwell solver.
 
 - Modifications to the fac user interface to permit easier set up of the problem.
-  
+
 #====================================
 
 Version 1.11.1b released, 2006/05/30.
@@ -449,7 +524,7 @@ Version 1.11.0b released, 2006/04/24.
     * an option to print the system matrix and rhs
     * a description of how to read in a matrix and rhs in IJ format.
 
-- Corrected error that occured when more than one Euclid solver object is used
+- Corrected error that occurred when more than one Euclid solver object is used
   at the same time
 
 - Added Maxwell capabilities via Sandia's ML solvers; see details in
@@ -477,7 +552,7 @@ Version 1.10.0b released, 2005/12/19.
   only the IJ interface solvers have been optimized.  For small or modest
   numbers of processors (typically < 1000-5000 depending on the machine), this
   option is not needed (and will likely be slower).
-  
+
 - Added aggressive coarsening, which can be applied to all available coarsening
   schemes (via HYPRE_BoomerAMGSetNumAggLevels and HYPRE_BoomerAMGSetNumPaths)
 
@@ -635,17 +710,17 @@ Version 1.7.10b released, 2002/12/02.
 
 - SStruct: Fixed a bug when connecting a part to itself with SetNeighborBox.
 
-- FEI: Added a few more smoothers and amg methods in mli, fixed a few memory 
-  leaks uncovered by running ale3d, added new aggregation coarsening for 
-  handling multiple materials.  For more details, see 
+- FEI: Added a few more smoothers and amg methods in mli, fixed a few memory
+  leaks uncovered by running ale3d, added new aggregation coarsening for
+  handling multiple materials.  For more details, see
   FEI_mv/fei-hypre/CHANGELOG.
 
 #====================================
 
 Version 1.7.9b released, 2002/10/18.
 
-- SStruct: Added an if around sorting and eliminating duplicate 
-  iUventries so that its only executed when there are at least 2 
+- SStruct: Added an if around sorting and eliminating duplicate
+  iUventries so that its only executed when there are at least 2
   such entries.
 
 #====================================
@@ -684,13 +759,13 @@ Version 1.7.5b released, 2002/01/16.
 - SStruct: Modified SetNeighborBox boxes to reach off of the global grid.
 
 - krylov solvers (PCG, GMRES, BiCGSTAB and CGNR ) are the first
-  solvers to use the new definitions for logging, which are 
-  logging = 0: no printout,  no storing of norms or rel. res. norms 
-  logging = 1: no printout,  norms (and relative residual norms for PCG) 
-               are stored 
-  logging > 1: norms (and relative residual norms for PCG) are stored 
-               and printed out to standard output during each iteration 
-               step. 
+  solvers to use the new definitions for logging, which are
+  logging = 0: no printout,  no storing of norms or rel. res. norms
+  logging = 1: no printout,  norms (and relative residual norms for PCG)
+               are stored
+  logging > 1: norms (and relative residual norms for PCG) are stored
+               and printed out to standard output during each iteration
+               step.
 
 #====================================
 
@@ -794,7 +869,7 @@ New internal installation: V1.0.0, 2000/07/06
   is in the subdirectory 'debug'.
 
 - Added support for the FEI v1.4, with additional capabilities for handling
-  parallel slide surface reduction and general Schur complement reduction. 
+  parallel slide surface reduction and general Schur complement reduction.
 
 - Using a new version numbering scheme.  The C macro HYPRE_Version()
   may be used to retrieve version information.

INSTALL

@@ -7,7 +7,7 @@
 # terms of the GNU Lesser General Public License (as published by the Free
 # Software Foundation) version 2.1 dated February 1999.
 #
-# $Revision: 2.9 $
+# $Revision$
 #EHEADER**********************************************************************
 
 

README

@@ -7,7 +7,7 @@
 # terms of the GNU Lesser General Public License (as published by the Free
 # Software Foundation) version 2.1 dated February 1999.
 #
-# $Revision: 2.9 $
+# $Revision$
 #EHEADER**********************************************************************
 
 

docs/HYPRE_ref_manual.pdf

@@ -2,8 +2,8 @@ cmake_minimum_required (VERSION 2.8.8)
 project (hypre)
 
 # The version number.
-set (HYPRE_VERSION 2.9.0b)
-set (HYPRE_DATE    2012/10/30)
+set (HYPRE_VERSION 2.10.0b)
+set (HYPRE_DATE    2015/01/22)
 set (HYPRE_TIME    00:00:00)
 set (HYPRE_BUGS    hypre-support@llnl.gov)
 set (HYPRE_SRCDIR  "${PROJECT_SOURCE_DIR}")
@@ -29,16 +29,25 @@ option(HYPRE_SEQUENTIAL           "Compile without MPI" OFF)
 option(HYPRE_TIMING               "Use HYPRE timing routines" OFF)
 option(HYPRE_USING_HYPRE_BLAS     "Use internal BLAS library" ON)
 option(HYPRE_USING_HYPRE_LAPACK   "Use internal LAPACK library" ON)
-option(HYPRE_NO_GLOBAL_PARTITION  "Use assumed partition" OFF)
+option(HYPRE_NO_GLOBAL_PARTITION  "Use assumed partition" ON)
 option(HYPRE_PRINT_ERRORS         "Print HYPRE errors" OFF)
 option(HYPRE_USING_OPENMP         "Use OpenMP" OFF)
 option(HYPRE_USING_FEI            "Use FEI" ON)
 
+if (HYPRE_SHARED)
+  # FEI doesn't currently compile with shared
+  set (HYPRE_USING_FEI OFF CACHE BOOL "" FORCE)
+endif ()
+
 if (HYPRE_BIGINT)
   set (HYPRE_USING_FEI OFF CACHE BOOL "" FORCE)
   # In the future, also turn off babel
 endif ()
 
+if (HYPRE_SEQUENTIAL)
+  set (HYPRE_NO_GLOBAL_PARTITION OFF CACHE BOOL "" FORCE)
+endif ()
+
 #   --with-examples         Build example codes.
 #   --with-fei              Use internal FEI routines.
 #   --with-superlu          Use internal SuperLU routines.
@@ -175,6 +184,7 @@ list (APPEND HYPRE_SOURCES
   utilities/F90_HYPRE_error.c
   utilities/fortran_matrix.c
   utilities/hypre_ap.c
+  utilities/hypre_complex.c
   utilities/hypre_error.c
   utilities/hypre_memory.c
   utilities/hypre_mpi_comm_f2c.c
@@ -185,7 +195,6 @@ list (APPEND HYPRE_SOURCES
   utilities/qsplit.c
   utilities/random.c
   utilities/threading.c
-  utilities/thread_mpistubs.c
   utilities/timer.c
   utilities/timing.c
   utilities/umalloc_local.c
@@ -460,6 +469,7 @@ list (APPEND HYPRE_SOURCES
   parcsr_ls/par_coordinates.c
   parcsr_ls/par_cr.c
   parcsr_ls/par_cycle.c
+  parcsr_ls/par_add_cycle.c
   parcsr_ls/par_difconv.c
   parcsr_ls/par_gsmg.c
   parcsr_ls/par_indepset.c
@@ -470,6 +480,7 @@ list (APPEND HYPRE_SOURCES
   parcsr_ls/par_laplace_9pt.c
   parcsr_ls/par_laplace.c
   parcsr_ls/par_lr_interp.c
+  parcsr_ls/par_nongalerkin.c
   parcsr_ls/par_nodal_systems.c
   parcsr_ls/par_rap.c
   parcsr_ls/par_rap_communication.c
@@ -501,7 +512,6 @@ list (APPEND HYPRE_HEADERS
 list (APPEND HYPRE_SOURCES
   struct_mv/assumed_part.c
   struct_mv/box_algebra.c
-  struct_mv/box_alloc.c
   struct_mv/box_boundary.c
   struct_mv/box.c
   struct_mv/box_manager.c
@@ -511,7 +521,6 @@ list (APPEND HYPRE_SOURCES
   struct_mv/F90_HYPRE_struct_matrix.c
   struct_mv/F90_HYPRE_struct_stencil.c
   struct_mv/F90_HYPRE_struct_vector.c
-  struct_mv/grow.c
   struct_mv/HYPRE_struct_grid.c
   struct_mv/HYPRE_struct_matrix.c
   struct_mv/HYPRE_struct_stencil.c
@@ -526,7 +535,6 @@ list (APPEND HYPRE_SOURCES
   struct_mv/struct_matrix.c
   struct_mv/struct_matrix_mask.c
   struct_mv/struct_matvec.c
-  struct_mv/struct_overlap_innerprod.c
   struct_mv/struct_scale.c
   struct_mv/struct_stencil.c
   struct_mv/struct_vector.c
@@ -626,7 +634,6 @@ list (APPEND HYPRE_SOURCES
   sstruct_mv/sstruct_innerprod.c
   sstruct_mv/sstruct_matrix.c
   sstruct_mv/sstruct_matvec.c
-  sstruct_mv/sstruct_overlap_innerprod.c
   sstruct_mv/sstruct_scale.c
   sstruct_mv/sstruct_stencil.c
   sstruct_mv/sstruct_vector.c
@@ -709,8 +716,9 @@ configure_file (
   "${PROJECT_BINARY_DIR}/HYPRE_config.h"
   )
 
-include_directories(${hypre_SOURCE_DIR})
+# BINARY must be first in order to get the correct HYPRE_config.h file
 include_directories(${hypre_BINARY_DIR})
+include_directories(${hypre_SOURCE_DIR})
 include_directories(utilities)
 include_directories(multivector)
 include_directories(krylov)

docs/HYPRE_usr_manual.pdf

@@ -3,7 +3,6 @@ project(HYPRE_FEI C CXX)
 
 include_directories(fei-base)
 include_directories(fei-hypre)
-include_directories(fei-base/base)
 include_directories(ml/src/include)
 
 option(HYPRE_USING_SUPERLU "Use internal SuperLU routines" ON)

docs/bHYPRE_ref_manual.pdf

@@ -7,7 +7,7 @@
 # terms of the GNU Lesser General Public License (as published by the Free
 # Software Foundation) version 2.1 dated February 1999.
 #
-# $Revision: 1.8 $
+# $Revision$
 #EHEADER**********************************************************************
 
 

src/CMakeLists.txt

@@ -55,8 +55,5 @@ set(HYPRE_superlu_SRCS
 
 add_definitions(-DNO_TIMER)
 add_library(HYPRE_superlu OBJECT ${HYPRE_superlu_SRCS})
-if(BUILD_SHARED_LIBS)
-  set_target_properties(HYPRE_superlu PROPERTIES COMPILE_FLAGS "-fPIC")
-endif()
 
 install (FILES ${HYPRE_superlu_HEADERS} DESTINATION include)

src/FEI_mv/CMakeLists.txt

@@ -134,7 +134,7 @@ dgssv(superlu_options_t *options, SuperMatrix *A, int *perm_c, int *perm_r,
  *   
  */
     DNformat *Bstore;
-    SuperMatrix *AA;/* A in SLU_NC format used by the factorization routine.*/
+    SuperMatrix *AA=NULL;/* A in SLU_NC format used by the factorization routine.*/
     SuperMatrix AC; /* Matrix postmultiplied by Pc */
     int      lwork = 0, *etree, i;
 

src/FEI_mv/DSuperLU/INSTALL/testtimer

@@ -61,7 +61,7 @@ double dlangs(char *norm, SuperMatrix *A)
     NCformat *Astore;
     double   *Aval;
     int      i, j, irow;
-    double   value, sum;
+    double   value=0.0, sum;
     double   *rwork;
 
     Astore = A->Store;