OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-15 16:33:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix some unknown pragma warnings if OpenMP is not enabled

Browse Source
This commit is contained in:
Andreas Lauser 2017-10-11 16:32:34 +02:00
parent 017ce16f5d
commit ceefb61c4a
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/autodiff/AutoDiffBlock.hpp
View File

@ -224,7 +224,9 @@ namespace Opm
assert (value().size() == rhs.value().size());
const int num_blocks = numBlocks();
#if HAVE_OPENMP
#pragma omp parallel for schedule(static)
#endif // HAVE_OPENMP
for (int block = 0; block < num_blocks; ++block) {
assert(jac_[block].rows() == rhs.jac_[block].rows());
assert(jac_[block].cols() == rhs.jac_[block].cols());
@ -243,7 +245,9 @@ namespace Opm
if (jac_.empty()) {
const int num_blocks = rhs.numBlocks();
jac_.resize(num_blocks);
#if HAVE_OPENMP
#pragma omp parallel for schedule(static)
#endif // HAVE_OPENMP
for (int block = 0; block < num_blocks; ++block) {
jac_[block] = rhs.jac_[block] * (-1.0);
}
@ -252,7 +256,9 @@ namespace Opm
assert (value().size() == rhs.value().size());
const int num_blocks = numBlocks();
#if HAVE_OPENMP
#pragma omp parallel for schedule(static)
#endif // HAVE_OPENMP
for (int block = 0; block < num_blocks; ++block) {
assert(jac_[block].rows() == rhs.jac_[block].rows());
assert(jac_[block].cols() == rhs.jac_[block].cols());
@ -280,7 +286,9 @@ namespace Opm
std::vector<M> jac = jac_;
assert(numBlocks() == rhs.numBlocks());
int num_blocks = numBlocks();
#if HAVE_OPENMP
#pragma omp parallel for schedule(static)
#endif // HAVE_OPENMP
for (int block = 0; block < num_blocks; ++block) {
assert(jac[block].rows() == rhs.jac_[block].rows());
assert(jac[block].cols() == rhs.jac_[block].cols());
@ -304,7 +312,9 @@ namespace Opm
std::vector<M> jac = jac_;
assert(numBlocks() == rhs.numBlocks());
int num_blocks = numBlocks();
#if HAVE_OPENMP
#pragma omp parallel for schedule(static)
#endif // HAVE_OPENMP
for (int block = 0; block < num_blocks; ++block) {
assert(jac[block].rows() == rhs.jac_[block].rows());
assert(jac[block].cols() == rhs.jac_[block].cols());
@ -330,7 +340,9 @@ namespace Opm
assert(numBlocks() == rhs.numBlocks());
M D1(val_.matrix().asDiagonal());
M D2(rhs.val_.matrix().asDiagonal());
#if HAVE_OPENMP
#pragma omp parallel for schedule(dynamic)
#endif // HAVE_OPENMP
for (int block = 0; block < num_blocks; ++block) {
assert(jac_[block].rows() == rhs.jac_[block].rows());
assert(jac_[block].cols() == rhs.jac_[block].cols());
@ -368,7 +380,9 @@ namespace Opm
M D1(val_.matrix().asDiagonal());
M D2(rhs.val_.matrix().asDiagonal());
M D3((1.0/(rhs.val_*rhs.val_)).matrix().asDiagonal());
#if HAVE_OPENMP
#pragma omp parallel for schedule(dynamic)
#endif // HAVE_OPENMP
for (int block = 0; block < num_blocks; ++block) {
assert(jac_[block].rows() == rhs.jac_[block].rows());
assert(jac_[block].cols() == rhs.jac_[block].cols());
@ -493,7 +507,9 @@ namespace Opm
int num_blocks = rhs.numBlocks();
std::vector<typename AutoDiffBlock<Scalar>::M> jac(num_blocks);
assert(lhs.cols() == rhs.value().rows());
#if HAVE_OPENMP
#pragma omp parallel for schedule(dynamic)
#endif // HAVE_OPENMP
for (int block = 0; block < num_blocks; ++block) {
fastSparseProduct(lhs, rhs.derivative()[block], jac[block]);
}

2
opm/autodiff/BlackoilWellModel_impl.hpp
View File

@ -560,6 +560,8 @@ namespace Opm {
// we simply return.
if( !wellsActive() ) return ;
#if HAVE_OPENMP
#endif // HAVE_OPENMP
wellhelpers::WellSwitchingLogger logger;
for (const auto& well : well_container_) {

4
opm/autodiff/WellHelpers.hpp
View File

@ -163,7 +163,9 @@ namespace Opm {
const int nw = wells.number_of_wells;
Vector retval = Vector::Zero(nw);
#if HAVE_OPENMP
#pragma omp parallel for schedule(static)
#endif // HAVE_OPENMP
for (int i=0; i<nw; ++i) {
const int perf = wells.well_connpos[i];
retval[i] = computeHydrostaticCorrection(wells, i, vfp_ref_depth[i], well_perforation_densities[perf], gravity);
@ -178,7 +180,9 @@ namespace Opm {
const int nw = wells.number_of_wells;
std::vector<double> retval(nw,0.0);
#if HAVE_OPENMP
#pragma omp parallel for schedule(static)
#endif // HAVE_OPENMP
for (int i=0; i<nw; ++i) {
const int perf = wells.well_connpos[i];
retval[i] = computeHydrostaticCorrection(wells, i, vfp_ref_depth[i], well_perforation_densities[perf], gravity);