/[escript]/trunk/escriptcore/src/Data.h
ViewVC logotype

Log of /trunk/escriptcore/src/Data.h

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 6168 - (view) (annotate) - [select for diffs]
Modified Wed Apr 13 03:08:12 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 58799 byte(s)
Diff to previous 6159
Making Lazy and the rest of escript use the same operator enumeration



Revision 6159 - (view) (annotate) - [select for diffs]
Modified Fri Apr 8 06:22:04 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 58802 byte(s)
Diff to previous 6125
Non-backwards compatible change!

The way the Data constructor operates from python has been changed.
  Data(v, shape, functionspace, expand=True)
no longer works.
The keyword part is not allowed now.
This used to work automatically because boost recognised the name
and allowed use as a keyword.
To get complex to work, we now take (object, object, object, object)
and workout what the args mean in the function (which means keywords
are out).

Adds some additional tests for complex.


Revision 6125 - (view) (annotate) - [select for diffs]
Modified Tue Apr 5 04:12:13 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 58424 byte(s)
Diff to previous 6112
Fix incorrect behaviour of anti-symmetric for scalars.

Also add hermitian and antihermitian.
Very quick check looks ok but really not tested yet.


Revision 6112 - (view) (annotate) - [select for diffs]
Modified Thu Mar 31 09:40:10 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 58121 byte(s)
Diff to previous 6110
Relicense all the things!



Revision 6110 - (view) (annotate) - [select for diffs]
Modified Thu Mar 31 06:31:03 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 58131 byte(s)
Diff to previous 6107
Rename nonsymetric to antisymmetric.

nonsymmetric is now an alias to antisymmetric.
At some stage later, we can try to remove nonsymmetric



Revision 6107 - (view) (annotate) - [select for diffs]
Modified Thu Mar 31 00:47:21 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 58129 byte(s)
Diff to previous 6102
Use tags in test


Revision 6102 - (view) (annotate) - [select for diffs]
Modified Wed Mar 30 05:00:20 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 57943 byte(s)
Diff to previous 6098
Add some missing functions.

There may be others


Revision 6098 - (view) (annotate) - [select for diffs]
Modified Tue Mar 29 02:21:44 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 56712 byte(s)
Diff to previous 6097
Remove "within object" checks for sharing from normal codepath

Something about the way the checks were being done, slowed things down.
Now, you will only get those checks if you define SLOWSHARECHECK



Revision 6097 - (view) (annotate) - [select for diffs]
Modified Sun Mar 27 03:31:00 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 56642 byte(s)
Diff to previous 6088
Tricky race condition hidden in duplicate code

Not sure now why I needed two paths for this.



Revision 6088 - (view) (annotate) - [select for diffs]
Modified Wed Mar 23 00:44:58 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 56472 byte(s)
Diff to previous 6086
Removing old shared tracking


Revision 6086 - (view) (annotate) - [select for diffs]
Modified Tue Mar 22 09:54:51 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 57054 byte(s)
Diff to previous 6084
Trying to switch over to using shared_ptr.use_count()

Let's see how the buildbot likes it


Revision 6084 - (view) (annotate) - [select for diffs]
Modified Tue Mar 22 04:23:02 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 57007 byte(s)
Diff to previous 6083
Renaming headers for (hopefully) easier understanding



Revision 6083 - (view) (annotate) - [select for diffs]
Modified Tue Mar 22 03:30:18 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 57003 byte(s)
Diff to previous 6082
Removing the DataMaths namespace


Revision 6082 - (view) (annotate) - [select for diffs]
Modified Tue Mar 22 02:57:49 2016 UTC (2 years, 4 months ago) by jfenwick
File length: 57019 byte(s)
Diff to previous 6075
More cleanup

Moving some includes around.
The plan is to rename some includes to better reflect their purpose.
Removing inheritance from std::binary_function   (since that is deprecated).
Replacing some doubles with real_t.



Revision 6075 - (view) (annotate) - [select for diffs]
Modified Fri Mar 18 06:30:04 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 57287 byte(s)
Diff to previous 6074
More code removal and test fixing.

A number of operations were tested via binaryOp
and unaryOp rather than via Data methods.
   I hope these operations 
are tested elsewhere.



Revision 6074 - (view) (annotate) - [select for diffs]
Modified Fri Mar 18 02:42:48 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 53722 byte(s)
Diff to previous 6066
Starting to remove dead code.

DataAlgorithmAdapter is only used by the code which tests it.


Revision 6066 - (view) (annotate) - [select for diffs]
Modified Tue Mar 15 06:42:55 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 53849 byte(s)
Diff to previous 6064
Code path conversions.

TestDomain can now return a JMPI.
Some tests now use TestDomain (didn't want to undo all that work
from before I found the ASSERT fix).
Moving more code to new path.
Commenting out a bunch of old ops.



Revision 6064 - (view) (annotate) - [select for diffs]
Modified Mon Mar 14 01:06:18 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 53840 byte(s)
Diff to previous 6061
Data::hasNoSamples()  now actually looks at how many samples we have.




Revision 6061 - (view) (annotate) - [select for diffs]
Modified Fri Mar 11 04:40:28 2016 UTC (2 years, 5 months ago) by caltinay
File length: 53828 byte(s)
Diff to previous 6060
Undoing the switch to use MPI-aware assert in Data.h because some
functions are only called from a subset of ranks which would then
cause definite hangs due to the error reduction operation. We need
to find a better way of dealing with this.


Revision 6060 - (view) (annotate) - [select for diffs]
Modified Fri Mar 11 02:51:26 2016 UTC (2 years, 5 months ago) by caltinay
File length: 54380 byte(s)
Diff to previous 6048
added an MPI-aware version of ESYS_ASSERT and replaced suitable places.
This will not fix the current buildbot hang as that is within a block
where we don't have a JMPI intance.


Revision 6048 - (view) (annotate) - [select for diffs]
Modified Wed Mar 9 07:34:47 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 53828 byte(s)
Diff to previous 6047
Relocating binaryDataOp to Data.cpp



Revision 6047 - (view) (annotate) - [select for diffs]
Modified Wed Mar 9 07:25:42 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 56848 byte(s)
Diff to previous 6038
Removing code some code not used by new path



Revision 6038 - (view) (annotate) - [select for diffs]
Modified Wed Mar 9 01:32:00 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 108829 byte(s)
Diff to previous 6024
Bug fixes and function for unary ops.

This commit does not actually switch the alternate functionality on.
I'll do that separately


