/[escript]/trunk/paso/src/Solver.c
ViewVC logotype

Log of /trunk/paso/src/Solver.c

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 4345)

Revision 2484 - (view) (annotate) - [select for diffs]
Modified Mon Jun 22 04:22:19 2009 UTC (9 years, 9 months ago) by gross
File length: 13552 byte(s)
Diff to previous 2479 , to selected 2358
numarray removed from docu; Locator revised.

Revision 2479 - (view) (annotate) - [select for diffs]
Modified Thu Jun 18 06:50:37 2009 UTC (9 years, 10 months ago) by gross
File length: 13550 byte(s)
Diff to previous 2381 , to selected 2358
paso returns now some diagnostics. SCSL has been removed.


Revision 2381 - (view) (annotate) - [select for diffs]
Modified Tue Apr 14 03:46:59 2009 UTC (10 years ago) by artak
File length: 14097 byte(s)
Diff to previous 2358
Ruge Stuben and Aggregiation is added for testing performance of AMG solver.

Revision 2358 - (view) (annotate) - [selected]
Modified Wed Apr 1 22:25:24 2009 UTC (10 years ago) by gross
File length: 13926 byte(s)
Diff to previous 2315
mpi is not really ready yet.

Revision 2315 - (view) (annotate) - [select for diffs]
Modified Wed Mar 18 00:38:48 2009 UTC (10 years, 1 month ago) by gross
File length: 13927 byte(s)
Diff to previous 2280 , to selected 2358
fixes for MPI

Revision 2280 - (view) (annotate) - [select for diffs]
Modified Thu Feb 19 03:34:35 2009 UTC (10 years, 2 months ago) by artak
File length: 13915 byte(s)
Diff to previous 2240 , to selected 2358
Some statistics changed in solver.c. In AMG stopping criteria now depend on levels specified. In loadMM conditions on pivot and lval reformulated to avoid numerical overflow.

Revision 2240 - (view) (annotate) - [select for diffs]
Modified Wed Feb 4 01:17:06 2009 UTC (10 years, 2 months ago) by artak
File length: 13915 byte(s)
Diff to previous 2156 , to selected 2358
Some statistical print outs are added in solver and loadMM to Paso_SparseMatrix method is added

Revision 2156 - (view) (annotate) - [select for diffs]
Modified Mon Dec 15 05:09:02 2008 UTC (10 years, 4 months ago) by gross
File length: 13500 byte(s)
Diff to previous 2078 , to selected 2358
some modifications to the iterative solver to make them easier to use. 
There are also improved versions of the Darcy flux solver and the incompressible solver.



Revision 2078 - (view) (annotate) - [select for diffs]
Modified Thu Nov 20 16:10:10 2008 UTC (10 years, 4 months ago) by phornby
File length: 13000 byte(s)
Diff to previous 1981 , to selected 2358
Two changes.

1. Move blocktimer from escript to esysUtils.
2. Make it possible to link to paso as a DLL or .so.

Should have no effect on 'nix's

In respect of 1., blocktimer had begun to spring up everywhere, so
for the moment I thought it best to move it to the only other library that
pops up all over the place.

In respect of 2., paso needed to be a DLL in order to use the windows intelc /fast
option, which does aggressive multi-file optimisations. Even in its current form, it either
vectorises or parallelises  hundreds more loops in the esys system than appear in the pragmas.

In achieving 2. I have not been too delicate in adding

PASO_DLL_API

declarations to the .h files in paso/src. Only toward the end of the process of
the conversion, when the number of linker errors dropped below 20, say, did I choosy about what
functions in a header I declared PASO_DLL_API. As a result, there are likely to be many routines
declared as external functions symbols that are in fact internal to the paso DLL. 
Why is this an issue?  It prevents the intelc compiler from getting aggressive on the paso module.
With pain there is sometimes gain. At least all the DLL rules in windows give good
(non-microsoft) compiler writers a chance to really shine.

So, if you should see a PASO_DLL_API on a function in a paso header file,
and think to yourself, "that function is only called in paso, why export it?", then feel free to
delete the PASO_DLL_API export declaration.

Here's hoping for no breakage.....

Revision 1981 - (view) (annotate) - [select for diffs]
Modified Thu Nov 6 05:27:33 2008 UTC (10 years, 5 months ago) by jfenwick
File length: 12998 byte(s)
Diff to previous 1862 , to selected 2358
More warning removal.


Revision 1862 - (view) (annotate) - [select for diffs]
Modified Wed Oct 8 06:30:50 2008 UTC (10 years, 6 months ago) by artak
File length: 12989 byte(s)
Diff to previous 1819 , to selected 2358
Should work now

Revision 1819 - (view) (annotate) - [select for diffs]
Modified Tue Sep 30 05:58:06 2008 UTC (10 years, 6 months ago) by artak
File length: 13001 byte(s)
Diff to previous 1811 , to selected 2358
Firs version of symmetric Gauss-Seidel preconditioner with coloring

Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (10 years, 6 months ago) by ksteube
File length: 13002 byte(s)
Diff to previous 1798 , to selected 2358
Copyright updated in all files


