/[escript]
ViewVC logotype

Revision 1628


Jump to revision: Previous Next
Author: phornby
Date: Fri Jul 11 13:12:46 2008 UTC (10 years, 8 months ago)
Changed paths: 84
Log Message:

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.



Changed paths

Path Details
Directorytrunk/README_TESTS modified , text changed
Directorytrunk/SConstruct modified , text changed
Directorytrunk/bruce/src/BruceException.h modified , text changed
Directorytrunk/bruce/src/system_dep.h modified , text changed
Directorytrunk/escript/src/DataArrayView.cpp modified , text changed
Directorytrunk/escript/src/DataArrayView.h modified , text changed
Directorytrunk/escript/src/DataException.h modified , text changed
Directorytrunk/escript/src/DataExpanded.cpp modified , text changed
Directorytrunk/escript/src/DataFactory.cpp modified , text changed
Directorytrunk/escript/src/DataTagged.cpp modified , text changed
Directorytrunk/escript/src/DataTagged.h modified , text changed
Directorytrunk/escript/src/DomainException.h modified , text changed
Directorytrunk/escript/src/FunctionSpace.cpp modified , text changed
Directorytrunk/escript/src/FunctionSpace.h modified , text changed
Directorytrunk/escript/src/FunctionSpaceException.h modified , text changed
Directorytrunk/escript/src/SystemMatrixException.h modified , text changed
Directorytrunk/escript/src/Taipan.cpp modified , text changed
Directorytrunk/escript/src/TransportProblemException.h modified , text changed
Directorytrunk/escript/src/Utils.cpp modified , text changed
Directorytrunk/escript/src/blocktimer.c modified , text changed
Directorytrunk/escript/src/escriptcpp.cpp modified , text changed
Directorytrunk/escript/src/system_dep.h modified , text changed
Directorytrunk/esysUtils/src/EsysAssert.h modified , text changed
Directorytrunk/esysUtils/src/EsysAssertException.h modified , text changed
Directorytrunk/esysUtils/src/EsysException.cpp modified , text changed
Directorytrunk/esysUtils/src/EsysException.h modified , text changed
Directorytrunk/esysUtils/src/SConscript modified , text changed
Directorytrunk/esysUtils/src/esysExceptionTranslator.h modified , text changed
Directorytrunk/esysUtils/src/esys_malloc.h
(Copied from branches/windows_from_1456_trunk_1620_merged_in/esysUtils/src/esys_malloc.h, r1625)
added
Directorytrunk/esysUtils/src/system_dep.h modified , text changed
Directorytrunk/esysUtils/test/EsysExceptionTestCase.cpp modified , text changed
Directorytrunk/finley/src/Assemble_CopyNodalData.c modified , text changed
Directorytrunk/finley/src/Assemble_LumpedSystem.c modified , text changed
Directorytrunk/finley/src/Assemble_PDE.c modified , text changed
Directorytrunk/finley/src/Assemble_addToSystemMatrix.c modified , text changed
Directorytrunk/finley/src/Assemble_integrate.c modified , text changed
Directorytrunk/finley/src/Assemble_interpolate.c modified , text changed
Directorytrunk/finley/src/Assemble_jacobeans.c modified , text changed
Directorytrunk/finley/src/CPPAdapter/FinleyAdapterException.h modified , text changed
Directorytrunk/finley/src/CPPAdapter/MeshAdapter.cpp modified , text changed
Directorytrunk/finley/src/CPPAdapter/MeshAdapterFactory.cpp modified , text changed
Directorytrunk/finley/src/CPPAdapter/SystemMatrixAdapter.cpp modified , text changed
Directorytrunk/finley/src/CPPAdapter/system_dep.h modified , text changed
Directorytrunk/finley/src/ElementFile.c modified , text changed
Directorytrunk/finley/src/ElementFile_createColoring.c modified , text changed
Directorytrunk/finley/src/ElementFile_markNodes.c modified , text changed
Directorytrunk/finley/src/IndexList.c modified , text changed
Directorytrunk/finley/src/Mesh_createNodeFileMappings.c modified , text changed
Directorytrunk/finley/src/Mesh_getPattern.c modified , text changed
Directorytrunk/finley/src/Mesh_optimizeDOFLabeling.c modified , text changed
Directorytrunk/finley/src/Mesh_read.c modified , text changed
Directorytrunk/finley/src/Mesh_readGmsh.c modified , text changed
Directorytrunk/finley/src/Mesh_saveVTK.c modified , text changed
Directorytrunk/finley/src/NodeFile_gather.c modified , text changed
Directorytrunk/finley/src/NodeFile_setTags.c modified , text changed
Directorytrunk/finley/test/python/run_linearPDEsOnFinley.py.branch_version deleted
Directorytrunk/paso/src/BiCGStab.c modified , text changed
Directorytrunk/paso/src/Common.h modified , text changed
Directorytrunk/paso/src/Coupler.c modified , text changed
Directorytrunk/paso/src/Distribution.c modified , text changed
Directorytrunk/paso/src/FGMRES.c modified , text changed
Directorytrunk/paso/src/Functions.c modified , text changed
Directorytrunk/paso/src/GMRES.c modified , text changed
Directorytrunk/paso/src/PCG.c modified , text changed
Directorytrunk/paso/src/Paso_MPI.c modified , text changed
Directorytrunk/paso/src/Paso_MPI.h modified , text changed
Directorytrunk/paso/src/Pattern_unrollBlocks.c modified , text changed
Directorytrunk/paso/src/Solver.c modified , text changed
Directorytrunk/paso/src/SolverFCT.c modified , text changed
Directorytrunk/paso/src/SolverFCT_FluxControl.c modified , text changed
Directorytrunk/paso/src/SolverFCT_solve.c modified , text changed
Directorytrunk/paso/src/Solver_ILU.c modified , text changed
Directorytrunk/paso/src/SparseMatrix.c modified , text changed
Directorytrunk/paso/src/SparseMatrix_MatrixVector.c modified , text changed
Directorytrunk/paso/src/SparseMatrix_addAbsRow.c modified , text changed
Directorytrunk/paso/src/SparseMatrix_addRow.c modified , text changed
Directorytrunk/paso/src/SparseMatrix_nullifyRowsAndCols.c modified , text changed
Directorytrunk/paso/src/SparseMatrix_saveHB.c modified , text changed
Directorytrunk/paso/src/SystemMatrix_MatrixVector.c modified , text changed
Directorytrunk/paso/src/mmio.c modified , text changed
Directorytrunk/pyvisi/py_src/movie.py modified , text changed
Directorytrunk/scons/linux_gcc_eg_options.py modified , text changed
Directorytrunk/scons/windows_intelc_options.py modified , text changed
Directorytrunk/scons/windows_mscv71_options.py modified , text changed

  ViewVC Help
Powered by ViewVC 1.1.26