/[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 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (11 years, 5 months ago) by phornby
File length: 11622 byte(s)
Diff to previous 1556 , to selected 150

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, 7 months ago) by gross
File length: 12661 byte(s)
Diff to previous 1552 , to selected 150
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 (11 years, 7 months ago) by gross
File length: 12843 byte(s)
Diff to previous 1388 , to selected 150
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, 11 months ago) by trankine
File length: 12938 byte(s)
Diff to previous 1387 , to selected 150
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 11 months ago) by trankine
Original Path: temp/paso/src/Solver.c
File length: 12938 byte(s)
Diff to previous 1384 , to selected 150
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, 11 months ago) by phornby
Original Path: temp_trunk_copy/paso/src/Solver.c
File length: 12938 byte(s)
Diff to previous 1312 , to selected 150
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: 12938 byte(s)
Diff to previous 700 , to selected 150
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, 8 months ago) by gross
File length: 11607 byte(s)
Copied from: trunk/paso/src/Solvers/Solver.c revision 699
Diff to previous 682 , to selected 150
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, 8 months ago) by robwdcock
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 11613 byte(s)
Diff to previous 633 , to selected 150
+ 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/Solver.c
File length: 11607 byte(s)
Diff to previous 631 , to selected 150


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/Solver.c
File length: 11607 byte(s)
Diff to previous 584 , to selected 150
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, 9 months ago) by gross
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 10961 byte(s)
Diff to previous 425 , to selected 150
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, 11 months ago) by gross
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 10012 byte(s)
Diff to previous 415 , to selected 150
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, 11 months ago) by gross
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 10018 byte(s)
Diff to previous 155 , to selected 150
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 (14 years, 1 month ago) by jgs
Original Path: trunk/paso/src/Solvers/Solver.c
File length: 9964 byte(s)
Diff to previous 153 , to selected 150
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 (14 years, 1 month ago) by jgs
Original Path: trunk/esys2/paso/src/Solvers/Solver.c
File length: 9964 byte(s)
Diff to previous 150
Merge of development branch dev-02 back to main trunk on 2005-10-25


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