/[escript]/trunk/escript/src/Data.cpp
ViewVC logotype

Diff of /trunk/escript/src/Data.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2047 by jfenwick, Thu Nov 13 06:17:12 2008 UTC revision 2048 by phornby, Mon Nov 17 08:46:00 2008 UTC
# Line 21  Line 21 
21  #include "DataLazy.h"  #include "DataLazy.h"
22  #include "FunctionSpaceFactory.h"  #include "FunctionSpaceFactory.h"
23  #include "AbstractContinuousDomain.h"  #include "AbstractContinuousDomain.h"
24    #if defined (_WIN32) && !defined(__INTEL_COMPILER)
25  #include "UnaryFuncs.h"  #include "UnaryFuncs.h"
26    #endif
27  #include "FunctionSpaceException.h"  #include "FunctionSpaceException.h"
28  #include "EscriptParams.h"  #include "EscriptParams.h"
29    
# Line 1324  Data::tanh() const Line 1326  Data::tanh() const
1326  Data  Data
1327  Data::erf() const  Data::erf() const
1328  {  {
1329  #ifdef _WIN32  #if defined (_WIN32) && !defined(__INTEL_COMPILER)
1330    throw DataException("Error - Data:: erf function is not supported on _WIN32 platforms.");    throw DataException("Error - Data:: erf function is not supported on _WIN32 platforms.");
1331  #else  #else
1332    if (isLazy())    if (isLazy())
# Line 1344  Data::asinh() const Line 1346  Data::asinh() const
1346      DataLazy* c=new DataLazy(borrowDataPtr(),ASINH);      DataLazy* c=new DataLazy(borrowDataPtr(),ASINH);
1347      return Data(c);      return Data(c);
1348    }    }
1349  #ifdef _WIN32  #if defined (_WIN32) && !defined(__INTEL_COMPILER)
1350    return C_TensorUnaryOperation(*this, escript::asinh_substitute);    return C_TensorUnaryOperation(*this, escript::asinh_substitute);
1351  #else  #else
1352    return C_TensorUnaryOperation(*this, ::asinh);    return C_TensorUnaryOperation(*this, ::asinh);
# Line 1359  Data::acosh() const Line 1361  Data::acosh() const
1361      DataLazy* c=new DataLazy(borrowDataPtr(),ACOSH);      DataLazy* c=new DataLazy(borrowDataPtr(),ACOSH);
1362      return Data(c);      return Data(c);
1363    }    }
1364  #ifdef _WIN32  #if defined (_WIN32) && !defined(__INTEL_COMPILER)
1365    return C_TensorUnaryOperation(*this, escript::acosh_substitute);    return C_TensorUnaryOperation(*this, escript::acosh_substitute);
1366  #else  #else
1367    return C_TensorUnaryOperation(*this, ::acosh);    return C_TensorUnaryOperation(*this, ::acosh);
# Line 1374  Data::atanh() const Line 1376  Data::atanh() const
1376      DataLazy* c=new DataLazy(borrowDataPtr(),ATANH);      DataLazy* c=new DataLazy(borrowDataPtr(),ATANH);
1377      return Data(c);      return Data(c);
1378    }    }
1379  #ifdef _WIN32  #if defined (_WIN32) && !defined(__INTEL_COMPILER)
1380    return C_TensorUnaryOperation(*this, escript::atanh_substitute);    return C_TensorUnaryOperation(*this, escript::atanh_substitute);
1381  #else  #else
1382    return C_TensorUnaryOperation(*this, ::atanh);    return C_TensorUnaryOperation(*this, ::atanh);
Legend:
Removed from v.2047  
changed lines
  Added in v.2048
  ViewVC Help
Powered by ViewVC 1.1.26