/[escript]/branches/arrayview_from_1695_trunk/escript/src/DataExpanded.h
ViewVC logotype

Log of /branches/arrayview_from_1695_trunk/escript/src/DataExpanded.h

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1724 - (view) (annotate) - [select for diffs]
Modified Mon Aug 25 05:38:57 2008 UTC (10 years, 11 months ago) by jfenwick
File length: 12144 byte(s)
Diff to previous 1721
Branch commit

Moved createShapeErrorMessage() into DataTypes.h
Modified functions in DataAlgorithm.h to use non-DataArrayView accesses.

Added getVector() to each of DataTagged, DataConstant, DataExpanded - This method returns 
the underlying DataVector by reference/constant reference. Note that this method does not 
exist in DataAbstract so (at the momement) in order to pull the data from something you 
need to know what you are looking at. (Lower level access is still possible via double* 
though).

DataTagged now has a getOffsetForTag method and a getDefaultOffset method.

DataMaths.h - A new file containing the reductionOps etc from DataArrayView (but without 
requiring DAV).
This file requires significant commenting improvements.



Revision 1721 - (view) (annotate) - [select for diffs]
Modified Fri Aug 22 00:39:32 2008 UTC (11 years ago) by jfenwick
File length: 11934 byte(s)
Diff to previous 1715
Branch commit.

Fixed problems with copyFromNumArray
Removed version of setTaggedValueFromCPP() which required DataArrayView.
Updated tests.



Revision 1715 - (view) (annotate) - [select for diffs]
Modified Thu Aug 21 04:52:14 2008 UTC (11 years ago) by jfenwick
File length: 11913 byte(s)
Diff to previous 1697
Branch commit.

Moved getSliceRegionLoopRange and checkShape into DataTypes.h
Some work on methods to set/addTaggedValues without using DataArrayView.
To do this I added copyFromNumArray() on DataVector (It buggy at the 
moment).

This build passes the tests but only because copyFromNumArray is not 
used.



Revision 1697 - (view) (annotate) - [select for diffs]
Modified Mon Aug 11 06:29:54 2008 UTC (11 years ago) by jfenwick
File length: 11532 byte(s)
Diff to previous 1696
Moved ValueType, ShapeType, RegionType, RegionLoopRangeType and maxRank
From DataArrayView.h to DataTypes.h

This is a simple rename but did require modifying a lot of files.



Revision 1696 - (view) (annotate) - [select for diffs]
Modified Mon Aug 11 03:33:40 2008 UTC (11 years ago) by jfenwick
File length: 11568 byte(s)
Diff to previous 1487
Branching to perform experiments on removing DataArrayView


Revision 1487 - (view) (annotate) - [select for diffs]
Modified Thu Apr 10 05:28:01 2008 UTC (11 years, 4 months ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 11568 byte(s)
Diff to previous 1388
reordering when reading Netcfd files added.

Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 7 months ago) by trankine
Original Path: trunk/escript/src/DataExpanded.h
File length: 11256 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, 7 months ago) by trankine
Original Path: temp/escript/src/DataExpanded.h
File length: 11256 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, 7 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/DataExpanded.h
File length: 11256 byte(s)
Diff to previous 1358
Make a temp copy of the trunk before checking in the windows changes



