/[escript]/branches/arrayview_from_1695_trunk/escript/src/DataAbstract.cpp
ViewVC logotype

Log of /branches/arrayview_from_1695_trunk/escript/src/DataAbstract.cpp

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1747 - (view) (annotate) - [select for diffs]
Modified Wed Sep 3 04:56:50 2008 UTC (11 years, 3 months ago) by jfenwick
File length: 6370 byte(s)
Diff to previous 1726
Branch commit.

Current status, this version compiles as passes run_tests (haven't tried 
all_tests), provided that the following files are moved out of the way:

DataAlgorithmAdapterTestCase.h 
DataTaggedTestCase.cpp 
DataTestCase.cpp 
DataTaggedTestCase.h

(They are not run by the unit tests at the moment).

I will fix those next.




Revision 1726 - (view) (annotate) - [select for diffs]
Modified Tue Aug 26 03:33:34 2008 UTC (11 years, 3 months ago) by jfenwick
File length: 6047 byte(s)
Diff to previous 1721
BinaryOp and UnaryOp - modified to accept the extra parameters required 
to operate without DataArrayView.  There are still a few parallel 
methods which accept them as params.

Added getVector() members to DataAbstract - these versions will throw.
DataC.cpp - uses new method to get the shape.
Added constant form of getVector() to DataConstant
Fixed the #include protection on DataMaths.h



Revision 1721 - (view) (annotate) - [select for diffs]
Modified Fri Aug 22 00:39:32 2008 UTC (11 years, 3 months ago) by jfenwick
File length: 5772 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, 3 months ago) by jfenwick
File length: 5748 byte(s)
Diff to previous 1712
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 1712 - (view) (annotate) - [select for diffs]
Modified Wed Aug 20 05:04:28 2008 UTC (11 years, 3 months ago) by jfenwick
File length: 5493 byte(s)
Diff to previous 1704
Branch commit.

Finished first pass of Data.h - There is still a constructor which takes 
a DataArrayView as a parameter. Apart from that, there are no direct 
references to DataArrayView.

DataTagged has a new constructor for copying just the tags from an 
existing object.
DataTypes:: now has a scalarShape constant (to avoid creating one 
everytime you create a scalar).




Revision 1704 - (view) (annotate) - [select for diffs]
Modified Thu Aug 14 05:35:32 2008 UTC (11 years, 4 months ago) by jfenwick
File length: 5443 byte(s)
Diff to previous 1698
Branch commit:

DataTagged::addTag() = Add a tag with default value. (All uses that I can find 
apart from test code only require this anyway).

DataAbstract now knows its own shape, rank and number of values and have accessors 
for them.
Data Objects also have acessors for these but query their DataAbstracts for the 
answers.

Data::getDataAtOffset() = access to a particular point in the underlying array. (At 
the moment this call references the DataArrayView, but that will change when I have 
everything else working).

DataTagged::getDataByTag() = same but search by tag.
DataTagged::getDefaultValue() = returns default value without obvious reference to 
DataArrayView


C_GeneralTensorProduct_J  is my temporary copy of C_GeneralTensorProduct for 
experimentation.
It and a number of other temporary functions live in JoelMods.cpp_ for now.



Revision 1698 - (view) (annotate) - [select for diffs]
Modified Tue Aug 12 01:13:16 2008 UTC (11 years, 4 months ago) by jfenwick
File length: 5081 byte(s)
Diff to previous 1696
Branch commit DO NOT PANIC.

Moved shapeToString and noValues from DataArrayView to 
DataTypes{.h,.cpp}



Revision 1696 - (view) (annotate) - [select for diffs]
Modified Mon Aug 11 03:33:40 2008 UTC (11 years, 4 months ago) by jfenwick
File length: 5089 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, 8 months ago) by gross
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 5089 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, 11 months ago) by trankine
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 5022 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, 11 months ago) by trankine
Original Path: temp/escript/src/DataAbstract.cpp
File length: 5022 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, 11 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/DataAbstract.cpp
File length: 5022 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, 2 months ago) by ksteube
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 5022 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, 7 months ago) by gross
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 5155 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, 10 months ago) by gross
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 5042 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, 10 months ago) by gross
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 5508 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, 11 months ago) by gross
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 5313 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, 11 months ago) by gross
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 5089 byte(s)
Diff to previous 804
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 804 - (view) (annotate) - [select for diffs]
Modified Thu Aug 10 01:12:16 2006 UTC (13 years, 4 months ago) by gross
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 4837 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, 4 months ago) by gross
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 4825 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, 5 months ago) by ksteube
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 4690 byte(s)
Diff to previous 615
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 615 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:12:00 2006 UTC (13 years, 8 months ago) by elspeth
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 4122 byte(s)
Diff to previous 576
More copyright information.


Revision 576 - (view) (annotate) - [select for diffs]
Modified Fri Mar 3 08:28:42 2006 UTC (13 years, 9 months ago) by gross
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 4444 byte(s)
Diff to previous 480
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, 10 months ago) by jgs
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 4106 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, 10 months ago) by jgs
Original Path: trunk/escript/src/DataAbstract.cpp
File length: 4146 byte(s)
Copied from: trunk/escript/src/Data/DataAbstract.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 (14 years, 1 month ago) by jgs
Original Path: trunk/escript/src/Data/DataAbstract.cpp
File length: 4172 byte(s)
Diff to previous 149
move all directories from trunk/esys2 into trunk and remove esys2


Revision 149 - (view) (annotate) - [select for diffs]
Modified Thu Sep 1 03:31:39 2005 UTC (14 years, 3 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataAbstract.cpp
File length: 4172 byte(s)
Diff to previous 126
Merge of development branch dev-02 back to main trunk on 2005-09-01


Revision 126 - (view) (annotate) - [select for diffs]
Modified Fri Jul 22 03:53:08 2005 UTC (14 years, 4 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataAbstract.cpp
File length: 4002 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, 5 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataAbstract.cpp
File length: 3822 byte(s)
Diff to previous 119
Merge of development branch back to main trunk on 2005-07-08


Revision 119 - (view) (annotate) - [select for diffs]
Modified Tue Apr 12 04:45:05 2005 UTC (14 years, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataAbstract.cpp
File length: 3531 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, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataAbstract.cpp
File length: 3438 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, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataAbstract.cpp
File length: 3498 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, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataAbstract.cpp
File length: 3024 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, 1 month ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataAbstract.cpp
File length: 2984 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