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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1981 - (view) (annotate) - [select for diffs]
Modified Thu Nov 6 05:27:33 2008 UTC (11 years ago) by jfenwick
File length: 15254 byte(s)
Diff to previous 1811 , to selected 1556
More warning removal.


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: 15216 byte(s)
Diff to previous 1642 , to selected 1556
Copyright updated in all files


Revision 1642 - (view) (annotate) - [select for diffs]
Modified Tue Jul 15 05:21:57 2008 UTC (11 years, 4 months ago) by phornby
File length: 15315 byte(s)
Diff to previous 1639 , to selected 1556
make the 1st arg of the ...._call(const double alpha,....
consistent between the .h and .c file. The const is not really needed.

Revision 1639 - (view) (annotate) - [select for diffs]
Modified Mon Jul 14 08:55:25 2008 UTC (11 years, 4 months ago) by gross
File length: 15266 byte(s)
Diff to previous 1637 , to selected 1556


Revision 1637 - (view) (annotate) - [select for diffs]
Modified Mon Jul 14 05:34:59 2008 UTC (11 years, 4 months ago) by ksteube
File length: 15116 byte(s)
Diff to previous 1628 , to selected 1556
Resolved some compiler warnings
Changed blocktimer to not use strdup, intead malloc and strcpy


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: 15054 byte(s)
Diff to previous 1571 , to selected 1556

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 1571 - (view) (annotate) - [select for diffs]
Modified Sat May 24 22:28:33 2008 UTC (11 years, 5 months ago) by gross
File length: 15129 byte(s)
Diff to previous 1570 , to selected 1556
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, 5 months ago) by gross
File length: 15156 byte(s)
Diff to previous 1565 , to selected 1556
modifications to PCG to support dynamic scheduling

Revision 1565 - (view) (annotate) - [select for diffs]
Modified Thu May 22 10:19:47 2008 UTC (11 years, 6 months ago) by gross
File length: 15599 byte(s)
Diff to previous 1564 , to selected 1556
some small fixes for openmp

Revision 1564 - (view) (annotate) - [select for diffs]
Modified Thu May 22 09:31:33 2008 UTC (11 years, 6 months ago) by gross
File length: 16092 byte(s)
Diff to previous 1556
some openmp dynamic scheduling for MVM.

Revision 1556 - (view) (annotate) - [selected]
Modified Mon May 12 00:54:58 2008 UTC (11 years, 6 months ago) by gross
File length: 13501 byte(s)
Diff to previous 1511
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 1511 - (view) (annotate) - [select for diffs]
Modified Mon Apr 14 23:09:38 2008 UTC (11 years, 7 months ago) by gross
File length: 13665 byte(s)
Diff to previous 1388 , to selected 1556
some fixes of compiler complains under windows

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: 13685 byte(s)
Diff to previous 1387 , to selected 1556
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/SparseMatrix_MatrixVector.c
File length: 13685 byte(s)
Diff to previous 1384 , to selected 1556
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/SparseMatrix_MatrixVector.c
File length: 13685 byte(s)
Diff to previous 1315 , to selected 1556
Make a temp copy of the trunk before checking in the windows changes



Revision 1315 - (view) (annotate) - [select for diffs]
Added Tue Sep 25 02:41:13 2007 UTC (12 years, 1 month ago) by ksteube
File length: 13685 byte(s)
Diff to selected 1556
Copied more files from MPI branch to trunk


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