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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 2548 - (view) (annotate) - [select for diffs]
Modified Mon Jul 20 06:20:06 2009 UTC (10 years, 4 months ago) by jfenwick
File length: 8297 byte(s)
Diff to previous 2484 , to selected 155
Updating copyright notices

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

Revision 1986 - (view) (annotate) - [select for diffs]
Modified Thu Nov 6 23:33:14 2008 UTC (11 years ago) by jfenwick
File length: 8298 byte(s)
Diff to previous 1974 , to selected 155
Warning removal

Revision 1974 - (view) (annotate) - [select for diffs]
Modified Thu Nov 6 02:40:10 2008 UTC (11 years ago) by jfenwick
File length: 8281 byte(s)
Diff to previous 1811 , to selected 155
Changing ZERO and ONE in Solver.h to PASO_ZERO and PASO_ONE.
Changed three static vars to #defines

Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (11 years, 1 month ago) by ksteube
File length: 8261 byte(s)
Diff to previous 1630 , to selected 155
Copyright updated in all files


Revision 1630 - (view) (annotate) - [select for diffs]
Modified Sat Jul 12 07:15:32 2008 UTC (11 years, 4 months ago) by trankine
File length: 8296 byte(s)
Diff to previous 1628 , to selected 155
Merge resulted in double declaration.

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

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 (11 years, 6 months ago) by gross
File length: 8264 byte(s)
Diff to previous 1553 , to selected 155
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 1553 - (view) (annotate) - [select for diffs]
Modified Thu May 8 09:38:07 2008 UTC (11 years, 6 months ago) by gross
File length: 8960 byte(s)
Diff to previous 1425 , to selected 155
some small bugs fixed to get MPI going with the modification. MPI version of BiCGStab added.

Revision 1425 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 06:12:04 2008 UTC (11 years, 8 months ago) by artak
File length: 7602 byte(s)
Diff to previous 1388 , to selected 155
Added new test for BiCGStab in run_simplesolve.py
algorithmic change in BICGSTAB: from r=r-wt to r=s-wt


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

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 10 months ago) by trankine
Original Path: temp/paso/src/BiCGStab.c
File length: 7597 byte(s)
Diff to previous 1384 , to selected 155
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, 10 months ago) by phornby
Original Path: temp_trunk_copy/paso/src/BiCGStab.c
File length: 7597 byte(s)
Diff to previous 1312 , to selected 155
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 (12 years, 2 months ago) by ksteube
File length: 7597 byte(s)
Diff to previous 1028 , to selected 155
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 1028 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 00:15:24 2007 UTC (12 years, 8 months ago) by gross
File length: 8221 byte(s)
Diff to previous 940 , to selected 155
modifications to be compliant with _WIN32. The substitutes for asinh, acosh, atanh are still missing (erf will through an exception)

Revision 940 - (view) (annotate) - [select for diffs]
Modified Mon Jan 29 00:09:08 2007 UTC (12 years, 9 months ago) by gross
File length: 8227 byte(s)
Diff to previous 929 , to selected 155
ivdep removed as it produces wrong results with OPenMP

Revision 929 - (view) (annotate) - [select for diffs]
Modified Wed Jan 17 07:41:13 2007 UTC (12 years, 10 months ago) by gross
File length: 8441 byte(s)
Diff to previous 700 , to selected 155
reverse orientation added but does not work for 2D yet.

Revision 700 - (view) (annotate) - [select for diffs]
Modified Thu Apr 6 00:13:40 2006 UTC (13 years, 7 months ago) by gross
File length: 8148 byte(s)
Copied from: trunk/paso/src/Solvers/BiCGStab.c revision 699
Diff to previous 682 , to selected 155
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, 7 months ago) by robwdcock
Original Path: trunk/paso/src/Solvers/BiCGStab.c
File length: 8154 byte(s)
Diff to previous 633 , to selected 155
+ 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, 8 months ago) by dhawcroft
Original Path: trunk/paso/src/Solvers/BiCGStab.c
File length: 8148 byte(s)
Diff to previous 631 , to selected 155


Revision 631 - (view) (annotate) - [select for diffs]
Modified Thu Mar 23 04:27:32 2006 UTC (13 years, 8 months ago) by dhawcroft
Original Path: trunk/paso/src/Solvers/BiCGStab.c
File length: 8148 byte(s)
Diff to previous 584 , to selected 155
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, 8 months ago) by gross
Original Path: trunk/paso/src/Solvers/BiCGStab.c
File length: 7503 byte(s)
Diff to previous 415 , to selected 155
eigenvalues: compiles and passes tests on altix now

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

Revision 155 - (view) (annotate) - [selected]
Modified Wed Nov 9 02:02:19 2005 UTC (14 years ago) by jgs
Original Path: trunk/paso/src/Solvers/BiCGStab.c
File length: 7453 byte(s)
Diff to previous 150
move all directories from trunk/esys2 into trunk and remove esys2


Revision 150 - (view) (annotate) - [select for diffs]
Added Thu Sep 15 03:44:45 2005 UTC (14 years, 2 months ago) by jgs
Original Path: trunk/esys2/paso/src/Solvers/BiCGStab.c
File length: 7453 byte(s)
Diff to selected 155
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