/[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 2037 by jfenwick, Thu Nov 13 06:17:12 2008 UTC revision 2066 by jfenwick, Thu Nov 20 05:31:33 2008 UTC
# Line 1324  Data::tanh() const Line 1324  Data::tanh() const
1324  Data  Data
1325  Data::erf() const  Data::erf() const
1326  {  {
1327  #ifdef _WIN32  #if defined (_WIN32) && !defined(__INTEL_COMPILER)
1328    throw DataException("Error - Data:: erf function is not supported on _WIN32 platforms.");    throw DataException("Error - Data:: erf function is not supported on _WIN32 platforms.");
1329  #else  #else
1330    if (isLazy())    if (isLazy())
# Line 1344  Data::asinh() const Line 1344  Data::asinh() const
1344      DataLazy* c=new DataLazy(borrowDataPtr(),ASINH);      DataLazy* c=new DataLazy(borrowDataPtr(),ASINH);
1345      return Data(c);      return Data(c);
1346    }    }
1347  #ifdef _WIN32  #if defined (_WIN32) && !defined(__INTEL_COMPILER)
1348    return C_TensorUnaryOperation(*this, escript::asinh_substitute);    return C_TensorUnaryOperation(*this, escript::asinh_substitute);
1349  #else  #else
1350    return C_TensorUnaryOperation(*this, ::asinh);    return C_TensorUnaryOperation(*this, ::asinh);
# Line 1359  Data::acosh() const Line 1359  Data::acosh() const
1359      DataLazy* c=new DataLazy(borrowDataPtr(),ACOSH);      DataLazy* c=new DataLazy(borrowDataPtr(),ACOSH);
1360      return Data(c);      return Data(c);
1361    }    }
1362  #ifdef _WIN32  #if defined (_WIN32) && !defined(__INTEL_COMPILER)
1363    return C_TensorUnaryOperation(*this, escript::acosh_substitute);    return C_TensorUnaryOperation(*this, escript::acosh_substitute);
1364  #else  #else
1365    return C_TensorUnaryOperation(*this, ::acosh);    return C_TensorUnaryOperation(*this, ::acosh);
# Line 1374  Data::atanh() const Line 1374  Data::atanh() const
1374      DataLazy* c=new DataLazy(borrowDataPtr(),ATANH);      DataLazy* c=new DataLazy(borrowDataPtr(),ATANH);
1375      return Data(c);      return Data(c);
1376    }    }
1377  #ifdef _WIN32  #if defined (_WIN32) && !defined(__INTEL_COMPILER)
1378    return C_TensorUnaryOperation(*this, escript::atanh_substitute);    return C_TensorUnaryOperation(*this, escript::atanh_substitute);
1379  #else  #else
1380    return C_TensorUnaryOperation(*this, ::atanh);    return C_TensorUnaryOperation(*this, ::atanh);
# Line 2512  escript::C_GeneralTensorProduct(Data& ar Line 2512  escript::C_GeneralTensorProduct(Data& ar
2512    // SM is the product of the last axis_offset entries in arg_0.getShape().    // SM is the product of the last axis_offset entries in arg_0.getShape().
2513    
2514    // deal with any lazy data    // deal with any lazy data
2515    if (arg_0.isLazy()) {arg_0.resolve();}  //   if (arg_0.isLazy()) {arg_0.resolve();}
2516    if (arg_1.isLazy()) {arg_1.resolve();}  //   if (arg_1.isLazy()) {arg_1.resolve();}
2517      if (arg_0.isLazy() || arg_1.isLazy())
2518      {
2519        DataLazy* c=new DataLazy(arg_0.borrowDataPtr(), arg_1.borrowDataPtr(), PROD, axis_offset,transpose);
2520        return Data(c);
2521      }
2522    
2523    // Interpolate if necessary and find an appropriate function space    // Interpolate if necessary and find an appropriate function space
2524    Data arg_0_Z, arg_1_Z;    Data arg_0_Z, arg_1_Z;
# Line 2923  Data::borrowReadyPtr() const Line 2928  Data::borrowReadyPtr() const
2928  std::string  std::string
2929  Data::toString() const  Data::toString() const
2930  {  {
2931      if (!m_data->isEmpty() &&      if (!m_data->isEmpty() &&
2932      getNumDataPoints()*getDataPointSize()>escriptParams.getInt("TOO_MANY_LINES"))      !m_data->isLazy() &&
2933        getLength()>escriptParams.getInt("TOO_MANY_LINES"))
2934      {      {
2935      stringstream temp;      stringstream temp;
2936      temp << "Summary: inf="<< inf_const() << " sup=" << sup_const() << " data points=" << getNumDataPoints();      temp << "Summary: inf="<< inf_const() << " sup=" << sup_const() << " data points=" << getNumDataPoints();

Legend:
Removed from v.2037  
changed lines
  Added in v.2066

  ViewVC Help
Powered by ViewVC 1.1.26