Revision 1798 - (view) (annotate) - [select for diffs]
Modified Wed Sep 17 06:21:12 2008 UTC (10 years, 7 months ago) by gross
File length: 13037 byte(s)
Diff to previous 1787 , to selected 2358
Fixes for the JacobeanFreeNewton scheme. Still needs to be tested under OPENMP but runs under MPI.



Revision 1787 - (view) (annotate) - [select for diffs]
Modified Mon Sep 15 01:36:34 2008 UTC (10 years, 7 months ago) by artak
File length: 12961 byte(s)
Diff to previous 1707 , to selected 2358
MINRES solver is added to escript. Additional 16 tests are added to run_simplesolve for MINRES and TFQMR solvers

Revision 1707 - (view) (annotate) - [select for diffs]
Modified Thu Aug 14 06:38:14 2008 UTC (10 years, 8 months ago) by ksteube
File length: 12673 byte(s)
Diff to previous 1703 , to selected 2358
Fixed nightly tests for savanna (no longer running in PBS cause can't
compile on compute node).
Modified domain.print_mesh_info() to tell how many elements are owned by
a node and how many are in the overlap.
Instrumented the preconditioner step.


Revision 1703 - (view) (annotate) - [select for diffs]
Modified Thu Aug 14 05:34:25 2008 UTC (10 years, 8 months ago) by artak
File length: 12512 byte(s)
Diff to previous 1639 , to selected 2358
TFQMR solver is added to PASO solver. It is not parallelised yet.

Revision 1639 - (view) (annotate) - [select for diffs]
Modified Mon Jul 14 08:55:25 2008 UTC (10 years, 9 months ago) by gross
File length: 12245 byte(s)
Diff to previous 1628 , to selected 2358


Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (10 years, 9 months ago) by phornby
File length: 11622 byte(s)
Diff to previous 1556 , to selected 2358

Merge in /branches/windows_from_1456_trunk_1620_merged_in branch.

You will find a preserved pre-merge trunk in tags under tags/trunk_at_1625.
That will be useful for diffing & checking on my stupidity.

Here is a list of the conflicts and their resolution at this
point in time.


=================================================================================
(LLWS == looks like white space).

finley/src/Assemble_addToSystemMatrix.c - resolve to branch - unused var. may be wrong.....
finley/src/CPPAdapter/SystemMatrixAdapter.cpp - resolve to branch - LLWS
finley/src/CPPAdapter/MeshAdapter.cpp - resolve to branch - LLWS
paso/src/PCG.c - resolve to branch - unused var fixes.
paso/src/SolverFCT.c - resolve to branch - LLWS
paso/src/FGMRES.c - resolve to branch - LLWS
paso/src/Common.h - resolve to trunk version. It's omp.h's include... not sure it's needed,
but for the sake of saftey.....
paso/src/Functions.c - resolve to branch version, indentation/tab removal and return error
on bad unimplemented Paso_FunctionCall.
paso/src/SolverFCT_solve.c - resolve to branch version, unused vars
paso/src/SparseMatrix_MatrixVector.c - resolve to branch version, unused vars.
escript/src/Utils.cpp - resloved to branch, needs WinSock2.h
escript/src/DataExpanded.cpp - resolved to branch version - LLWS
escript/src/DataFactory.cpp - resolve to branch version
=================================================================================

This currently passes tests on linux (debian), but is not checked on windows or Altix yet.

This checkin is to make a trunk I can check out for windows to do tests on it.

Known outstanding problem is in the operator=() method of exceptions
causing warning messages on the intel compilers.

May the God of doughnuts have mercy on my soul.



Revision 1556 - (view) (annotate) - [select for diffs]
Modified Mon May 12 00:54:58 2008 UTC (10 years, 11 months ago) by gross
File length: 12661 byte(s)
Diff to previous 1552 , to selected 2358
Modification to allow mixed mode execution. 
In order to keep the code portable accross platform all MPI calls within
parallel regions have been moved. 



Revision 1552 - (view) (annotate) - [select for diffs]
Modified Thu May 8 08:52:41 2008 UTC (10 years, 11 months ago) by gross
File length: 12843 byte(s)
Diff to previous 1388 , to selected 2358
some changes to make the implementatiopn of a upwind MPI version easier

Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 3 months ago) by trankine
File length: 12938 byte(s)
Diff to previous 1387 , to selected 2358
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 3 months ago) by trankine
Original Path: temp/paso/src/Solver.c
File length: 12938 byte(s)
Diff to previous 1384 , to selected 2358
Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.

