Parent Directory
| 
Revision Log
| Sticky Revision: |
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.
Fixed a compile error under MPI. Cleaned up a comment.
Closing the moreshared branch
Copyright updated in all files
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.
method returning reference id added to FunctionSpace class
getListOfTags method added to FunctionSpace class
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.
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
Merge the changes to these few files with the windows port branch to test just these changes under linux and altix.
And get the *(&(*&(* name right
Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.
Make a temp copy of the trunk before checking in the windows changes
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.
This version passes the tests on windows except for * vtk * netCDF The version needs to be tested on altix and linux
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.
new FunctionSpace method setTags added
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)
More copyright information.
restructure escript source tree move src/Data/* -> src remove inc modify #includes and cpppath settings accordingly
move all directories from trunk/esys2 into trunk and remove esys2
Merge of development branch dev-02 back to main trunk on 2005-09-01
*** empty log message ***
*** empty log message ***
*** empty log message ***
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.
| ViewVC Help | |
| Powered by ViewVC 1.1.26 |