Parent Directory
| 
Revision Log
| Sticky Revision: |
Fixed two typos that stopped the test suite from running. Also, gcc 4.3.2 issued several warnings not seen before: ignoring the return value of fscanf and using the wrong format with printf.
Copyright updated in all files
Ran a simple Escript program on Mac OS Darwin. Still much to do.
tmp_str was unused var on windows.
Resolved some compiler warnings Changed blocktimer to not use strdup, intead malloc and strcpy
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
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.
Copied a couple more files from MPI branch to trunk
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 |