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.
Closing the moreshared branch
Remove a signed/unsigned comparison
MPI parallelized dump/load for Constant and Tagged data. run_escriptOnFinley.py runs hybrid MPI/OpenMP.
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.
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().
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.
Merged noarrayview branch onto trunk.
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
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.
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.
This version passes the tests on windows except for * vtk * netCDF The version needs to be tested on altix and linux
netcdf c++ interface removed
problem with reset of faulty PDE rhs fixed.
netCDF can now be switched off at compilation. Consequently load and dump of data objects is not available then.
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).
full Data object dump and load now available. Tests added.
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.
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).
the new function swap_axes + tests added. (It replaces swap).
new function _swap. Python wrapper + testing is still missing.
Modified the following python methods in escript/py_src/util.py to call faster C++ methods: escript_trace escript_transpose escript_symmetric escript_nonsymmetric
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)
More copyright information.
print message removed
faster version of the local eigenvalue calculation
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
fix comments for setSlice - were totally misleading!
comment and formatting changes
minor comment changes
fix a reference indicator
minor fix to DataTagged::getTagNumber changes to comments and formatting inline two methods
rationalise #includes and forward declarations
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-22
Merge of development branch dev-02 back to main trunk on 2005-09-01
Merge of development branch back to main trunk on 2005-07-08
Merge of development branch back to main trunk on 2005-05-06
*** empty log message ***
*** empty log message ***
*** 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 |