/[escript]/trunk/escript/src/DataTagged.cpp
ViewVC logotype

Log of /trunk/escript/src/DataTagged.cpp

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 4507)

Revision 1802 - (view) (annotate) - [select for diffs]
Modified Tue Sep 23 01:03:29 2008 UTC (10 years, 9 months ago) by jfenwick
File length: 34685 byte(s)
Diff to previous 1800
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 1800 - (view) (annotate) - [select for diffs]
Modified Thu Sep 18 05:28:20 2008 UTC (10 years, 9 months ago) by ksteube
File length: 34138 byte(s)
Diff to previous 1799
Serialized parallel I/O when writing mesh or data to NetCDF file on multiple MPI processors.
Added domain method getMPIComm() to complement getMPISize() and getMPIRank().


Revision 1799 - (view) (annotate) - [select for diffs]
Modified Wed Sep 17 06:33:18 2008 UTC (10 years, 9 months ago) by jfenwick
File length: 34130 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 (10 years, 9 months ago) by jfenwick
File length: 34058 byte(s)
Diff to previous 1628
Merged noarrayview branch onto trunk.



Revision 1628 - (view) (annotate) - [select for diffs]
Modified Fri Jul 11 13:12:46 2008 UTC (10 years, 11 months ago) by phornby
File length: 23289 byte(s)
Diff to previous 1455

Merge in /branches/windows_from_1456_trunk_1620_merged_in branch.

You will find a preserved pre-merge trunk in tags under tags/trunk_at_1625.
That will be useful for diffing & checking on my stupidity.

Here is a list of the conflicts and their resolution at this
point in time.


=================================================================================
(LLWS == looks like white space).

finley/src/Assemble_addToSystemMatrix.c - resolve to branch - unused var. may be wrong.....
finley/src/CPPAdapter/SystemMatrixAdapter.cpp - resolve to branch - LLWS
finley/src/CPPAdapter/MeshAdapter.cpp - resolve to branch - LLWS
paso/src/PCG.c - resolve to branch - unused var fixes.
paso/src/SolverFCT.c - resolve to branch - LLWS
paso/src/FGMRES.c - resolve to branch - LLWS
paso/src/Common.h - resolve to trunk version. It's omp.h's include... not sure it's needed,
but for the sake of saftey.....
paso/src/Functions.c - resolve to branch version, indentation/tab removal and return error
on bad unimplemented Paso_FunctionCall.
paso/src/SolverFCT_solve.c - resolve to branch version, unused vars
paso/src/SparseMatrix_MatrixVector.c - resolve to branch version, unused vars.
escript/src/Utils.cpp - resloved to branch, needs WinSock2.h
escript/src/DataExpanded.cpp - resolved to branch version - LLWS
escript/src/DataFactory.cpp - resolve to branch version
=================================================================================

This currently passes tests on linux (debian), but is not checked on windows or Altix yet.

This checkin is to make a trunk I can check out for windows to do tests on it.

Known outstanding problem is in the operator=() method of exceptions
causing warning messages on the intel compilers.

May the God of doughnuts have mercy on my soul.



Revision 1455 - (view) (annotate) - [select for diffs]
Modified Thu Feb 28 17:19:44 2008 UTC (11 years, 3 months ago) by phornby
File length: 23188 byte(s)
Diff to previous 1388
Merge of branches/windows_from_1431_trunk.

Revamp of the exception system.
Fix unused vars and signed/unsigned comparisons.
defined a macro THROW(ARG) in the system_dep.h's to
deal with the expectations of declarations on different architectures.

Details in the logs of branches/windows_from_1431_trunk.

pre-merge snapshot of the trunk in tags/trunk_at_1452



Revision 1388 - (view) (annotate) - [select for diffs]
Modified Fri Jan 11 07:45:58 2008 UTC (11 years, 5 months ago) by trankine
File length: 23170 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, 5 months ago) by trankine
Original Path: temp/escript/src/DataTagged.cpp
File length: 23170 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, 5 months ago) by phornby
Original Path: temp_trunk_copy/escript/src/DataTagged.cpp
File length: 23170 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, 9 months ago) by ksteube
File length: 23170 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 (12 years, 1 month ago) by gross
File length: 23311 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 (12 years, 1 month ago) by gross
File length: 23283 byte(s)
Diff to previous 1131
This version passes the tests on windows except for 

   * vtk
   * netCDF

The version needs to be tested on altix and linux

Revision 1131 - (view) (annotate) - [select for diffs]
Modified Tue May 8 05:52:21 2007 UTC (12 years, 1 month ago) by gross
File length: 23275 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, 2 months ago) by gross
File length: 23275 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, 3 months ago) by gross
File length: 23143 byte(s)
Diff to previous 1020
netCDF can now be switched off at compilation. Consequently load and dump of data objects is not available then.

Revision 1020 - (view) (annotate) - [select for diffs]
Modified Mon Mar 12 10:12:36 2007 UTC (12 years, 3 months ago) by phornby
File length: 22841 byte(s)
Diff to previous 983
Added explicit destructors to all Exception classes.