Revision 6024 - (view) (annotate) - [select for diffs]
Modified Fri Mar 4 04:14:27 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 108731 byte(s)
Diff to previous 6001
Fixing testing.

Pulling alernative binary op skeleton.


Revision 6001 - (view) (annotate) - [select for diffs]
Modified Tue Mar 1 05:01:49 2016 UTC (2 years, 5 months ago) by caltinay
File length: 108401 byte(s)
Diff to previous 5997
Bye bye esysUtils.
Also removed first.h as escript/DataTypes.h is now required everywhere
and fulfills that role by including a boost python header first.


Revision 5997 - (view) (annotate) - [select for diffs]
Modified Mon Feb 29 07:24:47 2016 UTC (2 years, 5 months ago) by caltinay
File length: 108332 byte(s)
Diff to previous 5992
moved esys MPI to escript.


Revision 5992 - (view) (annotate) - [select for diffs]
Modified Fri Feb 26 23:55:23 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 111104 byte(s)
Diff to previous 5991
Enable hasNaN and replaceNaN for complex


Revision 5991 - (view) (annotate) - [select for diffs]
Modified Fri Feb 26 23:11:08 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 110841 byte(s)
Diff to previous 5985
Enabling more ops for complex

Commenting out the templated C_TensorUnaryOperation.
Want to remove the equivalent binary versions as well


Revision 5985 - (view) (annotate) - [select for diffs]
Modified Fri Feb 26 02:21:44 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 110836 byte(s)
Diff to previous 5972
Adding #define for namespace on dynamic_pointer_cast<>

Also for static_pointer_cast<>
The plan is to make it easy to switch between boost::
and std::  for shared_ptr

This will be important if we start to rely on more recent
share_ptr features (guaranteed to be in c++11 not necessarily in boost)


Revision 5972 - (view) (annotate) - [select for diffs]
Modified Wed Feb 24 04:05:30 2016 UTC (2 years, 5 months ago) by caltinay
File length: 110826 byte(s)
Diff to previous 5960
Major rework of our exceptions. We now have specific
AssertException
NotImplementedError
ValueError
which translate to the corresponding python exception type.
I have gone through a few places and replaced things but not everywhere.



Revision 5960 - (view) (annotate) - [select for diffs]
Modified Mon Feb 22 05:37:05 2016 UTC (2 years, 5 months ago) by jfenwick
File length: 110905 byte(s)
Diff to previous 5945
Support for setting data point values.


Revision 5945 - (view) (annotate) - [select for diffs]
Modified Fri Feb 19 02:25:44 2016 UTC (2 years, 6 months ago) by jfenwick
File length: 110806 byte(s)
Diff to previous 5938
Can now take .real() and .imag() on all types.

imag() on real is not especially efficient.
May want to look at how the local ops are called to
see if we can reduce the loop overhead (given that each call
incurs a switch() cost now).


Revision 5938 - (view) (annotate) - [select for diffs]
Modified Thu Feb 18 06:30:35 2016 UTC (2 years, 6 months ago) by jfenwick
File length: 110714 byte(s)
Diff to previous 5923
Merging from 5937 on the complex branch

Some parts of complex work but all of it is
not unit tested and it is certainly not feature
complete (I haven't put any time into dealing with
subworld for complex).

The other important aspect of this merge is that
c++11 is now required to build escript.



Revision 5923 - (view) (annotate) - [select for diffs]
Modified Mon Feb 15 03:39:22 2016 UTC (2 years, 6 months ago) by jfenwick
File length: 99887 byte(s)
Diff to previous 5863
Enable d+=d

Seems like an obscure case but it failed because
,in order to allow for possible interpolation, it
created a temporary object which looked to the lazy
system as if the data was suddenly shared.



Revision 5863 - (view) (annotate) - [select for diffs]
Modified Wed Jan 13 02:25:48 2016 UTC (2 years, 7 months ago) by jfenwick
File length: 99577 byte(s)
Diff to previous 5778
Copyright dates updated.
\version for doxygen to read


Revision 5778 - (view) (annotate) - [select for diffs]
Modified Mon Aug 10 05:43:52 2015 UTC (3 years ago) by jduplessis
File length: 99577 byte(s)
Diff to previous 5731
added bessel function of first and second kind


Revision 5731 - (view) (annotate) - [select for diffs]
Modified Thu Jul 9 02:27:37 2015 UTC (3 years, 1 month ago) by jfenwick
File length: 99024 byte(s)
Diff to previous 5679
An attempt to provide some prior warning about situations described in issue#309.
If -DEXWRITECHK is defined, any attempt to get RW access to a data object
without requireWrite() will throw an exception.

This does not ultimately address the issue of dirac but will hopefully
catch problems.


Revision 5679 - (view) (annotate) - [select for diffs]
Modified Tue Jun 23 01:52:59 2015 UTC (3 years, 1 month ago) by jfenwick
File length: 98756 byte(s)
Diff to previous 5593
More informative error messages for people acting on DataEmpty

Revision 5593 - (view) (annotate) - [select for diffs]
Modified Fri Apr 24 01:36:26 2015 UTC (3 years, 3 months ago) by jfenwick
File length: 98678 byte(s)
Diff to previous 5480
Fixing institution name to comply with policy

Revision 5480 - (view) (annotate) - [select for diffs]
Modified Wed Feb 18 04:35:50 2015 UTC (3 years, 6 months ago) by jfenwick
File length: 98674 byte(s)
Diff to previous 5448
Stage 1 of removing escriptDataC



Revision 5448 - (view) (annotate) - [select for diffs]
Modified Fri Feb 6 05:31:37 2015 UTC (3 years, 6 months ago) by jfenwick
File length: 98956 byte(s)
Diff to previous 5256
Updating all the dates

Revision 5256 - (view) (annotate) - [select for diffs]
Modified Tue Nov 11 03:18:41 2014 UTC (3 years, 9 months ago) by jfenwick
File length: 98956 byte(s)
Diff to previous 5056
Doesn't work yet but getting some subworld changes in.


Revision 5056 - (view) (annotate) - [select for diffs]
Modified Fri Jun 20 01:37:28 2014 UTC (4 years, 2 months ago) by jduplessis
File length: 98720 byte(s)
Diff to previous 4998
replace nan stuff

Revision 4998 - (view) (annotate) - [select for diffs]
Modified Thu Jun 5 06:03:08 2014 UTC (4 years, 2 months ago) by jduplessis
File length: 98610 byte(s)
Diff to previous 4934
implemented hasNaN


