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

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

Parent Directory Parent Directory | Revision Log Revision Log


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

Revision 1773 - (view) (annotate) - [select for diffs]
Modified Tue Sep 9 02:52:26 2008 UTC (11 years ago) by jfenwick
File length: 12650 byte(s)
Diff to previous 1752
Branch commit

Fixed some bugs.
Code now passes all_tests.
Next step is to test under OMP and MPI



Revision 1752 - (view) (annotate) - [select for diffs]
Modified Fri Sep 5 06:26:29 2008 UTC (11 years ago) by jfenwick
File length: 12606 byte(s)
Diff to previous 1747
Branch commit

Now passes all c++ unit tests but fails some python ones.



Revision 1747 - (view) (annotate) - [select for diffs]
Modified Wed Sep 3 04:56:50 2008 UTC (11 years ago) by jfenwick
File length: 12611 byte(s)
Diff to previous 1724
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 1724 - (view) (annotate) - [select for diffs]
Modified Mon Aug 25 05:38:57 2008 UTC (11 years ago) by jfenwick
File length: 11831 byte(s)
Diff to previous 1715
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 1715 - (view) (annotate) - [select for diffs]
Modified Thu Aug 21 04:52:14 2008 UTC (11 years ago) by jfenwick
File length: 11828 byte(s)
Diff to previous 1714
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 1714 - (view) (annotate) - [select for diffs]
Modified Thu Aug 21 00:01:55 2008 UTC (11 years ago) by jfenwick
File length: 11806 byte(s)
Diff to previous 1698
Branch commit

Moved getSliceRegion() and getSliceRange() into DataTypes
Data.cpp - modified not to rely on operator() from DataArrayView
         - Used more const& to avoid copies



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

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



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: 11822 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: 11894 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/DataConstant.cpp
File length: 11894 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/DataConstant.cpp
File length: 11894 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/DataConstant.cpp
File length: 11894 byte(s)
Diff to previous 1319
Make a temp copy of the trunk before checking in the windows changes



Revision 1319 - (view) (annotate) - [select for diffs]
Modified Thu Sep 27 00:27:51 2007 UTC (11 years, 11 months ago) by matt
Original Path: trunk/escript/src/DataConstant.cpp
File length: 11894 byte(s)
Diff to previous 1312
DataArray is no longer needed. However, the unit tests still require it.


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/DataConstant.cpp
File length: 11483 byte(s)
Diff to previous 1149
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 1149 - (view) (annotate) - [select for diffs]
Modified Thu May 17 00:30:15 2007 UTC (12 years, 4 months ago) by gross
Original Path: trunk/escript/src/DataConstant.cpp
File length: 11614 byte(s)
Diff to previous 1141
some fixes from the windows version

Revision 1141 - (view) (annotate) - [select for diffs]
Modified Tue May 15 04:24:51 2007 UTC (12 years, 4 months ago) by gross
Original Path: trunk/escript/src/DataConstant.cpp
File length: 11613 byte(s)
Diff to previous 1131
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 1131 - (view) (annotate) - [select for diffs]
Modified Tue May 8 05:52:21 2007 UTC (12 years, 4 months ago) by gross
Original Path: trunk/escript/src/DataConstant.cpp
File length: 11575 byte(s)
Diff to previous 1118
netcdf c++ interface removed

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/DataConstant.cpp
File length: 11575 byte(s)
Diff to previous 1023
problem with reset of faulty PDE rhs fixed.

Revision 1023 - (view) (annotate) - [select for diffs]
Modified Tue Mar 13 05:43:36 2007 UTC (12 years, 6 months ago) by gross
Original Path: trunk/escript/src/DataConstant.cpp
File length: 11440 byte(s)
Diff to previous 950
netCDF can now be switched off at compilation. Consequently load and dump of data objects is not available then.

Revision 950 - (view) (annotate) - [select for diffs]
Modified Tue Feb 6 07:01:11 2007 UTC (12 years, 7 months ago) by gross
Original Path: trunk/escript/src/DataConstant.cpp
File length: 11247 byte(s)
Diff to previous 854
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 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/DataConstant.cpp
File length: 8655 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, 1 month ago) by gross
Original Path: trunk/escript/src/DataConstant.cpp
File length: 9158 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, 1 month ago) by gross
Original Path: trunk/escript/src/DataConstant.cpp
File length: 9141 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, 2 months ago) by ksteube
Original Path: trunk/escript/src/DataConstant.cpp
File length: 8745 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, 2 months ago) by woo409
Original Path: trunk/escript/src/DataConstant.cpp
File length: 7072 byte(s)
Diff to previous 682
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 682 - (view) (annotate) - [select for diffs]
Modified Mon Mar 27 02:43:09 2006 UTC (13 years, 5 months ago) by robwdcock
Original Path: trunk/escript/src/DataConstant.cpp
File length: 7073 byte(s)
Diff to previous 615
+ NEW BUILD SYSTEM

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

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

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



Revision 615 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:12:00 2006 UTC (13 years, 5 months ago) by elspeth
Original Path: trunk/escript/src/DataConstant.cpp
File length: 7063 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, 6 months ago) by gross
Original Path: trunk/escript/src/DataConstant.cpp
File length: 7385 byte(s)
Diff to previous 474
faster version of the local eigenvalue calculation

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/DataConstant.cpp
File length: 6214 byte(s)
Copied from: trunk/escript/src/Data/DataConstant.cpp revision 469
Diff to previous 468
restructure escript source tree
move src/Data/* -> src
remove inc
modify #includes and cpppath settings accordingly


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

Revision 155 - (view) (annotate) - [select for diffs]
Modified Wed Nov 9 02:02:19 2005 UTC (13 years, 10 months ago) by jgs
Original Path: trunk/escript/src/Data/DataConstant.cpp
File length: 6250 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 (13 years, 11 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataConstant.cpp
File length: 6250 byte(s)
Diff to previous 123
Merge of development branch dev-02 back to main trunk on 2005-09-22


Revision 123 - (view) (annotate) - [select for diffs]
Modified Fri Jul 8 04:08:13 2005 UTC (14 years, 2 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataConstant.cpp
File length: 6205 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, 3 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataConstant.cpp
File length: 5821 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, 5 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataConstant.cpp
File length: 5735 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, 7 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataConstant.cpp
File length: 5402 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, 9 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataConstant.cpp
File length: 4715 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, 9 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataConstant.cpp
File length: 4805 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, 9 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataConstant.cpp
File length: 4715 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, 10 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataConstant.cpp
File length: 4805 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