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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

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: 6261 byte(s)
Diff to previous 1628
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: 6261 byte(s)
Diff to previous 1524

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 1524 - (view) (annotate) - [select for diffs]
Modified Wed Apr 23 05:31:54 2008 UTC (11 years, 7 months ago) by phornby
File length: 6238 byte(s)
Diff to previous 1512
replace

abs -> fabs.

Shoot me an e-mail if this is the wrong thing.



Revision 1512 - (view) (annotate) - [select for diffs]
Modified Tue Apr 15 00:54:25 2008 UTC (11 years, 7 months ago) by ksteube
File length: 6220 byte(s)
Diff to previous 1478
Some typos


Revision 1478 - (view) (annotate) - [select for diffs]
Modified Tue Apr 8 01:53:33 2008 UTC (11 years, 7 months ago) by gross
File length: 6219 byte(s)
Diff to previous 1477
some more header file fixing

Revision 1477 - (view) (annotate) - [select for diffs]
Modified Tue Apr 8 01:50:17 2008 UTC (11 years, 7 months ago) by gross
File length: 6219 byte(s)
Diff to previous 1476
missing header file included

Revision 1476 - (view) (annotate) - [select for diffs]
Added Mon Apr 7 23:38:50 2008 UTC (11 years, 7 months ago) by gross
File length: 6204 byte(s)
Jacobian-free Newton method added to Paso

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