/[escript]/branches/stage3.0/scons/linux_gcc_eg_options.py
ViewVC logotype

Annotation of /branches/stage3.0/scons/linux_gcc_eg_options.py

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (hide annotations)
Fri Jul 11 13:12:46 2008 UTC (11 years, 3 months ago) by phornby
Original Path: trunk/scons/linux_gcc_eg_options.py
File MIME type: text/x-python
File size: 1295 byte(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.


1 ksteube 1312 #
2     # $Id$
3     #
4     #######################################################
5     #
6     # Copyright 2003-2007 by ACceSS MNRF
7     # Copyright 2007 by University of Queensland
8     #
9     # http://esscc.uq.edu.au
10     # Primary Business: Queensland, Australia
11     # Licensed under the Open Software License version 3.0
12     # http://www.opensource.org/licenses/osl-3.0.php
13     #
14     #######################################################
15     #
16 phornby 869
17     import sys
18    
19     # locations of include files for python
20     python_path = "/usr/include/python%s.%s"%(sys.version_info[0],sys.version_info[1])
21     python_lib_path = '/usr/lib'
22     python_lib = "python%s.%s"%(sys.version_info[0],sys.version_info[1])
23    
24     # locations of libraries for boost
25     boost_path = '/usr/include'
26 ksteube 1250 boost_lib_path = '/usr/lib'
27     boost_lib = 'boost_python'
28 phornby 869
29 phornby 1628 useNetCDF = 'yes'
30     netCDF_libs = ['netcdf', 'netcdf_c++']
31    
32 phornby 869 # locations of doc building executables
33     doxygen_path = '/usr/bin'
34     epydoc_path = '/usr/bin'
35    
36     # c flags to use
37     cc_flags = '-O3 -std=c99 -fpic --no-warn -W -Wno-unknown-pragmas'
38     cc_flags_debug = '-g -O0 -std=c99 -fpic --no-warn -W -Wno-unknown-pragmas'
39    
40     # c++ flags to use
41     cxx_flags = '-ansi'
42     cxx_flags_debug = '-ansi -DDOASSERT -DDOPROF'
43    
44     # static library archiver flags to use
45     #ar_flags = 'crus'
46    
47     # system specific libraries to link with
48     #sys_libs = []

  ViewVC Help
Powered by ViewVC 1.1.26