ViewVC logotype

Revision 6739

Jump to revision: Previous Next
Author: aellery
Date: Wed Nov 7 23:58:41 2018 UTC (5 months, 2 weeks ago)
Changed paths: 15
Log Message:
I have removed support for boomerAMG from eScript. Specific changes are:

i) I have removed the definition of the variables "boomeramg", "boomeramg_prefix" and "boomeramg_libs" from SConstruct as well as the boomerAMG section of dependencies.py. Similarly, I have removed the boomerAMG section of paso/src/SConscript. Also, I have removed boomeramg from the report that scons prints out after compilation.
ii) I have removed the enum SO_PRECONDITIONER_BOOMERAMG from escriptcpp.cpp 
iii) I have removed the enum SO_PRECONDITIONER_BOOMERAMG from escriptcore/src/SolverOptions.h and have updated a few comments.
iv) I have removed the case for SO_PRECONDITIONER_BOOMERAMG from the switches in SolverBuddy::getSummary(), SolverBuddy::getName() and SolverBuddy::setPreconditioner() in SolverOptions.cpp
v) In paso/src/Preconditioner.h, I have redefined the structure Preconditioner_AMG_Root so that it does not include a pointer to a Preconditioner_BoomerAMG.
vi) I have updated a couple of files in paso (AMG.cpp, AMG_Root.cpp) to reflect the changes in this structure (specifically, the fact that prec->boomeramg is now meaningless).
vii) I have removed a preprocessor directive in paso/src/Options.h (#define PASO_BOOMERAMG 60) and have updated paso/src/Options.cpp to reflect this change by removing this case from several switches.
viii) The files paso/src/BOOMERAMG.h and paso/src/BOOMERAMG.cpp have been removed from the latest commit.

On meerkat, with these changes, escripts compiles without any problems.

Changed paths

Path Details
Directorytrunk/SConstruct modified , text changed
Directorytrunk/escriptcore/src/SolverOptions.cpp modified , text changed
Directorytrunk/escriptcore/src/SolverOptions.h modified , text changed
Directorytrunk/escriptcore/src/escriptcpp.cpp modified , text changed
Directorytrunk/paso/src/AMG.cpp modified , text changed
Directorytrunk/paso/src/AMG_Root.cpp modified , text changed
Directorytrunk/paso/src/BOOMERAMG.cpp deleted
Directorytrunk/paso/src/BOOMERAMG.h deleted
Directorytrunk/paso/src/Options.cpp modified , text changed
Directorytrunk/paso/src/Options.h modified , text changed
Directorytrunk/paso/src/Preconditioner.cpp modified , text changed
Directorytrunk/paso/src/Preconditioner.h modified , text changed
Directorytrunk/paso/src/SConscript modified , text changed
Directorytrunk/scons/meerkat_options.py modified , text changed
Directorytrunk/site_scons/dependencies.py modified , text changed

  ViewVC Help
Powered by ViewVC 1.1.26