OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Re-add copying overload of AutoDiffBlock::function().

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2015-03-19 11:25:47 +01:00
parent 0a76af1b14
commit ad3da1d946
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/AutoDiffBlock.hpp
View File

@@ -188,6 +188,8 @@ namespace Opm
} }
/// Create an AutoDiffBlock by directly specifying values and jacobians. /// Create an AutoDiffBlock by directly specifying values and jacobians.
/// This version of function() moves its arguments and is therefore
/// quite efficient, but leaves the argument variables empty (but valid).
/// \param[in] val values /// \param[in] val values
/// \param[in] jac vector of jacobians /// \param[in] jac vector of jacobians
static AutoDiffBlock function(V&& val, std::vector<M>&& jac) static AutoDiffBlock function(V&& val, std::vector<M>&& jac)
@@ -195,6 +197,18 @@ namespace Opm
return AutoDiffBlock(std::move(val), std::move(jac)); return AutoDiffBlock(std::move(val), std::move(jac));
} }
/// Create an AutoDiffBlock by directly specifying values and jacobians.
/// This version of function() copies its arguments and is therefore
/// less efficient than the other (moving) overload.
/// \param[in] val values
/// \param[in] jac vector of jacobians
static AutoDiffBlock function(const V& val, const std::vector<M>& jac)
{
V val_copy(val);
std::vector<M> jac_copy(jac);
return AutoDiffBlock(std::move(val_copy), std::move(jac_copy));
}
/// Construct a set of primary variables, each initialized to /// Construct a set of primary variables, each initialized to
/// a given vector. /// a given vector.
static std::vector<AutoDiffBlock> variables(const std::vector<V>& initial_values) static std::vector<AutoDiffBlock> variables(const std::vector<V>& initial_values)