/[escript]/branches/clazy/escriptcore/src/DataLazy.cpp
ViewVC logotype

Diff of /branches/clazy/escriptcore/src/DataLazy.cpp

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

revision 6083 by jfenwick, Tue Mar 22 03:30:18 2016 UTC revision 6114 by jfenwick, Fri Apr 1 03:37:52 2016 UTC
# Line 5  Line 5 
5  * http://www.uq.edu.au  * http://www.uq.edu.au
6  *  *
7  * Primary Business: Queensland, Australia  * Primary Business: Queensland, Australia
8  * Licensed under the Open Software License version 3.0  * Licensed under the Apache License, version 2.0
9  * http://www.opensource.org/licenses/osl-3.0.php  * http://www.apache.org/licenses/LICENSE-2.0
10  *  *
11  * Development until 2012 by Earth Systems Science Computational Center (ESSCC)  * Development until 2012 by Earth Systems Science Computational Center (ESSCC)
12  * Development 2012-2013 by School of Earth Sciences  * Development 2012-2013 by School of Earth Sciences
# Line 20  Line 20 
20  #include "EscriptParams.h"  #include "EscriptParams.h"
21  #include "FunctionSpace.h"  #include "FunctionSpace.h"
22  #include "Utils.h"  #include "Utils.h"
23  #include "DataMaths.h"  #include "DataVectorOps.h"
24    
25  #ifdef USE_NETCDF  #ifdef USE_NETCDF
26  #include <netcdfcpp.h>  #include <netcdfcpp.h>
# Line 155  string ES_opstrings[]={"UNKNOWN","IDENTI Line 155  string ES_opstrings[]={"UNKNOWN","IDENTI
155                          "asinh","acosh","atanh",                          "asinh","acosh","atanh",
156                          "log10","log","sign","abs","neg","pos","exp","sqrt",                          "log10","log","sign","abs","neg","pos","exp","sqrt",
157                          "1/","where>0","where<0","where>=0","where<=0", "where<>0","where=0",                          "1/","where>0","where<0","where>=0","where<=0", "where<>0","where=0",
158                          "symmetric","nonsymmetric",                          "symmetric","antisymmetric",
159                          "prod",                          "prod",
160                          "transpose", "trace",                          "transpose", "trace",
161                          "swapaxes",                          "swapaxes",
# Line 478  DataLazy::DataLazy(DataAbstract_ptr p) Line 478  DataLazy::DataLazy(DataAbstract_ptr p)
478     }     }
479     else     else
480     {     {
         p->makeLazyShared();  
481          DataReady_ptr dr=dynamic_pointer_cast<DataReady>(p);          DataReady_ptr dr=dynamic_pointer_cast<DataReady>(p);
482          makeIdentity(dr);          makeIdentity(dr);
483  LAZYDEBUG(cout << "Wrapping " << dr.get() << " id=" << m_id.get() << endl;)  LAZYDEBUG(cout << "Wrapping " << dr.get() << " id=" << m_id.get() << endl;)
# Line 943  DataLazy::collapseToReady() const Line 942  DataLazy::collapseToReady() const
942          result=left.symmetric();          result=left.symmetric();
943          break;          break;
944      case NSYM:      case NSYM:
945          result=left.nonsymmetric();          result=left.antisymmetric();
946          break;          break;
947      case PROD:      case PROD:
948          result=C_GeneralTensorProduct(left,right,m_axis_offset, m_transpose);          result=C_GeneralTensorProduct(left,right,m_axis_offset, m_transpose);
# Line 1248  DataLazy::resolveNodeNP1OUT(int tid, int Line 1247  DataLazy::resolveNodeNP1OUT(int tid, int
1247      case NSYM:      case NSYM:
1248          for (loop=0;loop<numsteps;++loop)          for (loop=0;loop<numsteps;++loop)
1249          {          {
1250              escript::nonsymmetric(*leftres,m_left->getShape(),subroffset, m_samples, getShape(), offset);              escript::antisymmetric(*leftres,m_left->getShape(),subroffset, m_samples, getShape(), offset);
1251              subroffset+=step;              subroffset+=step;
1252              offset+=step;              offset+=step;
1253          }          }

Legend:
Removed from v.6083  
changed lines
  Added in v.6114

  ViewVC Help
Powered by ViewVC 1.1.26