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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

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


Revision 1636 - (view) (annotate) - [select for diffs]
Modified Mon Jul 14 03:40:22 2008 UTC (11 years, 7 months ago) by trankine
File length: 12966 byte(s)
Diff to previous 1628 , to selected 633
somehow, this was not correctly merged from the branch??

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

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) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (12 years, 1 month ago) by trankine
File length: 13038 byte(s)
Diff to previous 1387 , to selected 633
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (12 years, 1 month ago) by trankine
Original Path: temp/paso/src/mmio.c
File length: 13038 byte(s)
Diff to previous 1384 , to selected 633
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 (12 years, 1 month ago) by phornby
Original Path: temp_trunk_copy/paso/src/mmio.c
File length: 13038 byte(s)
Diff to previous 1312 , to selected 633
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 (12 years, 5 months ago) by ksteube
File length: 13038 byte(s)
Diff to previous 757 , to selected 633
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, 8 months ago) by woo409
File length: 13255 byte(s)
Diff to previous 633
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 633 - (view) (annotate) - [selected]
Modified Thu Mar 23 05:37:00 2006 UTC (13 years, 11 months ago) by dhawcroft
File length: 13273 byte(s)
Diff to previous 631


Revision 631 - (view) (annotate) - [select for diffs]
Modified Thu Mar 23 04:27:32 2006 UTC (13 years, 11 months ago) by dhawcroft
File length: 13273 byte(s)
Diff to previous 618 , to selected 633
Prepended all paso source files with new Copyright notice

Revision 618 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 04:02:38 2006 UTC (13 years, 11 months ago) by gross
File length: 12628 byte(s)
Copied from: trunk/tools/mmio/src/mmio.c revision 617
Diff to previous 155 , to selected 633
mmio moced to paso

Revision 155 - (view) (annotate) - [select for diffs]
Modified Wed Nov 9 02:02:19 2005 UTC (14 years, 3 months ago) by jgs
Original Path: trunk/tools/mmio/src/mmio.c
File length: 12628 byte(s)
Diff to previous 82 , to selected 633
move all directories from trunk/esys2 into trunk and remove esys2


Revision 82 - (view) (annotate) - [select for diffs]
Added Tue Oct 26 06:53:54 2004 UTC (15 years, 4 months ago) by jgs
Original Path: trunk/esys2/tools/mmio/src/mmio.c
File length: 12628 byte(s)
Diff to selected 633
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