Revision 4934 - (view) (annotate) - [select for diffs]
Modified Tue May 13 00:28:11 2014 UTC (4 years, 3 months ago) by jfenwick
File length: 98369 byte(s)
Diff to previous 4759
This commit is brought to you by the number 4934 and the tool "meld".
Merge of partially complete split world code from branch.




Revision 4759 - (view) (annotate) - [select for diffs]
Modified Mon Mar 17 07:52:26 2014 UTC (4 years, 5 months ago) by jfenwick
File length: 97719 byte(s)
Diff to previous 4758
Throw TypeError on any attempt to use relational ops on Data, FunctionSpace and Domain.  Also fixes a type error in run_mappings.py but the test still fails.

Revision 4758 - (view) (annotate) - [select for diffs]
Modified Mon Mar 17 05:00:27 2014 UTC (4 years, 5 months ago) by sshaw
File length: 98375 byte(s)
Diff to previous 4687
fixed classname typo for AcousticVelocityMapping, added exceptions for ordered comparisons with Data objects from python (#107)

Revision 4687 - (view) (annotate) - [select for diffs]
Modified Wed Feb 19 00:03:29 2014 UTC (4 years, 6 months ago) by jfenwick
File length: 97719 byte(s)
Diff to previous 4657
Remove randomFill python method from ripley domains.
All random data objects (for all domain types) should be generated 
using esys.escript.RandomData()

The only filtered random we have is gaussian on ripley but
it is triggered by passing the tuple as the last arg of RandomData().

While the interface is a bit more complicated (in that you always need
 to pass in shape and functionspace) it does mean we have a 
common interface for all domains. 

Removed randomFill from DataExpanded.
The reasoning behind this is to force domains to call the util function
themselves and enforce whatever consistancy requirements they have.

Added version of blocktools to deal with 2D case in Ripley.
Use blocktools for the 2D transfers [This was cleaner than modifying the
previous implementation to deal with variable shaped points].

Note that under MPI, ripley can not generate random data (even unfiltered)
if any of its per rank dimensions is <4 elements on any side.

Unit tests for these calls are in but some extra checks still needed.




Revision 4657 - (view) (annotate) - [select for diffs]
Modified Thu Feb 6 06:12:20 2014 UTC (4 years, 6 months ago) by jfenwick
File length: 97985 byte(s)
Diff to previous 4621
I changed some files.
Updated copyright notices, added GeoComp.




Revision 4621 - (view) (annotate) - [select for diffs]
Modified Thu Jan 16 10:07:44 2014 UTC (4 years, 7 months ago) by jfenwick
File length: 97917 byte(s)
Diff to previous 4521
getSampleDataRO is now const

Revision 4521 - (view) (annotate) - [select for diffs]
Modified Mon Aug 26 11:51:30 2013 UTC (4 years, 11 months ago) by jfenwick
File length: 97905 byte(s)
Diff to previous 4507
Remove bool_t
Part of random.



Revision 4507 - (view) (annotate) - [select for diffs]
Modified Wed Jul 24 02:50:22 2013 UTC (5 years ago) by jfenwick
File length: 97332 byte(s)
Diff to previous 4478
It begins

Revision 4478 - (view) (annotate) - [select for diffs]
Modified Thu Jun 20 06:34:02 2013 UTC (5 years, 2 months ago) by caltinay
Original Path: trunk/escript/src/Data.h
File length: 97332 byte(s)
Diff to previous 4441
Moved appendRankToFilename to header within namespace to remove code duplication
and fixed memory leaks this way.


Revision 4441 - (view) (annotate) - [select for diffs]
Modified Fri Jun 7 02:23:49 2013 UTC (5 years, 2 months ago) by caltinay
Original Path: trunk/escript/src/Data.h
File length: 97469 byte(s)
Diff to previous 4346
finley now uses Data objects directly instead of going through the C wrapper.


Revision 4346 - (view) (annotate) - [select for diffs]
Modified Tue Apr 2 04:46:45 2013 UTC (5 years, 4 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 96666 byte(s)
Diff to previous 4255
Bringing the changes from doubleplusgood branch.
Can't merge directly because svn doesn't transfer changes to renamed files (mutter grumble).

Revision 4255 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 03:06:21 2013 UTC (5 years, 5 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 96700 byte(s)
Diff to previous 4154
Hopefully, this will address the interpolation problems.

New canInterpolate() function exposed to python which calls probeInterpolation

AbstractDomain now has an additional virtual.
preferredIntrpolationOnDomain()

This will return 0 if interpolation is impossible, 1 if possible and preferred.
It will return -1 if interpolation is possible and preferred in the 
oposite direction.

A value of -1 does not say that the proposed interpolation is possible or not.
Rather it indicates "please use the other way".
If you really _need_ to test it that way, use probeInterpolationOnDomain 



Revision 4154 - (view) (annotate) - [select for diffs]
Modified Tue Jan 22 09:30:23 2013 UTC (5 years, 6 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 96176 byte(s)
Diff to previous 4114
Round 1 of copyright fixes

Revision 4114 - (view) (annotate) - [select for diffs]
Modified Fri Dec 14 04:24:46 2012 UTC (5 years, 8 months ago) by caltinay
Original Path: trunk/escript/src/Data.h
File length: 96176 byte(s)
Diff to previous 4085
Time to remove deprecated saveVTK/DX methods from Data and Domain.


Revision 4085 - (view) (annotate) - [select for diffs]
Modified Tue Nov 20 07:04:11 2012 UTC (5 years, 9 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 96464 byte(s)
Diff to previous 3992
nonuniformInterolate and Slope added.
Doco later


Revision 3992 - (view) (annotate) - [select for diffs]
Modified Wed Sep 26 02:50:48 2012 UTC (5 years, 10 months ago) by caltinay
Original Path: trunk/escript/src/Data.h
File length: 96215 byte(s)
Diff to previous 3981
Data.cpp: Removed some namespace ambiguities which fixes doxygen warnings, some
cleanup and reindent.
*: doxygen fixes.


Revision 3981 - (view) (annotate) - [select for diffs]
Modified Fri Sep 21 02:47:54 2012 UTC (5 years, 11 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 96219 byte(s)
Diff to previous 3911
First pass of updating copyright notices

Revision 3911 - (view) (annotate) - [select for diffs]
Modified Thu Jun 14 01:01:03 2012 UTC (6 years, 2 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 96100 byte(s)
Diff to previous 3678
Copyright changes

Revision 3678 - (view) (annotate) - [select for diffs]
Modified Thu Nov 17 06:32:05 2011 UTC (6 years, 9 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 96100 byte(s)
Diff to previous 3675
Reversing other changes which made it in somehow


Revision 3675 - (view) (annotate) - [select for diffs]
Modified Thu Nov 17 00:53:38 2011 UTC (6 years, 9 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 96203 byte(s)
Diff to previous 3574
pasowrap joins the trunk.


Revision 3574 - (view) (annotate) - [select for diffs]
Modified Fri Sep 2 07:19:31 2011 UTC (6 years, 11 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 96100 byte(s)
Diff to previous 3514
Added setValue to locator.
Some unit tests added but they aren't being triggered for some reason


Revision 3514 - (view) (annotate) - [select for diffs]
Modified Thu May 19 04:48:34 2011 UTC (7 years, 3 months ago) by caltinay
Original Path: trunk/escript/src/Data.h
File length: 95938 byte(s)
Diff to previous 3506
Fixed __truediv__ and added __rtruediv__ for new python division operator.


Revision 3506 - (view) (annotate) - [select for diffs]
Modified Wed May 11 01:59:45 2011 UTC (7 years, 3 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 95549 byte(s)
Diff to previous 3505
Use VSL if MKLRANDOM is defined.
Use different seeds for different ranks/threads.
Use different seeds for successive calls with no seed given.


Revision 3505 - (view) (annotate) - [select for diffs]
Modified Fri Apr 29 07:09:45 2011 UTC (7 years, 3 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 95553 byte(s)
Diff to previous 3504
arithmetic operations now return NotImplemented if they don't know what to do.
Fixes mantis issue #54


Revision 3504 - (view) (annotate) - [select for diffs]
Modified Thu Apr 28 12:55:05 2011 UTC (7 years, 3 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 95033 byte(s)
Diff to previous 3470
Move arithmetic ops into explicitly named methods

Revision 3470 - (view) (annotate) - [select for diffs]
Modified Mon Mar 14 03:50:49 2011 UTC (7 years, 5 months ago) by caltinay
Original Path: trunk/escript/src/Data.h
File length: 94092 byte(s)
Diff to previous 3468
Fix for mantis issue 591 (added __truediv__ methods to Data class).



Revision 3468 - (view) (annotate) - [select for diffs]
Modified Tue Feb 22 06:38:57 2011 UTC (7 years, 5 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 93559 byte(s)
Diff to previous 3390
Made constructors more efficient.
Only has a very minor affect on performance

Revision 3390 - (view) (annotate) - [select for diffs]
Modified Thu Dec 2 00:34:37 2010 UTC (7 years, 8 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 93400 byte(s)
Diff to previous 3368
RandomData added


Revision 3368 - (view) (annotate) - [select for diffs]
Modified Fri Nov 19 05:59:46 2010 UTC (7 years, 9 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 93076 byte(s)
Diff to previous 3259
3d interpolateTable support.
New more generic interface for table interpolation.
tests and doco updated

Revision 3259 - (view) (annotate) - [select for diffs]
Modified Mon Oct 11 01:48:14 2010 UTC (7 years, 10 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92595 byte(s)
Diff to previous 3032
Merging dudley and scons updates from branches


Revision 3032 - (view) (annotate) - [select for diffs]
Modified Mon May 31 02:58:15 2010 UTC (8 years, 2 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92584 byte(s)
Diff to previous 3031
Add work around for windows not liking chained X::Y::Z.
TestDomain now supports tags and getX.
This is to allow testing for some features without invoking finley


Revision 3031 - (view) (annotate) - [select for diffs]
Modified Thu May 27 04:04:33 2010 UTC (8 years, 2 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92523 byte(s)
Diff to previous 2926
Adding condEval function to Data.
Unit tests and a different name to follow.

Revision 2926 - (view) (annotate) - [select for diffs]
Modified Thu Feb 4 23:13:53 2010 UTC (8 years, 6 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92312 byte(s)
Diff to previous 2881
Attempting to fix a problem with windows linking in the ironically named INKNOWWHATIMDOING section


Revision 2881 - (view) (annotate) - [select for diffs]
Modified Thu Jan 28 02:03:15 2010 UTC (8 years, 6 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92296 byte(s)
Diff to previous 2827
Don't panic.
Updating copyright stamps


Revision 2827 - (view) (annotate) - [select for diffs]
Modified Fri Dec 18 03:41:09 2009 UTC (8 years, 8 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92296 byte(s)
Diff to previous 2785
There is now a mechanism to pass a C function into escript and invoke it on each datapoint with:

applyBinaryCFunction

Warning in order to use this function your escript must be compiled with 
scons ...  iknowwhatimdoing=yes

---------------------
Because this code relies on casts that the C standard does not allow some code has been moved into Dodgy{.h .cpp}

Scons files have been modified to treat these files specially [Warnings are not errors for these files.]

Revision 2785 - (view) (annotate) - [select for diffs]
Modified Thu Nov 26 05:17:40 2009 UTC (8 years, 8 months ago) by lgao
Original Path: trunk/escript/src/Data.h
File length: 92024 byte(s)
Diff to previous 2783
Minor fix for unused variables



Revision 2783 - (view) (annotate) - [select for diffs]
Modified Thu Nov 26 05:07:33 2009 UTC (8 years, 8 months ago) by lgao
Original Path: trunk/escript/src/Data.h
File length: 92080 byte(s)
Diff to previous 2771
process C_TensorBinaryOperation at the level of a whole sample rather than 
each datapoint when an Expanded data is operating with a Constant data. This
could improve the efficiency of the non-lazy version escipt. 



Revision 2771 - (view) (annotate) - [select for diffs]
Modified Wed Nov 25 01:38:49 2009 UTC (8 years, 8 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 91818 byte(s)
Diff to previous 2770
Fix


Revision 2770 - (view) (annotate) - [select for diffs]
Modified Wed Nov 25 01:24:51 2009 UTC (8 years, 8 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 91778 byte(s)
Diff to previous 2742
Removed buffer implementation of Lazy.
Removed supporting Alloc/Free Sample buffer calls.

Revision 2742 - (view) (annotate) - [select for diffs]
Modified Thu Nov 12 06:03:37 2009 UTC (8 years, 9 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92968 byte(s)
Diff to previous 2735
Merging changes from the lapack branch.

The inverse() operation has been moved into c++. [No lazy support for this operation yet.]
Optional Lapack support has been added for matrices larger than 3x3. 
service0 is set to use mkl_lapack.




Revision 2735 - (view) (annotate) - [select for diffs]
Modified Mon Nov 2 02:03:24 2009 UTC (8 years, 9 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92869 byte(s)
Diff to previous 2723
Fixed bug where calling minval() reintroduced laziness after it had been removed.


Revision 2723 - (view) (annotate) - [select for diffs]
Modified Sun Oct 18 23:44:37 2009 UTC (8 years, 10 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92652 byte(s)
Diff to previous 2721
Use correct types for MPI op parameters


Revision 2721 - (view) (annotate) - [select for diffs]
Modified Fri Oct 16 05:40:12 2009 UTC (8 years, 10 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92590 byte(s)
Diff to previous 2716
minval and maxval are now lazy operations (they weren't before).
Whether or not Lsup, sup and inf resolve their arguments before computing answers is controlled by the escriptParam 'RESOLVE_COLLECTIVE'.
Note: integrate() still forces a resolve.

Added some unit tests for operations which weren't tested before.
Added deepcopy implementations for lazy operations which got missed somehow.

Revision 2716 - (view) (annotate) - [select for diffs]
Modified Tue Oct 13 04:58:08 2009 UTC (8 years, 10 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92507 byte(s)
Diff to previous 2668
Small mod - process C_Tensor??Operation on ExpandedData as a whole 
sample rather than a datapoint at a time.
This is just to bring Non-Lazy into line with Lazy.


Revision 2668 - (view) (annotate) - [select for diffs]
Modified Thu Sep 17 04:04:09 2009 UTC (8 years, 11 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 92412 byte(s)
Diff to previous 2646
some clarification in the table interpolation

Revision 2646 - (view) (annotate) - [select for diffs]
Modified Fri Sep 4 00:13:00 2009 UTC (8 years, 11 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92324 byte(s)
Diff to previous 2644
Unit tests and user doco for interpolation and saveCSV

Revision 2644 - (view) (annotate) - [select for diffs]
Modified Wed Sep 2 04:14:03 2009 UTC (8 years, 11 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 91882 byte(s)
Diff to previous 2635
Add unit tests for saveDataCSV which should be ready for use now.
Keyword args are now output in sorted order.

Removed some unneeded functions.

Revision 2635 - (view) (annotate) - [select for diffs]
Modified Thu Aug 27 04:54:41 2009 UTC (8 years, 11 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92132 byte(s)
Diff to previous 2628
A bunch of changes related to saveDataCSV.
[Not completed or unit tested yet]

Added saveDataCSV to util.py
AbstractDomain (and MeshAdapter) have a commonFunctionSpace method to 
take a group of FunctionSpaces and return something they can all be interpolated to.

Added pointToStream() in DataTypes to help print points.

added actsConstant() to data - required because DataConstant doesn't store samples the same way other Data do.

Revision 2628 - (view) (annotate) - [select for diffs]
Modified Tue Aug 25 03:50:00 2009 UTC (8 years, 11 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 91880 byte(s)
Diff to previous 2548
Fixed linkage on getTestDomainFunctionSpace.

added Data.interpolateTable to perform 2D interpolation.
It needs better unit tests though.

Revision 2548 - (view) (annotate) - [select for diffs]
Modified Mon Jul 20 06:20:06 2009 UTC (9 years, 1 month ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 91481 byte(s)
Diff to previous 2521
Updating copyright notices

Revision 2521 - (view) (annotate) - [select for diffs]
Modified Tue Jul 7 00:08:58 2009 UTC (9 years, 1 month ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 91481 byte(s)
Diff to previous 2519
Modified Lazy so that resolving a single sample uses the node cache method.
Fixed some doxygen problems.

Revision 2519 - (view) (annotate) - [select for diffs]
Modified Mon Jul 6 00:43:08 2009 UTC (9 years, 1 month ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92125 byte(s)
Diff to previous 2476
Correcting some doxygen errors

Revision 2476 - (view) (annotate) - [select for diffs]
Modified Wed Jun 17 04:42:13 2009 UTC (9 years, 2 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92132 byte(s)
Diff to previous 2465
Added maxGlobalDataPoint.
Not currently unit tested.

Revision 2465 - (view) (annotate) - [select for diffs]
Modified Tue Jun 9 05:01:36 2009 UTC (9 years, 2 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 91578 byte(s)
Diff to previous 2459
Changed the default behaviour of Data::toListOfTuples() so that scalars are returned in tuples.
This is to match the behaviour of getTupleForDataPoint.

Revision 2459 - (view) (annotate) - [select for diffs]
Modified Thu Jun 4 06:17:54 2009 UTC (9 years, 2 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 91577 byte(s)
Diff to previous 2458
Removed some commented out code.
Added toListOfTuples to the DataObject.

Revision 2458 - (view) (annotate) - [select for diffs]
Modified Wed Jun 3 06:18:21 2009 UTC (9 years, 2 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92778 byte(s)
Diff to previous 2455
Various numarray erasures


Revision 2455 - (view) (annotate) - [select for diffs]
Modified Wed Jun 3 03:29:07 2009 UTC (9 years, 2 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 92766 byte(s)
Diff to previous 2271
Merging changes from numpy branch.


Revision 2271 - (view) (annotate) - [select for diffs]
Modified Mon Feb 16 05:08:29 2009 UTC (9 years, 6 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 93041 byte(s)
Diff to previous 2105
Merging version 2269 to trunk


Revision 2105 - (view) (annotate) - [select for diffs]
Modified Fri Nov 28 01:52:12 2008 UTC (9 years, 8 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 91062 byte(s)
Diff to previous 2005
Data::copySelf() now returns an object instead of a pointer.
Fixed a bug in copyFromArray relating to expanded data.

Revision 2005 - (view) (annotate) - [select for diffs]
Modified Mon Nov 10 01:21:39 2008 UTC (9 years, 9 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 91063 byte(s)
Diff to previous 1952
Bringing all changes across from schroedinger.
(Note this does not mean development is done, just that it will happen
on the trunk for now).
If anyone notices any problems please contact me.



Revision 1952 - (view) (annotate) - [select for diffs]
Modified Thu Oct 30 06:16:00 2008 UTC (9 years, 9 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 88577 byte(s)
Diff to previous 1946
Fixed /* in a comment.
The rank of a datapoint is now an unsigned int.


Revision 1946 - (view) (annotate) - [select for diffs]
Modified Wed Oct 29 05:48:53 2008 UTC (9 years, 9 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 88619 byte(s)
Diff to previous 1872
A cleanup of some of the problems I found doing a Wall compile.

Removed some commented out lines.
Swapped some member initialisers.
Removed virtual qualifiers from some methods in FunctionSpace.
Fixed some unused or (possibly) uninitialised variables.



Revision 1872 - (view) (annotate) - [select for diffs]
Modified Mon Oct 13 00:18:55 2008 UTC (9 years, 10 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 88617 byte(s)
Diff to previous 1857
Closing the moreshared branch


Revision 1857 - (view) (annotate) - [select for diffs]
Modified Tue Oct 7 23:58:44 2008 UTC (9 years, 10 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 88305 byte(s)
Diff to previous 1811
Updated doco to describe the behaviour of inf, sup and Lsup for cases 
where none of the tags in use in the domain have values.

It confused me when I was testing.



Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (9 years, 10 months ago) by ksteube
Original Path: trunk/escript/src/Data.h
File length: 87925 byte(s)
Diff to previous 1803
Copyright updated in all files


Revision 1803 - (view) (annotate) - [select for diffs]
Modified Wed Sep 24 06:20:29 2008 UTC (9 years, 10 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 87960 byte(s)
Diff to previous 1802
All about making DataEmpty instances throw.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Exposed getDim from AbstractDomain to python to fix bug.

Added isEmpty member to DataAbstract to allow it to throw is queries are 
made about a DataEmpty instance.


Added exceptions to DataAbstract, DataEmpty and Data to prevent calls 
being made against DataEmpty objects.
The following still work as expected on DataEmpty instances

copy, getDomain, getFunctionSpace, isEmpty, isExpanded, isProtected, 
isTagged, setprotection.

You can also call interpolate, however it should throw if you try to 
change FunctionSpaces.



Revision 1802 - (view) (annotate) - [select for diffs]
Modified Tue Sep 23 01:03:29 2008 UTC (9 years, 10 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 88014 byte(s)
Diff to previous 1799
Added canTag methods to FunctionSpace and AbstractDomain (and its 
offspring).
This checks to see if the domain supports tags for the given type of 
function space.

Constructors for DataTagged now throw exceptions if you attempt to make 
a DataTagged with a FunctionSpace which does not support tags.
To allow the default constructor to work, NullDomain has a single 
functioncode which "supports" tagging.

Fixed a bug in DataTagged::toString and DataTypes::pointToString.

Added FunctionSpace::getListOfTagsSTL.

algorithm(DataTagged, BinaryFunction) in DataAlgorithm now only 
processes tags known to be in use.
This fixes mantis issue #0000186.

Added comment to Data.h intro warning about holding references if the 
underlying DataAbstract changes.

_python_ unit tests have been updated to test TaggedData with invalid 
FunctionSpaces and to give the correct answers to Lsup etc.



Revision 1799 - (view) (annotate) - [select for diffs]
Modified Wed Sep 17 06:33:18 2008 UTC (9 years, 11 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 87887 byte(s)
Diff to previous 1796
Added Data::copySelf() [Note: this is exposed as copy() in python].
This method returns a pointer to a deep copy of the target.
There are c++ tests but no python tests for this yet.

All DataAbstracts now have a deepCopy() which simplifies the 
implementation of the compy methods.



Revision 1796 - (view) (annotate) - [select for diffs]
Modified Wed Sep 17 01:45:46 2008 UTC (9 years, 11 months ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 87757 byte(s)
Diff to previous 1748
Merged noarrayview branch onto trunk.



Revision 1748 - (view) (annotate) - [select for diffs]
Modified Wed Sep 3 06:10:39 2008 UTC (9 years, 11 months ago) by ksteube
Original Path: trunk/escript/src/Data.h
File length: 83950 byte(s)
Diff to previous 1719
MPI parallelism for Data().dump and load.  Use multiple NetCDF
files, one file per MPI process


Revision 1719 - (view) (annotate) - [select for diffs]
Modified Thu Aug 21 06:24:29 2008 UTC (10 years ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 83815 byte(s)
Diff to previous 1693
robust function to normalize data object added

Revision 1693 - (view) (annotate) - [select for diffs]
Modified Fri Aug 8 04:22:58 2008 UTC (10 years ago) by jfenwick
Original Path: trunk/escript/src/Data.h
File length: 83936 byte(s)
Diff to previous 1430
Modified toString() on Data objects.
str(x) or print x will now print a summary of the data rather than all 
the points if the output would take more than 80 lines.



Revision 1430 - (view) (annotate) - [select for diffs]
Modified Wed Feb 27 09:07:19 2008 UTC (10 years, 5 months ago) by trankine
Original Path: trunk/escript/src/Data.h
File length: 83913 byte(s)
Diff to previous 1388
Get the windows dll linkage right fo C_TensorBinaryOperation

Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (10 years, 7 months ago) by trankine
Original Path: trunk/escript/src/Data.h
File length: 84097 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 (10 years, 7 months ago) by trankine
Original Path: temp/escript/src/Data.h
File length: 84097 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 (10 years, 7 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/Data.h
File length: 84097 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 (10 years, 8 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 84097 byte(s)
Diff to previous 1334
setTaggedValue works now for expanded data.

Revision 1334 - (view) (annotate) - [select for diffs]
Modified Thu Oct 25 05:08:54 2007 UTC (10 years, 9 months ago) by matt
Original Path: trunk/escript/src/Data.h
File length: 84227 byte(s)
Diff to previous 1332
Initial rewrite of escript unary operations. The rewritten operations are now single-pass.


Revision 1332 - (view) (annotate) - [select for diffs]
Modified Tue Oct 23 03:28:51 2007 UTC (10 years, 10 months ago) by matt
Original Path: trunk/escript/src/Data.h
File length: 82298 byte(s)
Diff to previous 1327
Pow now uses the new binary function interface of C_TensorBinaryOperation.


Revision 1327 - (view) (annotate) - [select for diffs]
Modified Fri Oct 12 07:10:40 2007 UTC (10 years, 10 months ago) by matt
Original Path: trunk/escript/src/Data.h
File length: 80657 byte(s)
Diff to previous 1312
Initial rewrite of binary escript operations.



Revision 1312 - (view) (annotate) - [select for diffs]
Modified Mon Sep 24 06:18:44 2007 UTC (10 years, 10 months ago) by ksteube
Original Path: trunk/escript/src/Data.h
File length: 41072 byte(s)
Diff to previous 1141
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 1141 - (view) (annotate) - [select for diffs]
Modified Tue May 15 04:24:51 2007 UTC (11 years, 3 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 41371 byte(s)
Diff to previous 1137
Some changes to make things run on windows. There is still a problem with netcdf an long file names on windows but there is the suspicion that this is a bigger problem related to boost (compiler options). In fact runs with large numbers of iteration/time steps tend to create seg faults. 

Revision 1137 - (view) (annotate) - [select for diffs]
Modified Thu May 10 08:11:31 2007 UTC (11 years, 3 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 41423 byte(s)
Diff to previous 1118
This version passes the tests on windows except for 

   * vtk
   * netCDF

The version needs to be tested on altix and linux

Revision 1118 - (view) (annotate) - [select for diffs]
Modified Tue Apr 24 08:55:04 2007 UTC (11 years, 4 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 41285 byte(s)
Diff to previous 1092
problem with reset of faulty PDE rhs fixed.

Revision 1092 - (view) (annotate) - [select for diffs]
Modified Fri Apr 13 03:39:49 2007 UTC (11 years, 4 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 41187 byte(s)
Diff to previous 1044
the useless profilinf for data.cpp removed (doDebug=yes should work again)
and a small bug in the gmsh reader fixed.


Revision 1044 - (view) (annotate) - [select for diffs]
Modified Mon Mar 19 07:29:31 2007 UTC (11 years, 5 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 41326 byte(s)
Diff to previous 1034
clear name tagging is supported now.

Revision 1034 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 23:49:20 2007 UTC (11 years, 5 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 40817 byte(s)
Diff to previous 1028
In VC++ boost has problems with numarray arguments from python. This
fixes that problem by taking python::object arguments from the python
level and converting it into python::numeric::array on the C++ level.
This hasn't been tested with VC++ yet.

Moreover the two Data methods dealing with big numarrays as argument and
return value have been removed.



Revision 1028 - (view) (annotate) - [select for diffs]
Modified Wed Mar 14 00:15:24 2007 UTC (11 years, 5 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 40943 byte(s)
Diff to previous 971
modifications to be compliant with _WIN32. The substitutes for asinh, acosh, atanh are still missing (erf will through an exception)

Revision 971 - (view) (annotate) - [select for diffs]
Modified Wed Feb 14 04:40:49 2007 UTC (11 years, 6 months ago) by ksteube
Original Path: trunk/escript/src/Data.h
File length: 40944 byte(s)
Diff to previous 969
Had to undo commit to new MPI branch. The changes went into the original and
not the branch. The files committed here are exactly the same as revision 969.



Revision 969 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 23:02:23 2007 UTC (11 years, 6 months ago) by ksteube
Original Path: trunk/escript/src/Data.h
File length: 41016 byte(s)
Diff to previous 964
Parallelization using MPI for solution of implicit problems.

Parallelization for explicit problems has already been accomplished in
the main SVN branch.

This is incomplete and is not ready for use.



Revision 964 - (view) (annotate) - [select for diffs]
Modified Tue Feb 13 05:10:26 2007 UTC (11 years, 6 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 40944 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 (11 years, 6 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 42415 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 (11 years, 7 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 42176 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 (11 years, 7 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 42013 byte(s)
Diff to previous 914
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 914 - (view) (annotate) - [select for diffs]
Modified Thu Dec 14 04:38:18 2006 UTC (11 years, 8 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 41748 byte(s)
Diff to previous 876
access to the number of samples added

Revision 876 - (view) (annotate) - [select for diffs]
Modified Thu Oct 19 03:50:23 2006 UTC (11 years, 10 months ago) by ksteube
Original Path: trunk/escript/src/Data.h
File length: 41952 byte(s)
Diff to previous 854
Added erf (error function) implementation


Revision 854 - (view) (annotate) - [select for diffs]
Modified Thu Sep 21 05:29:42 2006 UTC (11 years, 11 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 41806 byte(s)
Diff to previous 813
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 813 - (view) (annotate) - [select for diffs]
Modified Mon Aug 21 02:08:47 2006 UTC (12 years ago) by ksteube
Original Path: trunk/escript/src/Data.h
File length: 43635 byte(s)
Diff to previous 804
Tensor products for Data objects are now computed by a C++ method
C_GeneralTensorProduct, which calls C function matrix_matrix_product
to do the actual calculation.

Can perform product with either input transposed in place, meaning
without first computing the transpose in a separate step.


Revision 804 - (view) (annotate) - [select for diffs]
Modified Thu Aug 10 01:12:16 2006 UTC (12 years ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 43031 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 (12 years ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 43024 byte(s)
Diff to previous 790
new function _swap. Python wrapper + testing is still missing.



Revision 790 - (view) (annotate) - [select for diffs]
Modified Wed Jul 26 23:12:34 2006 UTC (12 years ago) by bcumming
Original Path: trunk/escript/src/Data.h
File length: 43025 byte(s)
Diff to previous 789
changes to escript/py_src/pdetools.py and /escript/src/Data.h/.cpp to
make the Locator work in MPI. escript::Data::mindp now returns a 3 tuple,
with the MPI rank of the process on which the minimum value occurs
included. escript::Data::convertToNumArrayFromDPNo also takes the ProcNo
to perform the MPI reduction.

This had to be implemented in both the MPI and non-MPI versions to allow
the necesary changes to the Python code in pdetools.py. In the non-MPI
version ProcNo is set to 0. This works for the explicit scripts tested
thus far, however if it causes problems in your scripts contact Ben or
Lutz, or revert the three files (pdetools.py, Data.h and Data.cpp) to
the previous version.  



Revision 789 - (view) (annotate) - [select for diffs]
Modified Wed Jul 26 05:41:11 2006 UTC (12 years ago) by dhawcroft
Original Path: trunk/escript/src/Data.h
File length: 43074 byte(s)
Diff to previous 783
Inserted PASO_MPI macro in Data.h to match source file

Revision 783 - (view) (annotate) - [select for diffs]
Modified Tue Jul 18 01:32:50 2006 UTC (12 years, 1 month ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 42897 byte(s)
Diff to previous 782
coordinates, element size and normals returned by corresponding
FunctionSpace mesthods are now protected against updates. So 
+=, -=, *=, /=, setTaggedValue, fillFromNumArray will through an
excpetion.

The FunctionSpace class does nut buffer the oordinates, element size and
normals yet.



Revision 782 - (view) (annotate) - [select for diffs]
Modified Tue Jul 18 00:47:47 2006 UTC (12 years, 1 month ago) by bcumming
Original Path: trunk/escript/src/Data.h
File length: 42574 byte(s)
Diff to previous 775
Large number of changes to Finley for meshing in MPI.

- optimisation and neatening up of rectcanglular mesh generation code
- first and second order 1D, 2D and 3D rectangular meshes are now
  available in finley and escript using MPI.
- reduced meshes now generated in MPI, and interpolation to and from 
  reduced data types now supported.  


Revision 775 - (view) (annotate) - [select for diffs]
Modified Mon Jul 10 04:00:08 2006 UTC (12 years, 1 month ago) by ksteube
Original Path: trunk/escript/src/Data.h
File length: 41834 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 (12 years, 1 month ago) by woo409
Original Path: trunk/escript/src/Data.h
File length: 41395 byte(s)
Diff to previous 751
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 751 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 01:46:34 2006 UTC (12 years, 1 month ago) by bcumming
Original Path: trunk/escript/src/Data.h
File length: 39151 byte(s)
Diff to previous 699
Changes relating to the MPI version of escript
The standard OpenMP version of escript is unchanged

- updated data types (Finley_Mesh, Finley_NodeFile, etc) to store meshes
  over multiple MPI processes.
- added CommBuffer code in Paso for communication of Data associated
  with distributed meshes
- updates in Finley and Escript to support distributed data and operations
  on distributed data (such as interpolation).
- construction of RHS in MPI, so that simple explicit schemes (such as
  /docs/examples/wave.py without IO and the Locator) can run in MPI.
- updated mesh generation for first order line, rectangle and brick
  meshes and second order line meshes in MPI.        
- small changes to trunk/SConstruct and trunk/scons/ess_options.py to
  build the MPI version, these changes are turned off by default.


Revision 699 - (view) (annotate) - [select for diffs]
Modified Fri Mar 31 06:27:56 2006 UTC (12 years, 4 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 39027 byte(s)
Diff to previous 698
now float**Data is running

Revision 698 - (view) (annotate) - [select for diffs]
Modified Fri Mar 31 04:52:55 2006 UTC (12 years, 4 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 38821 byte(s)
Diff to previous 615
test with tagged data pass now

Revision 615 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:12:00 2006 UTC (12 years, 5 months ago) by elspeth
Original Path: trunk/escript/src/Data.h
File length: 38877 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 (12 years, 5 months ago) by gross
Original Path: trunk/escript/src/Data.h
File length: 39199 byte(s)
Diff to previous 571
some steps towards eigenvalue and eigenvector calculation

Revision 571 - (view) (annotate) - [select for diffs]
Modified Tue Feb 28 06:53:17 2006 UTC (12 years, 5 months ago) by jgs
Original Path: trunk/escript/src/Data.h
File length: 38385 byte(s)
Diff to previous 562
modify whereZero etc methods to also accept a tolerance parameter

Revision 562 - (view) (annotate) - [select for diffs]
Modified Thu Feb 23 05:03:16 2006 UTC (12 years, 5 months ago) by jgs
Original Path: trunk/escript/src/Data.h
File length: 38301 byte(s)
Diff to previous 559
further fix for DataTAgged::dp_algorithm, was not working for DataTagged objects with 0 tags

Revision 559 - (view) (annotate) - [select for diffs]
Modified Thu Feb 23 01:43:44 2006 UTC (12 years, 5 months ago) by jgs
Original Path: trunk/escript/src/Data.h
File length: 38299 byte(s)
Diff to previous 544
reimplement dp_algorithm for DataTagged, existing
implementation was complete rubbish
(ich bin so beschämt!)


Revision 544 - (view) (annotate) - [select for diffs]
Modified Tue Feb 21 01:23:23 2006 UTC (12 years, 6 months ago) by jgs
Original Path: trunk/escript/src/Data.h
File length: 37623 byte(s)
Diff to previous 480
minor comment fixes


Revision 480 - (view) (annotate) - [select for diffs]
Modified Wed Feb 1 05:15:12 2006 UTC (12 years, 6 months ago) by jgs
Original Path: trunk/escript/src/Data.h
File length: 37587 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 (12 years, 6 months ago) by jgs
Original Path: trunk/escript/src/Data.h
File length: 37699 byte(s)
Copied from: trunk/escript/src/Data/Data.h revision 469
Diff to previous 286
restructure escript source tree
move src/Data/* -> src
remove inc
modify #includes and cpppath settings accordingly


Revision 286 - (view) (annotate) - [select for diffs]
Modified Thu Dec 1 06:40:20 2005 UTC (12 years, 8 months ago) by gross
Original Path: trunk/escript/src/Data/Data.h
File length: 37803 byte(s)
Diff to previous 155
length method is removed as it is too slow. use length in util.py instead

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


Revision 151 - (view) (annotate) - [select for diffs]
Modified Thu Sep 22 01:55:00 2005 UTC (12 years, 11 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 37948 byte(s)
Diff to previous 150
Merge of development branch dev-02 back to main trunk on 2005-09-22


Revision 150 - (view) (annotate) - [select for diffs]
Modified Thu Sep 15 03:44:45 2005 UTC (12 years, 11 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 37898 byte(s)
Diff to previous 149
Merge of development branch dev-02 back to main trunk on 2005-09-15


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


Revision 148 - (view) (annotate) - [select for diffs]
Modified Tue Aug 23 01:24:31 2005 UTC (13 years ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 36611 byte(s)
Diff to previous 147
Merge of development branch dev-02 back to main trunk on 2005-08-23


Revision 147 - (view) (annotate) - [select for diffs]
Modified Fri Aug 12 01:45:47 2005 UTC (13 years ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 36537 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 (13 years, 1 month ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 36330 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 (13 years, 1 month ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 36168 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 (13 years, 2 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 35806 byte(s)
Diff to previous 121
Merge of development branch back to main trunk on 2005-06-09


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


Revision 119 - (view) (annotate) - [select for diffs]
Modified Tue Apr 12 04:45:05 2005 UTC (13 years, 4 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 35328 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 (13 years, 4 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 34748 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 (13 years, 5 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 34482 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 (13 years, 6 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 34143 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 (13 years, 6 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 32508 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 (13 years, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 32468 byte(s)
Diff to previous 104
*** empty log message ***


Revision 104 - (view) (annotate) - [select for diffs]
Modified Fri Dec 17 07:43:12 2004 UTC (13 years, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 32398 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 (13 years, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 32276 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 (13 years, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 26799 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 (13 years, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 32276 byte(s)
Diff to previous 94
*** empty log message ***


Revision 94 - (view) (annotate) - [select for diffs]
Added Wed Oct 27 00:45:54 2004 UTC (13 years, 9 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/Data.h
File length: 26799 byte(s)
*** empty log message ***


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