/[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

trunk/escript/src/Data.cpp revision 1350 by matt, Thu Nov 22 01:17:20 2007 UTC temp/escript/src/Data.cpp revision 1387 by trankine, Fri Jan 11 07:45:26 2008 UTC
# Line 1768  Data::setTaggedValue(int tagKey, Line 1768  Data::setTaggedValue(int tagKey,
1768    }    }
1769    //    //
1770    // Ensure underlying data object is of type DataTagged    // Ensure underlying data object is of type DataTagged
1771    tag();    if (isConstant()) tag();
   
   if (!isTagged()) {  
     throw DataException("Error - DataTagged conversion failed!!");  
   }  
1772    
1773    numeric::array asNumArray(value);    numeric::array asNumArray(value);
1774    
# Line 1803  Data::setTaggedValueFromCPP(int tagKey, Line 1799  Data::setTaggedValueFromCPP(int tagKey,
1799    }    }
1800    //    //
1801    // Ensure underlying data object is of type DataTagged    // Ensure underlying data object is of type DataTagged
1802    tag();    if (isConstant()) tag();
   
   if (!isTagged()) {  
     throw DataException("Error - DataTagged conversion failed!!");  
   }  
1803    
1804    //    //
1805    // Call DataAbstract::setTaggedValue    // Call DataAbstract::setTaggedValue
# Line 1817  Data::setTaggedValueFromCPP(int tagKey, Line 1809  Data::setTaggedValueFromCPP(int tagKey,
1809  int  int
1810  Data::getTagNumber(int dpno)  Data::getTagNumber(int dpno)
1811  {  {
1812    return m_data->getTagNumber(dpno);    return getFunctionSpace().getTagFromSampleNo(dpno);
1813  }  }
1814    
1815  void  void

Legend:
Removed from v.1350  
changed lines
  Added in v.1387

  ViewVC Help
Powered by ViewVC 1.1.26