/[escript]/branches/arrayview_from_1695_trunk/finley/src/NodeFile_setTags.c
ViewVC logotype

Log of /branches/arrayview_from_1695_trunk/finley/src/NodeFile_setTags.c

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Revision:

Revision 1781 - (view) (annotate) - [select for diffs]
Modified Thu Sep 11 05:03:14 2008 UTC (10 years, 8 months ago) by jfenwick
File length: 1671 byte(s)
Diff to previous 1696 , to selected 767
Branch commit

Merged changes from trunk version 1695 up to and including version 1779.



Revision 1696 - (view) (annotate) - [select for diffs]
Modified Mon Aug 11 03:33:40 2008 UTC (10 years, 9 months ago) by jfenwick
File length: 1626 byte(s)
Diff to previous 1628 , to selected 767
Branching to perform experiments on removing DataArrayView


Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (10 years, 10 months ago) by phornby
Original Path: trunk/finley/src/NodeFile_setTags.c
File length: 1626 byte(s)
Diff to previous 1388 , to selected 767

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 (11 years, 4 months ago) by trankine
Original Path: trunk/finley/src/NodeFile_setTags.c
File length: 1659 byte(s)
Diff to previous 1387 , to selected 767
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 4 months ago) by trankine
Original Path: temp/finley/src/NodeFile_setTags.c
File length: 1659 byte(s)
Diff to previous 1384 , to selected 767
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, 4 months ago) by phornby
Original Path: temp_trunk_copy/finley/src/NodeFile_setTags.c
File length: 1659 byte(s)
Diff to previous 1312 , to selected 767
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, 7 months ago) by ksteube
Original Path: trunk/finley/src/NodeFile_setTags.c
File length: 1659 byte(s)
Diff to previous 1028 , to selected 767
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 1028 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 00:15:24 2007 UTC (12 years, 2 months ago) by gross
Original Path: trunk/finley/src/NodeFile_setTags.c
File length: 1909 byte(s)
Diff to previous 767
modifications to be compliant with _WIN32. The substitutes for asinh, acosh, atanh are still missing (erf will through an exception)

Revision 767 - (view) (annotate) - [selected]
Added Fri Jun 30 07:29:08 2006 UTC (12 years, 10 months ago) by gross
Original Path: trunk/finley/src/NodeFile_setTags.c
File length: 1895 byte(s)
new FunctionSpace method setTags added

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