Fixed an ifdef in TestCase.cpp

Made the conditional definition of M_PI in LocalOps.h
depend only on M_PI being undefined.

Replace dynamically dimensioned arrays in DataFactory & DataTagged with malloc.

sort() method of list does not take a named argument
(despite the manual's claims to the contary).



Revision 983 - (view) (annotate) - [select for diffs]
Modified Tue Feb 20 02:49:08 2007 UTC (12 years, 4 months ago) by gross
File length: 22689 byte(s)
Diff to previous 950
full Data object dump and load now available. Tests added.

Revision 950 - (view) (annotate) - [select for diffs]
Modified Tue Feb 6 07:01:11 2007 UTC (12 years, 4 months ago) by gross
File length: 19667 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, 9 months ago) by gross
File length: 19534 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 (12 years, 10 months ago) by gross
File length: 20551 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, 10 months ago) by gross
File length: 20531 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 (12 years, 11 months ago) by ksteube
File length: 19728 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 ago) by woo409
File length: 16416 byte(s)
Diff to previous 615
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)


Revision 615 - (view) (annotate) - [select for diffs]
Modified Wed Mar 22 02:12:00 2006 UTC (13 years, 3 months ago) by elspeth
File length: 15806 byte(s)
Diff to previous 594
More copyright information.


Revision 594 - (view) (annotate) - [select for diffs]
Modified Tue Mar 14 23:36:08 2006 UTC (13 years, 3 months ago) by gross
File length: 16128 byte(s)
Diff to previous 580
print message removed

Revision 580 - (view) (annotate) - [select for diffs]
Modified Wed Mar 8 05:45:51 2006 UTC (13 years, 3 months ago) by gross
File length: 16171 byte(s)
Diff to previous 541
faster version of the local eigenvalue calculation

Revision 541 - (view) (annotate) - [select for diffs]
Modified Mon Feb 20 06:50:39 2006 UTC (13 years, 4 months ago) by jgs
File length: 13878 byte(s)
Diff to previous 519
ensure src and dest objects have matching tag sets in setSlice
by adding tags present in src but not in dest to dest using
dest's default value before doing actual slicing


Revision 519 - (view) (annotate) - [select for diffs]
Modified Tue Feb 14 05:30:50 2006 UTC (13 years, 4 months ago) by jgs
File length: 13595 byte(s)
Diff to previous 513
fix comments for setSlice - were totally misleading!


Revision 513 - (view) (annotate) - [select for diffs]
Modified Mon Feb 13 04:46:51 2006 UTC (13 years, 4 months ago) by jgs
File length: 13594 byte(s)
Diff to previous 509
comment and formatting changes


Revision 509 - (view) (annotate) - [select for diffs]
Modified Fri Feb 10 03:24:44 2006 UTC (13 years, 4 months ago) by jgs
File length: 13096 byte(s)
Diff to previous 500
minor comment changes


Revision 500 - (view) (annotate) - [select for diffs]
Modified Tue Feb 7 05:19:07 2006 UTC (13 years, 4 months ago) by jgs
File length: 12910 byte(s)
Diff to previous 496
fix a reference indicator


Revision 496 - (view) (annotate) - [select for diffs]
Modified Tue Feb 7 01:27:14 2006 UTC (13 years, 4 months ago) by jgs
File length: 12910 byte(s)
Diff to previous 480
minor fix to DataTagged::getTagNumber
changes to comments and formatting
inline two methods


Revision 480 - (view) (annotate) - [select for diffs]
Modified Wed Feb 1 05:15:12 2006 UTC (13 years, 4 months ago) by jgs
File length: 13096 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, 4 months ago) by jgs
File length: 13142 byte(s)
Copied from: trunk/escript/src/Data/DataTagged.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 (13 years, 7 months ago) by jgs
Original Path: trunk/escript/src/Data/DataTagged.cpp
File length: 13194 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, 9 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataTagged.cpp
File length: 13194 byte(s)
Diff to previous 149
Merge of development branch dev-02 back to main trunk on 2005-09-22


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


Revision 123 - (view) (annotate) - [select for diffs]
Modified Fri Jul 8 04:08:13 2005 UTC (13 years, 11 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataTagged.cpp
File length: 12251 byte(s)
Diff to previous 121
Merge of development branch back to main trunk on 2005-07-08


Revision 121 - (view) (annotate) - [select for diffs]
Modified Fri May 6 04:26:16 2005 UTC (14 years, 1 month ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataTagged.cpp
File length: 11875 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 (14 years, 2 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataTagged.cpp
File length: 11382 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, 5 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataTagged.cpp
File length: 10604 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, 6 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataTagged.cpp
File length: 10290 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, 6 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataTagged.cpp
File length: 10281 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, 6 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataTagged.cpp
File length: 10290 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, 8 months ago) by jgs
Original Path: trunk/esys2/escript/src/Data/DataTagged.cpp
File length: 10281 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