/[escript]/branches/split/weipa/src/DataVar.cpp
ViewVC logotype

Diff of /branches/split/weipa/src/DataVar.cpp

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

revision 3398 by caltinay, Mon Dec 6 00:02:33 2010 UTC revision 3867 by caltinay, Thu Mar 15 05:45:54 2012 UTC
# Line 139  bool DataVar::initFromEscript(escript::D Line 139  bool DataVar::initFromEscript(escript::D
139          initialized = false;          initialized = false;
140      }      }
141    
142        // special case: shape=(1,) or shape=(1,1) -> convert to scalar
143        if (dimSize==1 && rank>0) {
144            rank=0;
145            shape.clear();
146        }
147    
148      if (initialized) {      if (initialized) {
149          size_t dataSize = dimSize * ptsPerSample;          size_t dataSize = dimSize * ptsPerSample;
150          float* tempData = new float[dataSize*numSamples];          float* tempData = new float[dataSize*numSamples];

Legend:
Removed from v.3398  
changed lines
  Added in v.3867

  ViewVC Help
Powered by ViewVC 1.1.26