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

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

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, 4 months ago) by phornby
File length: 55396 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) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 10 months ago) by trankine
File length: 54218 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, 10 months ago) by trankine
Original Path: temp/escript/src/DataArrayView.h
File length: 54218 byte(s)
Diff to previous 1384
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, 10 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/DataArrayView.h
File length: 54218 byte(s)
Diff to previous 1312
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: 54218 byte(s)
Diff to previous 1030
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 1030 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 05:14:44 2007 UTC (12 years, 8 months ago) by phornby
File length: 54353 byte(s)
Diff to previous 950
Assemble_CopyElementData.c - resolve with my local edits.
Mesh_saveVTK.c - remove debug print.
DataArrayView.h - remove dllim/export declarations on template functions.



Revision 950 - (view) (annotate) - [select for diffs]
Modified Tue Feb 6 07:01:11 2007 UTC (12 years, 9 months ago) by gross
File length: 54501 byte(s)
Diff to previous 804
escript data objects can now be saved to netCDF files, see http://www.unidata.ucar.edu/software/netcdf/.
Currently only constant data are implemented with expanded and tagged data to follow.
There are two new functions to dump a data object

   s=Data(...)
   s.dump(<filename>)

and to recover it

   s=load(<filename>, domain)

Notice that the function space of s is recovered but domain is still need. 

dump and load will replace archive and extract.

The installation needs now the netCDF installed. 



Revision 804 - (view) (annotate) - [select for diffs]
Modified Thu Aug 10 01:12:16 2006 UTC (13 years, 3 months ago) by gross
File length: 54471 byte(s)
Diff to previous 800
the new function swap_axes + tests added. (It replaces swap).



Revision 800 - (view) (annotate) - [select for diffs]
Modified Tue Aug 8 11:23:18 2006 UTC (13 years, 3 months ago) by gross
File length: 52849 byte(s)
Diff to previous 775
new function _swap. Python wrapper + testing is still missing.



Revision 775 - (view) (annotate) - [select for diffs]
Modified Mon Jul 10 04:00:08 2006 UTC (13 years, 4 months ago) by ksteube
File length: 49720 byte(s)
Diff to previous 757
Modified the following python methods in escript/py_src/util.py to
call faster C++ methods:
	escript_trace
	escript_transpose
	escript_symmetric
	escript_nonsymmetric


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


Revision 682 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 02:43:09 2006 UTC (13 years, 7 months ago) by robwdcock
File length: 39267 byte(s)
Diff to previous 615
+ NEW BUILD SYSTEM

This commit contains the new build system with cross-platform support.
Most things work are before though you can have more control.

ENVIRONMENT settings have changed:
+ You no longer require LD_LIBRARY_PATH or PYTHONPATH to point to the
esysroot for building and testing performed via scons
+ ACcESS altix users: It is recommended you change your modules to load
the latest intel compiler and other libraries required by boost to match
the setup in svn (you can override). The correct modules are as follows

module load intel_cc.9.0.026
export
MODULEPATH=${MODULEPATH}:/data/raid2/toolspp4/modulefiles/gcc-3.3.6
module load boost/1.33.0/python-2.4.1
module load python/2.4.1
module load numarray/1.3.3



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


Revision 584 - (view) (annotate) - [select for diffs]
Modified Thu Mar 9 23:03:38 2006 UTC (13 years, 8 months ago) by gross
File length: 39579 byte(s)
Diff to previous 583
eigenvalues: compiles and passes tests on altix now

Revision 583 - (view) (annotate) - [select for diffs]
Modified Wed Mar 8 08:15:34 2006 UTC (13 years, 8 months ago) by gross
File length: 39742 byte(s)
Diff to previous 580
_eigenvalues_and_eigenvector method added of data object. the algorithm has been tested on floats in python but not on data objects.

Revision 580 - (view) (annotate) - [select for diffs]
Modified Wed Mar 8 05:45:51 2006 UTC (13 years, 8 months ago) by gross
File length: 37960 byte(s)
Diff to previous 576
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, 8 months ago) by gross
File length: 34958 byte(s)
Diff to previous 478
some steps towards eigenvalue and eigenvector calculation

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


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


Revision 468 - (view) (annotate) - [select for diffs]
Modified Wed Jan 25 06:50:39 2006 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/escript/src/Data/DataArrayView.h
File length: 34804 byte(s)
Diff to previous 155
reorganised esysUtils to remove inc directory

Revision 155 - (view) (annotate) - [select for diffs]
Modified Wed Nov 9 02:02:19 2005 UTC (14 years ago) by jgs
Original Path: trunk/escript/src/Data/DataArrayView.h
File length: 34814 byte(s)
Diff to previous 147
move all directories from trunk/esys2 into trunk and remove esys2


Revision 147 - (view) (annotate) - [select for diffs]
Modified Fri Aug 12 01:45:47 2005 UTC (14 years, 3 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.h
File length: 34814 byte(s)
Diff to previous 126
erge of development branch dev-02 back to main trunk on 2005-08-12


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.h
File length: 34591 byte(s)
Diff to previous 121
Merge of development branch back to main trunk on 2005-07-22


Revision 121 - (view) (annotate) - [select for diffs]
Modified Fri May 6 04:26:16 2005 UTC (14 years, 6 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.h
File length: 34413 byte(s)
Diff to previous 117
Merge of development branch back to main trunk on 2005-05-06


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


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


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


Revision 106 - (view) (annotate) - [select for diffs]
Modified Thu Dec 23 07:20:12 2004 UTC (14 years, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.h
File length: 26797 byte(s)
Diff to previous 102
*** empty log message ***


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


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


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


Revision 82 - (view) (annotate) - [select for diffs]
Added Tue Oct 26 06:53:54 2004 UTC (15 years ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataArrayView.h
File length: 23726 byte(s)
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