Parent Directory
|
Revision Log
Sticky Revision: |
Fix variable declaration to compile under MPI
some improvements on level set
Some variables were not declared as a result of recent cleanup
Resolved some compiler warnings Changed blocktimer to not use strdup, intead malloc and strcpy
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.
modifications to PCG to support dynamic scheduling
The algebraic upwinding with MPI. The case of boundary constraint needs still some attention.
some changes to make the implementatiopn of a upwind MPI version easier
pragma ivdep removed. icc produced wrong code.
some more work on the transport solver.
Recent fixes have remedied problems with running OpenMP/MPI mixed mode programming.
a new version of the algebric upwinding a. flux limiter
new upwinding algorithm (still fails)
rewrite antidiffusion calculation to avoid coloring for OPENMP parallelization
better test example for upwinding added
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
bug in interpolation at reduced face elements fixed.
some OMP related compile problems fixed.
some bugs in the updwing scheme but there are still problem with the cross wind direction.
explicit upwinding scheme added.
finley interface to paso's transport solver added.
initialization for FCT solver added.
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 |