/[escript]/trunk/escript/src/system_dep.h
ViewVC logotype

Contents of /trunk/escript/src/system_dep.h

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1628 - (show annotations)
Fri Jul 11 13:12:46 2008 UTC (11 years, 5 months ago) by phornby
File MIME type: text/plain
File size: 1836 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
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 /**
17 \file system_dep.h
18 \ingroup Other
19 */
20 /*
21 @(#) system_dep.h
22 */
23
24
25 #ifndef escript_system_dep_h
26 #define escript_system_dep_h
27
28
29 #ifdef NO_FLOAT_H
30 # define DBL_EPSILON 2.2204460492503131E-16
31 # define DBL_MAX 1.7976931348623157E+308
32 # define DBL_MIN 2.2250738585072014E-308
33 #else /* for the rest of the world */
34 # include <float.h>
35 #endif
36 #include <limits.h>
37
38 # ifdef __INTEL_COMPILER
39 /*
40 The Intel compiler on windows has an "improved" math library compared to the usual Visual C++ one
41 In particular it has a acosh and other similar functions which aren't implemented in Visual C++ math.h
42 Note you will get a compile time error if any other header (including system ones) includes math.h whilst mathimf.h
43 has been included. As a result system_dep.h must be included FIRST at all times (this prevents math.h from being included).
44 */
45 # include <mathimf.h>
46 # else
47 # include <math.h>
48 # endif
49
50 #ifndef M_PI
51 # define M_PI 3.14159265358979323846
52 #endif
53
54 #ifndef SQRT_DBL_EPSILON
55 # define SQRT_DBL_EPSILON 1.4901161193847656e-08
56 #endif
57
58 #ifndef M_LN2
59 # define M_LN2 0.69314718055994530942 /* log_e 2 */
60 #endif
61
62 #ifdef _WIN32
63
64 # ifndef INTERFACE_STATIC_LIB
65 # ifdef ESCRIPT_EXPORTS
66 # define ESCRIPT_DLL_API __declspec(dllexport)
67 # else
68 # define ESCRIPT_DLL_API __declspec(dllimport)
69 # endif
70 # endif
71
72 #else
73 # define ESCRIPT_DLL_API
74 #endif
75
76 #endif
  ViewVC Help
Powered by ViewVC 1.1.26