Revision 1384 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 02:29:38 2008 UTC (11 years, 3 months ago) by phornby
Original Path: temp_trunk_copy/paso/src/Solver.c
File length: 12938 byte(s)
Diff to previous 1312 , to selected 2358
Make a temp copy of the trunk before checking in the windows changes



Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (11 years, 6 months ago) by ksteube
File length: 12938 byte(s)
Diff to previous 700 , to selected 2358
The MPI branch is hereby closed. All future work should be in trunk.

Previously in revision 1295 I merged the latest changes to trunk into trunk-mpi-branch.
In this revision I copied all files from trunk-mpi-branch over the corresponding
trunk files. I did not use 'svn merge', it was a copy.


Revision 700 - (view) (annotate) - [select for diffs]
Modified Thu Apr 6 00:13:40 2006 UTC (13 years ago) by gross
File length: 11607 byte(s)
Copied from: trunk/paso/src/Solvers/Solver.c revision 699
Diff to previous 682 , to selected 2358
A few changes in the build mechanism and the file structure so scons can build release tar files:

  * paso/src/Solver has been moved to paso/src 
  * all test_.py are now run_.py files and are assumed to be passing python tests. they can run by 
    scons py_tests and are part of the release test set
  * escript/py_src/test_ are moved to escript/test/python and are installed in to the build directory 
    (rather then the PYTHONPATH).
  * all py files in test/python which don't start with run_ or test_ are now 'local_py_tests'. they are installed i
    by not run automatically.
  * CppUnitTest is now treated as a escript module (against previous decisions).
  * scons realse builds nor tar/zip files with relvant source code (src and tests in seperate files)

the python tests don't pass yet due to path problems.



Revision 682 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 02:43:09 2006 UTC (13 years ago) by robwdcock
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 11613 byte(s)
Diff to previous 633 , to selected 2358
+ NEW BUILD SYSTEM

This commit contains the new build system with cross-platform support.
Most things work are before though you can have more control.

ENVIRONMENT settings have changed:
+ You no longer require LD_LIBRARY_PATH or PYTHONPATH to point to the
esysroot for building and testing performed via scons
+ ACcESS altix users: It is recommended you change your modules to load
the latest intel compiler and other libraries required by boost to match
the setup in svn (you can override). The correct modules are as follows

module load intel_cc.9.0.026
export
MODULEPATH=${MODULEPATH}:/data/raid2/toolspp4/modulefiles/gcc-3.3.6
module load boost/1.33.0/python-2.4.1
module load python/2.4.1
module load numarray/1.3.3



Revision 633 - (view) (annotate) - [select for diffs]
Modified Thu Mar 23 05:37:00 2006 UTC (13 years ago) by dhawcroft
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 11607 byte(s)
Diff to previous 631 , to selected 2358


Revision 631 - (view) (annotate) - [select for diffs]
Modified Thu Mar 23 04:27:32 2006 UTC (13 years ago) by dhawcroft
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 11607 byte(s)
Diff to previous 584 , to selected 2358
Prepended all paso source files with new Copyright notice

Revision 584 - (view) (annotate) - [select for diffs]
Modified Thu Mar 9 23:03:38 2006 UTC (13 years, 1 month ago) by gross
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 10961 byte(s)
Diff to previous 425 , to selected 2358
eigenvalues: compiles and passes tests on altix now

Revision 425 - (view) (annotate) - [select for diffs]
Modified Tue Jan 10 04:10:39 2006 UTC (13 years, 3 months ago) by gross
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 10012 byte(s)
Diff to previous 415 , to selected 2358
The sparse solver can be called by paso now. 

the building has been change to reduce some code redundancy:
now all scons SCscripts are importing scons/esys_options.py which
imports platform specific settings. 




Revision 415 - (view) (annotate) - [select for diffs]
Modified Wed Jan 4 05:37:33 2006 UTC (13 years, 3 months ago) by gross
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 10018 byte(s)
Diff to previous 155 , to selected 2358
a better way of representing the matrix format type is introduced. this is needed for the Paradiso and UMFPACK interface

Revision 155 - (view) (annotate) - [select for diffs]
Modified Wed Nov 9 02:02:19 2005 UTC (13 years, 5 months ago) by jgs
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 9964 byte(s)
Diff to previous 153 , to selected 2358
move all directories from trunk/esys2 into trunk and remove esys2


Revision 153 - (view) (annotate) - [select for diffs]
Modified Tue Oct 25 01:51:20 2005 UTC (13 years, 5 months ago) by jgs
Original Path: trunk/esys2/paso/src/Solvers/Solver.c
File length: 9964 byte(s)
Diff to previous 150 , to selected 2358
Merge of development branch dev-02 back to main trunk on 2005-10-25


Revision 150 - (view) (annotate) - [select for diffs]
Added Thu Sep 15 03:44:45 2005 UTC (13 years, 7 months ago) by jgs
Original Path: trunk/esys2/paso/src/Solvers/Solver.c
File length: 10060 byte(s)
Diff to selected 2358
Merge of development branch dev-02 back to main trunk on 2005-09-15


This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

  ViewVC Help
Powered by ViewVC 1.1.26