Merge pull request #590 from dr-robertk/PR/bugfix-in-backup-restore

Bugfix in backup/restore.
This commit is contained in:
Atgeirr Flø Rasmussen 2016-02-19 11:37:57 +01:00
commit af2455fdbe
2 changed files with 4 additions and 4 deletions

View File

@ -106,7 +106,7 @@ namespace Opm {
void readContainerImpl( std::istream& stream, Container& container, const bool adjustSize )
{
typedef typename Container :: value_type T;
size_t dataSize = 0;
unsigned int dataSize = 0;
readValue( stream, dataSize );
if( adjustSize && dataSize > 0 ) {
resizeContainer( container, dataSize/sizeof(T) );
@ -115,7 +115,7 @@ namespace Opm {
if( dataSize != container.size() * sizeof( T ) )
{
OPM_THROW(std::logic_error,
"Size of stored data and simulation data does not match"
"Size of stored data and simulation data does not match "
<< dataSize << " " << (container.size() * sizeof( T )) );
}
if( dataSize > 0 ) {

View File

@ -245,7 +245,7 @@ fastSparseAdd(Lhs& lhs, const Rhs& rhs)
else
{
// default Eigen operator+=
lhs = lhs + rhs;
lhs += rhs;
}
}
@ -274,7 +274,7 @@ fastSparseSubstract(Lhs& lhs, const Rhs& rhs)
else
{
// default Eigen operator-=
lhs = lhs - rhs;
lhs -= rhs;
}
}