Parent Directory
| 
Revision Log
| Sticky Revision: |
Fixed copyright notice on linux_gcc_eg_options.py
Updated for new build system. Still generating std::bad_alloc deep in VTK.
Updated copyright for a few remaining python files
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
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.
Minor repairs to scons files
Finished renaming of boost_lib to boost_libs and boost_lib_path to boost_libs_path.
Add some example options files people can copy and modify for their node.
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 |