Parent Directory
| 
Revision Log
| Sticky Revision: |
Changes to avoid compiler warnings
Finley files now pass -Wall on gcc 4.3.2
saveVTK.c: replaced printf(string) with printf("%s", string)
MeshAdapterFactory.cpp: moved a few lines to avoid possible use of uninitialized vars
MeshAdapter.cpp: initialized ncdims in mesh dump
There is still a warning from a boost include file
Closing the moreshared branch
Copyright updated in all files
The new MPI parallel ReadMesh is now the default after having passed all tests both with and without MPI. If you have been using ReadMesh you should notice no difference. If you were using ReadMeshMPI then change to ReadMesh.
Cleared away some debugging prints
Added new field to NetCDF dump of mesh
Test suite fails due to missing arg in call to Finley_Mesh_createMappings. Added NULL arg, but still need to find proper fix as loadMesh does not work. Adjusted SConstruct to delete pythonMPI if not compiled for MPI.
linux_gcc_eg_options.py: remove the std99 option, it is no longer needed as the code compiles without C 1999 extension (need for these extensions elinminated in windows port). Turn on all warnings except unknown pragmas. Should catch a lot of stuff. SConstruct: Impassioned plea system_dep.h: Add the standard incantation for dealing with const declarations in C code called from C and C++ blocktimer: Get the calling interface right for C code called from C and C++ and use __const as defined in system_dep.h (Should be re-factored into compiler_dep.h file). MeshAdapterFactory.cpp: Since we have (effectively) no control over netCDF policy, cast const char *'s to char *'s
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.
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
Partial implementation of ReadMeshMPI. Will eventually replace ReadMesh but for now has a different name.
Completed mesh.dump(file) and mesh=LoadMesh(file) by adding TagMap and implementing MPI parallelism. Now allocating ElementFile for ContactElements even if there are none. Removed file Mesh_dump.c since dump/loadMesh are in CPPAdapter/MeshAdapter*.cpp.
dump/LoadMesh methods work except for TagMap, Point elements probably OK but are untested.
Created LoadMesh to read a mesh from a distributed NetCDF file. Can read nodes but not elements yet.
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.
reduced integration schemes are implemented now for grad, integrate, etc. Tests still to be added.
first steps toward reduced element integration order. The escript bit is done but the finley part still needs work.
gmsh file reader for finley
Can now compile and run with MPI on shake71
Large number of changes to Finley for meshing in MPI. - optimisation and neatening up of rectcanglular mesh generation code - first and second order 1D, 2D and 3D rectangular meshes are now available in finley and escript using MPI. - reduced meshes now generated in MPI, and interpolation to and from reduced data types now supported.
- added directory pythonMPI to the source tree. this directory contains
the c++ wrapper that is used to run python scripts in parallel for the
MPI version of escript/finley
- updated the SConstruct and ./scons/ess_options.py for conditional MPI
compilation. To compile the MPI version on ESS uncomment the #define
PASO_MPI in ./paso/src/Paso.h and add the command line option
useMPI=yes when running scons.
- fixed a compile time error in the MPI build in
finley/src/CPPAdapter/MeshAdapterFactory.cpp
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)
Changes relating to the MPI version of escript The standard OpenMP version of escript is unchanged - updated data types (Finley_Mesh, Finley_NodeFile, etc) to store meshes over multiple MPI processes. - added CommBuffer code in Paso for communication of Data associated with distributed meshes - updates in Finley and Escript to support distributed data and operations on distributed data (such as interpolation). - construction of RHS in MPI, so that simple explicit schemes (such as /docs/examples/wave.py without IO and the Locator) can run in MPI. - updated mesh generation for first order line, rectangle and brick meshes and second order line meshes in MPI. - small changes to trunk/SConstruct and trunk/scons/ess_options.py to build the MPI version, these changes are turned off by default.
rationalise #includes and forward declarations
rationalise all #includes
reorganise finley src tree to remove inc dir and src/finley directory
adjust include file names to allow for new finley source tree structure
copy finleyC and CPPAdapter to finley and finley/CPPAdapter to facilitate scons builds
move all directories from trunk/esys2 into trunk and remove esys2
*** 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 |