OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-20 01:32:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22 from jnygaard/scalar_mult

Browse Source 
Scalar mult
This commit is contained in:
Bård Skaflestad 2013-08-05 01:09:08 -07:00
commit cb20a8cc74
3 changed files with 102 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists_files.cmake
View File

@ -44,6 +44,7 @@ list (APPEND TEST_SOURCE_FILES
tests/test_boprops_ad.cpp
tests/test_span.cpp
tests/test_syntax.cpp
tests/test_scalar_mult.cpp
)
list (APPEND TEST_DATA_FILES

37
opm/autodiff/AutoDiffBlock.hpp
View File

@ -242,7 +242,7 @@ namespace AutoDiff
V val_;
std::vector<M> jac_;
};
};
template <class Ostream, typename Scalar>
@ -333,6 +333,41 @@ namespace AutoDiff
}
/**
* @brief Operator for multiplication with a scalar on the right-hand side
*
* @param lhs The left-hand side AD forward block
* @param rhs The scalar to multiply with
* @return The product
*/
template <typename Scalar>
ForwardBlock<Scalar> operator*(const ForwardBlock<Scalar>& lhs,
const Scalar& rhs)
{
std::vector< typename ForwardBlock<Scalar>::M > jac;
jac.reserve( lhs.numBlocks() );
for (int block=0; block<lhs.numBlocks(); block++) {
jac.emplace_back( lhs.derivative()[block] * rhs );
}
return ForwardBlock<Scalar>::function( lhs.value() * rhs, jac );
}
/**
* @brief Operator for multiplication with a scalar on the left-hand side
*
* @param lhs The scalar to multiply with
* @param rhs The right-hand side AD forward block
* @return The product
*/
template <typename Scalar>
ForwardBlock<Scalar> operator*(const Scalar& lhs,
const ForwardBlock<Scalar>& rhs)
{
return rhs * lhs; // Commutative operation.
}
} // namespace Autodiff

65
tests/test_scalar_mult.cpp Normal file
View File

@ -0,0 +1,65 @@
/*
Copyright 2013 SINTEF ICT, Applied Mathematics.
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#if HAVE_DYNAMIC_BOOST_TEST
#define BOOST_TEST_DYN_LINK
#endif
#define BOOST_TEST_MODULE AutoDiffBlockTest
#include <opm/autodiff/AutoDiffBlock.hpp>
#include <boost/test/unit_test.hpp>
#include <Eigen/Eigen>
#include <Eigen/Sparse>
BOOST_AUTO_TEST_CASE(ScalarMultiplication)
{
typedef AutoDiff::ForwardBlock<double> ADB;
std::vector<int> blocksizes = { 3, 1, 2 };
ADB::V vx(3);
vx << 1.0, 2.0, 10.0;
enum { FirstVar = 0, SecondVar = 1, ThirdVar = 2 };
ADB x = ADB::variable(FirstVar, vx, blocksizes);
ADB::V const_vector(3);
const_vector << 3.14, 3.14, 3.14;
// std::cout << "const_vector:\n" << const_vector << std::endl;
const ADB x2 = x * const_vector;
const ADB x3 = const_vector * x;
BOOST_CHECK_EQUAL( x2.value().cwiseNotEqual( x3.value() ).count(), 0 );
// The new operator:
const ADB y2 = x * 3.14;
BOOST_CHECK_EQUAL( x2.value().cwiseNotEqual( y2.value() ).count(), 0 );
const ADB y3 = 3.14 * x;
BOOST_CHECK_EQUAL( x3.value().cwiseNotEqual( y3.value() ).count(), 0 );
}