/[escript]/trunk/escript/src/DataArrayView.cpp
ViewVC logotype

Log of /trunk/escript/src/DataArrayView.cpp

Parent Directory Parent Directory | Revision Log Revision Log


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

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

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 1455 - (view) (annotate) - [select for diffs]
Modified Thu Feb 28 17:19:44 2008 UTC (11 years, 7 months ago) by phornby
File length: 29337 byte(s)
Diff to previous 1388 , to selected 474
Merge of branches/windows_from_1431_trunk.

Revamp of the exception system.
Fix unused vars and signed/unsigned comparisons.
defined a macro THROW(ARG) in the system_dep.h's to
deal with the expectations of declarations on different architectures.

Details in the logs of branches/windows_from_1431_trunk.

pre-merge snapshot of the trunk in tags/trunk_at_1452



Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 9 months ago) by trankine
File length: 26114 byte(s)
Diff to previous 1387 , to selected 474
And get the *(&(*&(* name right

Revision 1387 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:26 2008 UTC (11 years, 9 months ago) by trankine
Original Path: temp/escript/src/DataArrayView.cpp
File length: 26114 byte(s)
Diff to previous 1384 , to selected 474
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, 9 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/DataArrayView.cpp
File length: 26114 byte(s)
Diff to previous 1312 , to selected 474
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, 1 month ago) by ksteube
File length: 26114 byte(s)
Diff to previous 1137 , to selected 474
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 1137 - (view) (annotate) - [select for diffs]
Modified Thu May 10 08:11:31 2007 UTC (12 years, 5 months ago) by gross
File length: 26272 byte(s)
Diff to previous 856 , to selected 474
This version passes the tests on windows except for 

   * vtk
   * netCDF

The version needs to be tested on altix and linux

Revision 856 - (view) (annotate) - [select for diffs]
Modified Tue Sep 26 01:00:36 2006 UTC (13 years ago) by gross
File length: 26248 byte(s)
Diff to previous 757 , to selected 474
data print shows now the element reference number

Revision 757 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (13 years, 3 months ago) by woo409
File length: 26248 byte(s)
Diff to previous 615 , to selected 474
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 615 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:12:00 2006 UTC (13 years, 7 months ago) by elspeth
File length: 26250 byte(s)
Diff to previous 580 , to selected 474
More copyright information.


Revision 580 - (view) (annotate) - [select for diffs]
Modified Wed Mar 8 05:45:51 2006 UTC (13 years, 7 months ago) by gross
File length: 26572 byte(s)
Diff to previous 576 , to selected 474
faster version of the local eigenvalue calculation

Revision 576 - (view) (annotate) - [select for diffs]
Modified Fri Mar 3 08:28:42 2006 UTC (13 years, 7 months ago) by gross
File length: 27767 byte(s)
Diff to previous 480 , to selected 474
some steps towards eigenvalue and eigenvector calculation

Revision 480 - (view) (annotate) - [select for diffs]
Modified Wed Feb 1 05:15:12 2006 UTC (13 years, 8 months ago) by jgs
File length: 26572 byte(s)
Diff to previous 478 , to selected 474
rationalise #includes and forward declarations


Revision 478 - (view) (annotate) - [select for diffs]
Modified Tue Jan 31 02:21:49 2006 UTC (13 years, 8 months ago) by jgs
File length: 26645 byte(s)
Diff to previous 474
rationalise #includes


Revision 474 - (view) (annotate) - [selected]
Modified Mon Jan 30 04:23:44 2006 UTC (13 years, 8 months ago) by jgs
File length: 26489 byte(s)
Copied from: trunk/escript/src/Data/DataArrayView.cpp revision 469
Diff to previous 155
restructure escript source tree
move src/Data/* -> src
remove inc
modify #includes and cpppath settings accordingly


Revision 155 - (view) (annotate) - [select for diffs]
Modified Wed Nov 9 02:02:19 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/escript/src/Data/DataArrayView.cpp
File length: 26671 byte(s)
Diff to previous 126 , to selected 474
move all directories from trunk/esys2 into trunk and remove esys2


Revision 126 - (view) (annotate) - [select for diffs]
Modified Fri Jul 22 03:53:08 2005 UTC (14 years, 3 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.cpp
File length: 26671 byte(s)
Diff to previous 122 , to selected 474
Merge of development branch back to main trunk on 2005-07-22


Revision 122 - (view) (annotate) - [select for diffs]
Modified Thu Jun 9 05:38:05 2005 UTC (14 years, 4 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.cpp
File length: 26681 byte(s)
Diff to previous 117 , to selected 474
Merge of development branch back to main trunk on 2005-06-09


Revision 117 - (view) (annotate) - [select for diffs]
Modified Fri Apr 1 05:48:57 2005 UTC (14 years, 6 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.cpp
File length: 26526 byte(s)
Diff to previous 113 , to selected 474
*** empty log message ***


Revision 113 - (view) (annotate) - [select for diffs]
Modified Mon Feb 28 07:06:33 2005 UTC (14 years, 7 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.cpp
File length: 26586 byte(s)
Diff to previous 108 , to selected 474
*** empty log message ***


Revision 108 - (view) (annotate) - [select for diffs]
Modified Thu Jan 27 06:21:59 2005 UTC (14 years, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.cpp
File length: 26212 byte(s)
Diff to previous 102 , to selected 474
*** empty log message ***


Revision 102 - (view) (annotate) - [select for diffs]
Modified Wed Dec 15 07:08:39 2004 UTC (14 years, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.cpp
File length: 23197 byte(s)
Diff to previous 100 , to selected 474
*** empty log message ***


Revision 100 - (view) (annotate) - [select for diffs]
Modified Wed Dec 15 03:48:48 2004 UTC (14 years, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.cpp
File length: 19310 byte(s)
Diff to previous 97 , to selected 474
*** empty log message ***


Revision 97 - (view) (annotate) - [select for diffs]
Modified Tue Dec 14 05:39:33 2004 UTC (14 years, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.cpp
File length: 23197 byte(s)
Diff to previous 82 , to selected 474
*** empty log message ***


Revision 82 - (view) (annotate) - [select for diffs]
Added Tue Oct 26 06:53:54 2004 UTC (14 years, 11 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.cpp
File length: 19310 byte(s)
Diff to selected 474
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