Merge pull request #1314 from andlaus/generic_maintainance

Generic maintainance

examples/flow_legacy.cpp

@@ -20,7 +20,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/flow_mpi.cpp

@@ -20,7 +20,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/flow_multisegment.cpp

@@ -20,7 +20,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/flow_multisegment_mpi.cpp

@@ -20,7 +20,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/flow_polymer.cpp

@@ -19,7 +19,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/flow_reorder.cpp

@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/flow_sequential.cpp

@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/flow_solvent.cpp

@@ -20,7 +20,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/sim_2p_comp_reorder.cpp

@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/sim_2p_incomp.cpp

@@ -18,7 +18,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/sim_2p_incomp_ad.cpp

@@ -19,7 +19,7 @@
 
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/sim_poly2p_comp_reorder.cpp

@@ -18,7 +18,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

examples/sim_poly2p_incomp_reorder.cpp

@@ -18,7 +18,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

opm/autodiff/AutoDiffBlock.hpp

@@ -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]);
         }

opm/autodiff/BlackoilWellModel_impl.hpp

@@ -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_) {

opm/autodiff/ParallelOverlappingILU0.hpp

@@ -26,6 +26,8 @@
 #include <dune/istl/paamg/smoother.hh>
 #include <dune/istl/paamg/pinfo.hh>
 
+#include <type_traits>
+
 namespace Opm
 {
 

opm/autodiff/SimulatorIncompTwophaseAd.cpp

@@ -18,7 +18,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

opm/autodiff/WellHelpers.hpp

@@ -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);

opm/polymer/SimulatorCompressiblePolymer.cpp

@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

opm/polymer/SimulatorPolymer.cpp

@@ -18,7 +18,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

opm/simulators/SimulatorCompressibleTwophase.cpp

@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

opm/simulators/SimulatorIncompTwophase.cpp

@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

opm/simulators/WellSwitchingLogger.cpp

@@ -18,7 +18,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

tests/test_singlecellsolves.cpp

@@ -18,7 +18,7 @@
 */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 

travis/build-and-test-opm-simulators.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-pushd . > /dev/null
-opm-simulators/travis/build-opm-simulators.sh
-cd opm-simulators/build
-ctest --output-on-failure
-popd > /dev/null

travis/build-opm-simulators.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-pushd . > /dev/null
-cd opm-simulators
-mkdir build
-cd build
-cmake -D SUPERLU_ROOT=../../SuperLU ../
-make
-popd > /dev/null