/[escript]/trunk/esysUtils/src/EsysAssert.h
ViewVC logotype

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

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (10 years, 11 months ago) by ksteube
File length: 2246 byte(s)
Diff to previous 1670 , to selected 1388
Copyright updated in all files


Revision 1670 - (view) (annotate) - [select for diffs]
Modified Thu Jul 24 04:30:43 2008 UTC (11 years, 1 month ago) by ksteube
File length: 2281 byte(s)
Diff to previous 1628 , to selected 1388
Fix variable declaration to compile under MPI


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

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 1388 - (view) (annotate) - [selected]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 8 months ago) by trankine
File length: 2234 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, 8 months ago) by trankine
Original Path: temp/esysUtils/src/EsysAssert.h
File length: 2234 byte(s)
Diff to previous 1384 , to selected 1388
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, 8 months ago) by phornby
Original Path: temp_trunk_copy/esysUtils/src/EsysAssert.h
File length: 2234 byte(s)
Diff to previous 1312 , to selected 1388
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, 11 months ago) by ksteube
File length: 2234 byte(s)
Diff to previous 757 , to selected 1388
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, 2 months ago) by woo409
File length: 2443 byte(s)
Diff to previous 644 , to selected 1388
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 644 - (view) (annotate) - [select for diffs]
Modified Fri Mar 24 01:05:42 2006 UTC (13 years, 5 months ago) by elspeth
File length: 2420 byte(s)
Diff to previous 468 , to selected 1388
More copyright.


Revision 468 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 06:50:39 2006 UTC (13 years, 7 months ago) by jgs
File length: 2742 byte(s)
Diff to previous 155 , to selected 1388
reorganised esysUtils to remove inc directory

Revision 155 - (view) (annotate) - [select for diffs]
Modified Wed Nov 9 02:02:19 2005 UTC (13 years, 10 months ago) by jgs
File length: 2743 byte(s)
Diff to previous 102 , to selected 1388
move all directories from trunk/esys2 into trunk and remove esys2


Revision 102 - (view) (annotate) - [select for diffs]
Modified Wed Dec 15 07:08:39 2004 UTC (14 years, 9 months ago) by jgs
Original Path: trunk/esys2/esysUtils/src/EsysAssert.h
File length: 2743 byte(s)
Diff to previous 100 , to selected 1388
*** empty log message ***


Revision 100 - (view) (annotate) - [select for diffs]
Modified Wed Dec 15 03:48:48 2004 UTC (14 years, 9 months ago) by jgs
Original Path: trunk/esys2/esysUtils/src/EsysAssert.h
File length: 2736 byte(s)
Diff to previous 97 , to selected 1388
*** empty log message ***


Revision 97 - (view) (annotate) - [select for diffs]
Modified Tue Dec 14 05:39:33 2004 UTC (14 years, 9 months ago) by jgs
Original Path: trunk/esys2/esysUtils/src/EsysAssert.h
File length: 2743 byte(s)
Diff to previous 82 , to selected 1388
*** empty log message ***


Revision 82 - (view) (annotate) - [select for diffs]
Added Tue Oct 26 06:53:54 2004 UTC (14 years, 10 months ago) by jgs
Original Path: trunk/esys2/esysUtils/src/EsysAssert.h
File length: 2736 byte(s)
Diff to selected 1388
Initial revision


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