Revision 1358 - (view) (annotate) - [select for diffs]
Modified Wed Dec 5 03:41:06 2007 UTC (11 years, 8 months ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 11256 byte(s)
Diff to previous 1312
setTaggedValue works now for expanded data.

Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (11 years, 11 months ago) by ksteube
Original Path: trunk/escript/src/DataExpanded.h
File length: 10925 byte(s)
Diff to previous 1118
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 1118 - (view) (annotate) - [select for diffs]
Modified Tue Apr 24 08:55:04 2007 UTC (12 years, 4 months ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 11059 byte(s)
Diff to previous 964
problem with reset of faulty PDE rhs fixed.

Revision 964 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 05:10:26 2007 UTC (12 years, 6 months ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 10958 byte(s)
Diff to previous 950
The set/getRefVal functions of Data objects have been removed (mainly to avoid later problems with MPI).
Moreover, a faster access to the reference id of samples has been introduced. I don't think that anybody will
profit form this at this stage but it will allow a faster dump of data objects.



Revision 950 - (view) (annotate) - [select for diffs]
Modified Tue Feb 6 07:01:11 2007 UTC (12 years, 6 months ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 12714 byte(s)
Diff to previous 922
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 922 - (view) (annotate) - [select for diffs]
Modified Fri Jan 5 04:23:05 2007 UTC (12 years, 7 months ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 12546 byte(s)
Diff to previous 921
setValueOfDataPoint accepts double value as argument now

Revision 921 - (view) (annotate) - [select for diffs]
Modified Fri Jan 5 00:54:37 2007 UTC (12 years, 7 months ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 12050 byte(s)
Diff to previous 854
I have done some clarification on functions that allow to access individual data point values in a Data object. 
The term "data point number" is always local on a MPI process and referes to the value (data_point_in_sample, sample)
as a single identifyer (data_point_in_sample + sample * number_data_points_per_sample). a "global data point number"
referes to a tuple of a processour id and local data point number.

The function convertToNumArrayFromSampleNo has been removed now and convertToNumArrayFromDPNo renamed to getValueOfDataPoint.
There are two new functions:

   getNumberOfDataPoints
   setValueOfDataPoint

This allows you to do things like:

  in=Data(..)
  out=Data(..)
   for i in xrange(in.getNumberOfDataPoints())
       in_loc=in.getValueOfDataPoint(i)
       out_loc=< some operations on in_loc>
       out.setValueOfDataPoint(i,out_loc)


Also mindp  is renamed to  minGlobalDataPoint and there is a new function getValueOfGlobalDataPoint. While in MPI the functions getNumberOfDataPoints and getValueOfDataPoint are working locally on each process (so the code above is executed in parallel).
the latter allows getting a single value across all processors. 



Revision 854 - (view) (annotate) - [select for diffs]
Modified Thu Sep 21 05:29:42 2006 UTC (12 years, 11 months ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 11547 byte(s)
Diff to previous 804
Some modifications to the binary operations +,-,*/, pow. 
The code is a bit simpler now and more efficient has there is
no reseising required now. the resizing method has been removed as
it is very, very inefficient. Even serial code should be faster now.
It is now forbidden to do an inplace update of scalar data object with an object 
of rank >0 as this is very slow (and does not make much sense). 



Revision 804 - (view) (annotate) - [select for diffs]
Modified Thu Aug 10 01:12:16 2006 UTC (13 years ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 11808 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 ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 11813 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, 1 month ago) by ksteube
Original Path: trunk/escript/src/DataExpanded.h
File length: 11547 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, 1 month ago) by woo409
Original Path: trunk/escript/src/DataExpanded.h
File length: 10828 byte(s)
Diff to previous 615
+ 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, 5 months ago) by elspeth
Original Path: trunk/escript/src/DataExpanded.h
File length: 10426 byte(s)
Diff to previous 580
More copyright information.


Revision 580 - (view) (annotate) - [select for diffs]
Modified Wed Mar 8 05:45:51 2006 UTC (13 years, 5 months ago) by gross
Original Path: trunk/escript/src/DataExpanded.h
File length: 10748 byte(s)
Diff to previous 480
faster version of the local eigenvalue calculation

Revision 480 - (view) (annotate) - [select for diffs]
Modified Wed Feb 1 05:15:12 2006 UTC (13 years, 6 months ago) by jgs
Original Path: trunk/escript/src/DataExpanded.h
File length: 9969 byte(s)
Diff to previous 474
rationalise #includes and forward declarations


Revision 474 - (view) (annotate) - [select for diffs]
Modified Mon Jan 30 04:23:44 2006 UTC (13 years, 6 months ago) by jgs
Original Path: trunk/escript/src/DataExpanded.h
File length: 10093 byte(s)
Copied from: trunk/escript/src/Data/DataExpanded.h 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, 9 months ago) by jgs
Original Path: trunk/escript/src/Data/DataExpanded.h
File length: 10093 byte(s)
Diff to previous 126
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, 1 month ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataExpanded.h
File length: 10093 byte(s)
Diff to previous 123
Merge of development branch back to main trunk on 2005-07-22


Revision 123 - (view) (annotate) - [select for diffs]
Modified Fri Jul 8 04:08:13 2005 UTC (14 years, 1 month ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataExpanded.h
File length: 9506 byte(s)
Diff to previous 122
Merge of development branch back to main trunk on 2005-07-08


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


Revision 119 - (view) (annotate) - [select for diffs]
Modified Tue Apr 12 04:45:05 2005 UTC (14 years, 4 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataExpanded.h
File length: 8793 byte(s)
Diff to previous 117
*** empty log message ***


Revision 117 - (view) (annotate) - [select for diffs]
Modified Fri Apr 1 05:48:57 2005 UTC (14 years, 4 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataExpanded.h
File length: 8298 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, 5 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataExpanded.h
File length: 7447 byte(s)
Diff to previous 110
*** empty log message ***


Revision 110 - (view) (annotate) - [select for diffs]
Modified Mon Feb 14 04:14:42 2005 UTC (14 years, 6 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataExpanded.h
File length: 7440 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, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataExpanded.h
File length: 5755 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, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataExpanded.h
File length: 5582 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, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataExpanded.h
File length: 5755 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 (14 years, 9 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataExpanded.h
File length: 5582 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