Log of /trunk/esysUtils/src
Directory Listing
Revision
1628 -
Directory Listing
Modified
Fri Jul 11 13:12:46 2008 UTC
(12 years, 7 months ago)
by
phornby
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.
Revision
1562 -
Directory Listing
Modified
Wed May 21 13:04:40 2008 UTC
(12 years, 9 months ago)
by
gross
The algebraic upwinding with MPI. The case of boundary constraint needs still some attention.
Revision
1455 -
Directory Listing
Modified
Thu Feb 28 17:19:44 2008 UTC
(13 years ago)
by
phornby
Merge of branches/windows_from_1431_trunk.
Revamp of the exception system.
Fix unused vars and signed/unsigned comparisons.
defined a macro THROW(ARG) in the system_dep.h's to
deal with the expectations of declarations on different architectures.
Details in the logs of branches/windows_from_1431_trunk.
pre-merge snapshot of the trunk in tags/trunk_at_1452
Revision
1388 -
Directory Listing
Modified
Fri Jan 11 07:45:58 2008 UTC
(13 years, 1 month ago)
by
trankine
And get the *(&(*&(* name right
Revision
1387 -
Directory Listing
Modified
Fri Jan 11 07:45:26 2008 UTC
(13 years, 1 month ago)
by
trankine
Original Path:
temp/esysUtils/src
Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.
Revision
1312 -
Directory Listing
Modified
Mon Sep 24 06:18:44 2007 UTC
(13 years, 5 months ago)
by
ksteube
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.
Revision
1235 -
Directory Listing
Modified
Mon Aug 13 00:25:29 2007 UTC
(13 years, 6 months ago)
by
phornby
Started the removal of IS_WINDOWS_PLATFORM, and now insis that the windows options file be kept up to date, and be complete.
boost_libs -> boost_lib.
Revision
1133 -
Directory Listing
Modified
Tue May 8 07:19:33 2007 UTC
(13 years, 9 months ago)
by
gross
Changes needed for windows. This still does not work on and has not run on linux and the altix.
There are a few changes in names in the scons script, in particular _libs is used rather than _lib and _libs is always a list. By default on windows MSVC is used. The location of python is at C:\Program Files\python<version>, boost at C:\Program Files\boost and netcdf at C:\Program Files\netcdf.
Revision
1022 -
Directory Listing
Modified
Tue Mar 13 02:25:53 2007 UTC
(13 years, 11 months ago)
by
phornby
Now define the destructors for all the Exceptions (sorry guys & gals).
Revision
1020 -
Directory Listing
Modified
Mon Mar 12 10:12:36 2007 UTC
(13 years, 11 months ago)
by
phornby
Added explicit destructors to all Exception classes.
Fixed an ifdef in TestCase.cpp
Made the conditional definition of M_PI in LocalOps.h
depend only on M_PI being undefined.
Replace dynamically dimensioned arrays in DataFactory & DataTagged with malloc.
sort() method of list does not take a named argument
(despite the manual's claims to the contary).
Revision
779 -
Directory Listing
Modified
Fri Jul 14 07:41:31 2006 UTC
(14 years, 7 months ago)
by
woo409
+ Updated compilation options for Cognac to squeeze out a bit more performance
+ Now compiles using the Intel Math headers (mathimf.h) rather than plain math.h on both Win32 and Linux platforms when using the Intel compiler. Gives a small boost to performance on Altix and is essential on Windows
Revision
757 -
Directory Listing
Modified
Mon Jun 26 13:12:56 2006 UTC
(14 years, 8 months ago)
by
woo409
+ Merge of intelc_win32 branch (revision 741:755) with trunk. Tested on iVEC altix (run_tests and py_tests all pass)
Revision
727 -
Directory Listing
Modified
Fri May 12 06:31:06 2006 UTC
(14 years, 9 months ago)
by
gross
In case of an error in paso a seg fault occured. this was caused by
inproper deallocation of memory in this case. this problem is fixed now.
Revision
700 -
Directory Listing
Modified
Thu Apr 6 00:13:40 2006 UTC
(14 years, 10 months ago)
by
gross
A few changes in the build mechanism and the file structure so scons can build release tar files:
* paso/src/Solver has been moved to paso/src
* all test_.py are now run_.py files and are assumed to be passing python tests. they can run by
scons py_tests and are part of the release test set
* escript/py_src/test_ are moved to escript/test/python and are installed in to the build directory
(rather then the PYTHONPATH).
* all py files in test/python which don't start with run_ or test_ are now 'local_py_tests'. they are installed i
by not run automatically.
* CppUnitTest is now treated as a escript module (against previous decisions).
* scons realse builds nor tar/zip files with relvant source code (src and tests in seperate files)
the python tests don't pass yet due to path problems.
Revision
682 -
Directory Listing
Modified
Mon Mar 27 02:43:09 2006 UTC
(14 years, 11 months ago)
by
robwdcock
+ NEW BUILD SYSTEM
This commit contains the new build system with cross-platform support.
Most things work are before though you can have more control.
ENVIRONMENT settings have changed:
+ You no longer require LD_LIBRARY_PATH or PYTHONPATH to point to the
esysroot for building and testing performed via scons
+ ACcESS altix users: It is recommended you change your modules to load
the latest intel compiler and other libraries required by boost to match
the setup in svn (you can override). The correct modules are as follows
module load intel_cc.9.0.026
export
MODULEPATH=${MODULEPATH}:/data/raid2/toolspp4/modulefiles/gcc-3.3.6
module load boost/1.33.0/python-2.4.1
module load python/2.4.1
module load numarray/1.3.3
Revision
644 -
Directory Listing
Modified
Fri Mar 24 01:05:42 2006 UTC
(14 years, 11 months ago)
by
elspeth
More copyright.
Revision
468 -
Directory Listing
Modified
Wed Jan 25 06:50:39 2006 UTC
(15 years, 1 month ago)
by
jgs
reorganised esysUtils to remove inc directory
Revision
352 -
Directory Listing
Modified
Wed Dec 14 02:21:37 2005 UTC
(15 years, 2 months ago)
by
jgs
turns out Install() targets should also be made Default()
targets if you want them to actually reliably work!
Revision
225 -
Directory Listing
Modified
Fri Nov 25 01:22:34 2005 UTC
(15 years, 3 months ago)
by
jgs
pass in correct options to archiver for static libraries
Revision
223 -
Directory Listing
Modified
Thu Nov 24 23:12:13 2005 UTC
(15 years, 3 months ago)
by
jgs
pass in cc/cxx settings from config file
Revision
191 -
Directory Listing
Modified
Mon Nov 21 04:10:12 2005 UTC
(15 years, 3 months ago)
by
jgs
push platform dependent compiler flags and include directories up to library level scons files - these will eventually be brought in from external config files
Revision
190 -
Directory Listing
Modified
Mon Nov 21 03:27:42 2005 UTC
(15 years, 3 months ago)
by
jgs
pass in value for esysroot and use this to determine include file locations
Revision
188 -
Directory Listing
Modified
Mon Nov 21 01:20:26 2005 UTC
(15 years, 3 months ago)
by
jgs
explicitly add -fpic option to all compiler options lists
to ensure relocatable code is generated
Revision
180 -
Directory Listing
Modified
Fri Nov 18 03:29:44 2005 UTC
(15 years, 3 months ago)
by
jgs
first draft of scons config scripts for esysUtils library
Revision
155 -
Directory Listing
Modified
Wed Nov 9 02:02:19 2005 UTC
(15 years, 3 months ago)
by
jgs
move all directories from trunk/esys2 into trunk and remove esys2
