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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1726 - (view) (annotate) - [select for diffs]
Modified Tue Aug 26 03:33:34 2008 UTC (11 years ago) by jfenwick
File length: 8500 byte(s)
Diff to previous 1704
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 1704 - (view) (annotate) - [select for diffs]
Modified Thu Aug 14 05:35:32 2008 UTC (11 years, 1 month ago) by jfenwick
File length: 6145 byte(s)
Diff to previous 1697
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 1697 - (view) (annotate) - [select for diffs]
Modified Mon Aug 11 06:29:54 2008 UTC (11 years, 1 month ago) by jfenwick
File length: 6176 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, 1 month ago) by jfenwick
File length: 6169 byte(s)
Diff to previous 1388
Branching to perform experiments on removing DataArrayView


Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 8 months ago) by trankine
Original Path: trunk/escript/src/BinaryOp.h
File length: 6169 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, 8 months ago) by trankine
Original Path: temp/escript/src/BinaryOp.h
File length: 6169 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, 8 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/BinaryOp.h
File length: 6169 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 (11 years, 11 months ago) by ksteube
Original Path: trunk/escript/src/BinaryOp.h
File length: 6169 byte(s)
Diff to previous 757
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 757 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 13:12:56 2006 UTC (13 years, 2 months ago) by woo409
Original Path: trunk/escript/src/BinaryOp.h
File length: 6371 byte(s)
Diff to previous 697
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 697 - (view) (annotate) - [select for diffs]
Modified Fri Mar 31 04:48:56 2006 UTC (13 years, 5 months ago) by gross
Original Path: trunk/escript/src/BinaryOp.h
File length: 6347 byte(s)
Diff to previous 615
bug with tagged data fixed

Revision 615 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:12:00 2006 UTC (13 years, 6 months ago) by elspeth
Original Path: trunk/escript/src/BinaryOp.h
File length: 6022 byte(s)
Diff to previous 555
More copyright information.


Revision 555 - (view) (annotate) - [select for diffs]
Modified Wed Feb 22 04:44:10 2006 UTC (13 years, 6 months ago) by jgs
Original Path: trunk/escript/src/BinaryOp.h
File length: 6343 byte(s)
Diff to previous 544
fixed binaryOp for combination of DataTagged and scalar values.
calculation of default value where RHS was a scalar was not yet
implemented


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


Revision 543 - (view) (annotate) - [select for diffs]
Modified Tue Feb 21 01:18:38 2006 UTC (13 years, 7 months ago) by jgs
Original Path: trunk/escript/src/BinaryOp.h
File length: 6451 byte(s)
Diff to previous 478
fix BinaryOp for DataTagged values - existing implementation was adding
tags from RHS to LHS using RHS's default value - should have been using
LHS's default value! fixed now


Revision 478 - (view) (annotate) - [select for diffs]
Modified Tue Jan 31 02:21:49 2006 UTC (13 years, 7 months ago) by jgs
Original Path: trunk/escript/src/BinaryOp.h
File length: 6453 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, 7 months ago) by jgs
Original Path: trunk/escript/src/BinaryOp.h
File length: 6550 byte(s)
Copied from: trunk/escript/src/Data/BinaryOp.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, 10 months ago) by jgs
Original Path: trunk/escript/src/Data/BinaryOp.h
File length: 6601 byte(s)
Diff to previous 154
move all directories from trunk/esys2 into trunk and remove esys2


Revision 154 - (view) (annotate) - [select for diffs]
Modified Mon Nov 7 05:51:17 2005 UTC (13 years, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/BinaryOp.h
File length: 6601 byte(s)
Diff to previous 122
Merge of development branch dev-02 back to main trunk on 2005-11-07


Revision 122 - (view) (annotate) - [select for diffs]
Modified Thu Jun 9 05:38:05 2005 UTC (14 years, 3 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/BinaryOp.h
File length: 6582 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 (14 years, 4 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/BinaryOp.h
File length: 6451 byte(s)
Diff to previous 82
Merge of development branch back to main trunk on 2005-05-06


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