/[escript]/branches/arrexp_trunk2098/paso/src/PCG.c
ViewVC logotype

Log of /branches/arrexp_trunk2098/paso/src/PCG.c

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Revision:

Revision 2111 - (view) (annotate) - [select for diffs]
Modified Mon Dec 1 01:16:18 2008 UTC (10 years, 6 months ago) by jfenwick
File length: 13658 byte(s)
Diff to previous 1981
Doin' some experiments


Revision 1981 - (view) (annotate) - [select for diffs]
Modified Thu Nov 6 05:27:33 2008 UTC (10 years, 7 months ago) by jfenwick
Original Path: trunk/paso/src/PCG.c
File length: 13658 byte(s)
Diff to previous 1974
More warning removal.


Revision 1974 - (view) (annotate) - [select for diffs]
Modified Thu Nov 6 02:40:10 2008 UTC (10 years, 7 months ago) by jfenwick
Original Path: trunk/paso/src/PCG.c
File length: 13611 byte(s)
Diff to previous 1811
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 (10 years, 9 months ago) by ksteube
Original Path: trunk/paso/src/PCG.c
File length: 13591 byte(s)
Diff to previous 1628
Copyright updated in all files


Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (10 years, 11 months ago) by phornby
Original Path: trunk/paso/src/PCG.c
File length: 13626 byte(s)
Diff to previous 1579

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 1579 - (view) (annotate) - [select for diffs]
Modified Mon Jun 2 08:48:36 2008 UTC (11 years ago) by ksteube
Original Path: trunk/paso/src/PCG.c
File length: 13206 byte(s)
Diff to previous 1572
Fix typo in PCG.c
Improvement of build options for Savanna, ac.apac.edu, shake71


Revision 1572 - (view) (annotate) - [select for diffs]
Modified Mon May 26 12:50:56 2008 UTC (11 years, 1 month ago) by gross
Original Path: trunk/paso/src/PCG.c
File length: 13207 byte(s)
Diff to previous 1571
some openmp problems in PCG fixed.

Revision 1571 - (view) (annotate) - [select for diffs]
Modified Sat May 24 22:28:33 2008 UTC (11 years, 1 month ago) by gross
Original Path: trunk/paso/src/PCG.c
File length: 13101 byte(s)
Diff to previous 1570
fixes for OPenmp but PCG still does not work under openmp


Revision 1570 - (view) (annotate) - [select for diffs]
Modified Sat May 24 21:31:04 2008 UTC (11 years, 1 month ago) by gross
Original Path: trunk/paso/src/PCG.c
File length: 12931 byte(s)
Diff to previous 1556
modifications to PCG to support dynamic scheduling

Revision 1556 - (view) (annotate) - [select for diffs]
Modified Mon May 12 00:54:58 2008 UTC (11 years, 1 month ago) by gross
Original Path: trunk/paso/src/PCG.c
File length: 8022 byte(s)
Diff to previous 1388
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 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 5 months ago) by trankine
Original Path: trunk/paso/src/PCG.c
File length: 8620 byte(s)
Diff to previous 1387
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 5 months ago) by trankine
Original Path: temp/paso/src/PCG.c
File length: 8620 byte(s)
Diff to previous 1384
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, 5 months ago) by phornby
Original Path: temp_trunk_copy/paso/src/PCG.c
File length: 8620 byte(s)
Diff to previous 1312
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, 9 months ago) by ksteube
Original Path: trunk/paso/src/PCG.c
File length: 8620 byte(s)
Diff to previous 757
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 757 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (13 years ago) by woo409
Original Path: trunk/paso/src/PCG.c
File length: 7881 byte(s)
Diff to previous 700
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


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


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

Revision 495 - (view) (annotate) - [select for diffs]
Modified Mon Feb 6 06:32:06 2006 UTC (13 years, 4 months ago) by gross
Original Path: trunk/paso/src/Solvers/PCG.c
File length: 6638 byte(s)
Diff to previous 415
performance monitoring added. complies without PAPI.

Revision 415 - (view) (annotate) - [select for diffs]
Modified Wed Jan 4 05:37:33 2006 UTC (13 years, 5 months ago) by gross
Original Path: trunk/paso/src/Solvers/PCG.c
File length: 6324 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) - [select for diffs]
Modified Wed Nov 9 02:02:19 2005 UTC (13 years, 7 months ago) by jgs
Original Path: trunk/paso/src/Solvers/PCG.c
File length: 6312 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 (13 years, 9 months ago) by jgs
Original Path: trunk/esys2/paso/src/Solvers/PCG.c
File length: 6312 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