OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-16 10:52:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'bska/fully-implicit' into fully-implicit

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen committed 2013-05-25 10:50:00 +02:00
2 parents b88dfd6af2 7432ca215f
commit 8a740eeab4
2 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/autodiff/FullyImplicitBlackoilSolver.cpp
+1
View File
@@ -30,6 +30,7 @@
#include <opm/core/grid.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <cassert>
typedef AutoDiff::ForwardBlock<double> ADB;
typedef ADB::V V;
tests/test_span.cpp
+8 -9
View File
@@ -35,16 +35,16 @@ BOOST_AUTO_TEST_CASE(OneArgConstr)
{
const int num = 4;
const Span s(num);
BOOST_CHECK(s.size() == num);
BOOST_CHECK_EQUAL(s.size(), num);
for (int i = 0; i < num; ++i) {
BOOST_CHECK(s[i] == i);
BOOST_CHECK_EQUAL(s[i], i);
}
int count = 0;
for (Span::const_iterator it = s.begin(); it != s.end(); ++it) {
BOOST_CHECK(*it == count);
BOOST_CHECK_EQUAL(*it, count);
++count;
}
BOOST_CHECK(count = num);
BOOST_CHECK_EQUAL(count, num);
}
BOOST_AUTO_TEST_CASE(ThreeArgConstr)
@@ -55,15 +55,14 @@ BOOST_AUTO_TEST_CASE(ThreeArgConstr)
const int seq[num] = { start, start + 1*stride, start + 2*stride };
const Span s(num, stride, start);
BOOST_CHECK(s.size() == num);
BOOST_CHECK_EQUAL(s.size(), num);
for (int i = 0; i < num; ++i) {
BOOST_CHECK(s[i] == seq[i]);
BOOST_CHECK_EQUAL(s[i], seq[i]);
}
int count = 0;
for (Span::const_iterator it = s.begin(); it != s.end(); ++it) {
BOOST_CHECK(*it == seq[count]);
BOOST_CHECK_EQUAL(*it, seq[count]);
++count;
}
BOOST_CHECK(count = num);
BOOST_CHECK_EQUAL(count, num);
}