/[escript]
ViewVC logotype

Revision 3826


Jump to revision: Previous Next
Author: lgao
Date: Tue Feb 14 09:09:21 2012 UTC (6 years, 11 months ago)
Changed paths: 85
Log Message:
Resovle the conflicts after "svn merge main-stream".



Changed paths

Path Details
Directorybranches/amg_from_3530/paso/src/ modified , props changed
Directorybranches/amg_from_3530/paso/src/AMG.c modified , text changed
Directorybranches/amg_from_3530/paso/src/AMG_Prolongation.c modified , text changed
Directorybranches/amg_from_3530/paso/src/AMG_Restriction.c modified , text changed
Directorybranches/amg_from_3530/paso/src/AMG_Root.c modified , text changed
Directorybranches/amg_from_3530/paso/src/BlockOps.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Coupler.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Coupler.h modified , text changed
Directorybranches/amg_from_3530/paso/src/Distribution.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Distribution.h modified , text changed
Directorybranches/amg_from_3530/paso/src/FCTSolver.c deleted
Directorybranches/amg_from_3530/paso/src/FCTSolver.h deleted
Directorybranches/amg_from_3530/paso/src/FCTSolver_Function.c deleted
Directorybranches/amg_from_3530/paso/src/FCTSolver_util.c deleted
Directorybranches/amg_from_3530/paso/src/Functions.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Functions.h modified , text changed
Directorybranches/amg_from_3530/paso/src/GMRES.c modified , text changed
Directorybranches/amg_from_3530/paso/src/GSMPI.c modified , text changed
Directorybranches/amg_from_3530/paso/src/ILU.c modified , text changed
Directorybranches/amg_from_3530/paso/src/IndexList.c modified , text changed
Directorybranches/amg_from_3530/paso/src/LocalAMG.c modified , text changed
Directorybranches/amg_from_3530/paso/src/LocalAMG_Prolongation.c modified , text changed
Directorybranches/amg_from_3530/paso/src/MINRES.c modified , text changed
Directorybranches/amg_from_3530/paso/src/MKL.c modified , text changed
Directorybranches/amg_from_3530/paso/src/NewtonGMRES.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Options.h modified , text changed
Directorybranches/amg_from_3530/paso/src/Options_getPackage.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Options_getSolver.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Options_setDefaults.c modified , text changed
Directorybranches/amg_from_3530/paso/src/PCG.c modified , text changed
Directorybranches/amg_from_3530/paso/src/PasoUtil.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Pattern.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Pattern.h modified , text changed
Directorybranches/amg_from_3530/paso/src/Pattern_getSubpattern.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Pattern_mis.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Pattern_reduceBandwidth.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Preconditioner.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Preconditioner.h modified , text changed
Directorybranches/amg_from_3530/paso/src/RILU.c modified , text changed
Directorybranches/amg_from_3530/paso/src/ReactiveSolver.c modified , text changed
Directorybranches/amg_from_3530/paso/src/ReactiveSolver.h modified , text changed
Directorybranches/amg_from_3530/paso/src/SConscript modified , text changed
Directorybranches/amg_from_3530/paso/src/SchurComplement.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SharedComponents.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SharedComponents.h modified , text changed
Directorybranches/amg_from_3530/paso/src/Smoother.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Solver.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Solver.h modified , text changed
Directorybranches/amg_from_3530/paso/src/Solver_applyBlockDiagonalMatrix.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SparseMatrix.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SparseMatrix.h modified , text changed
Directorybranches/amg_from_3530/paso/src/SparseMatrix_MatrixMatrixTranspose.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SparseMatrix_MatrixVector.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SparseMatrix_addAbsRow.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SparseMatrix_getSubmatrix.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SparseMatrix_getTranspose.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SparseMatrix_nullifyRowsAndCols.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SparseMatrix_saveHB.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SparseMatrix_setValues.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix.h modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrixPattern.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrixPattern.h modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_MIS.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_MIS.h modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_balancing.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_copyColCoupleBlock.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_debug.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_loadMM.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_mergeMainAndCouple.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_nullifyRows.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_nullifyRowsAndCols.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_saveHB.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_saveMM.c modified , text changed
Directorybranches/amg_from_3530/paso/src/SystemMatrix_setValues.c modified , text changed
Directorybranches/amg_from_3530/paso/src/TFQMR.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Transport.c modified , text changed
Directorybranches/amg_from_3530/paso/src/Transport.h modified , text changed
Directorybranches/amg_from_3530/paso/src/Transport_solve.c modified , text changed
Directorybranches/amg_from_3530/paso/src/UMFPACK.c modified , text changed
Directorybranches/amg_from_3530/paso/src/mmio.c modified , text changed
Directorybranches/amg_from_3530/paso/src/mmio.h modified , text changed
Directorybranches/amg_from_3530/paso/src/performance.c modified , text changed
Directorybranches/amg_from_3530/paso/src/performance.h modified , text changed
Directorybranches/amg_from_3530/paso/src/solve.c modified , text changed

  ViewVC Help
Powered by ViewVC 1.1.26