ViewVC logotype

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

Parent Directory Parent Directory | Revision Log Revision Log

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

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

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

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 1479 - (view) (annotate) - [select for diffs]
Modified Tue Apr 8 02:02:25 2008 UTC (11 years, 2 months ago) by artak
File length: 1375 byte(s)
Diff to previous 1476
Unil.h header is added

Revision 1476 - (view) (annotate) - [select for diffs]
Added Mon Apr 7 23:38:50 2008 UTC (11 years, 2 months ago) by gross
File length: 1358 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