[escript] Log of /trunk/esysUtils/src/esys

Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (14 years, 8 months ago) by phornby
File length: 1184 byte(s)
Copied from: branches/windows_from_1456_trunk_1620_merged_in/esysUtils/src/esys_malloc.h revision 1625
Diff to previous 1621


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 1621 - (view) (annotate) - [select for diffs]
Modified Wed Jul 2 06:56:57 2008 UTC (14 years, 8 months ago) by phornby
Original Path: branches/windows_from_1456_trunk_1620_merged_in/esysUtils/src/esys_malloc.h
File length: 1184 byte(s)
Diff to previous 1612

Prepare to merge latest trunk changen onto a new branch

Revision 1612 - (view) (annotate) - [select for diffs]
Modified Mon Jun 16 14:01:00 2008 UTC (14 years, 9 months ago) by phornby
Original Path: branches/windows_from_1456_trunk_1580_merged_in/esysUtils/src/esys_malloc.h
File length: 1184 byte(s)
Diff to previous 1587

Fix a silly scoping error that made esysUtils::malloc and co.
become recursive. (OOPS). This fixes the DumpAndLoad unit test failures.

Revision 1587 - (view) (annotate) - [select for diffs]
Added Thu Jun 5 05:50:20 2008 UTC (14 years, 9 months ago) by phornby
Original Path: branches/windows_from_1456_trunk_1580_merged_in/esysUtils/src/esys_malloc.h
File length: 1326 byte(s)

define esysUtils::malloc() and friends to dress naked mallocs in C++ code.

Remove unneedded PyObject_NEW macros from Common.h.

Add needed system include files to blocktimer.c

Dress the naked mallocs in DataFactory and DataTagged.

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

Log of /trunk/esysUtils/src/esys_malloc.h