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

Merge pull request #380 from akva2/janitoring

Browse Source 
Some janitoring

Also fixes #374.
This commit is contained in:
Bård Skaflestad
2023-05-31 12:37:13 +02:00
committed by GitHub
parent 9219235c5b e5922b818f
commit f70f92aff3
4 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/cpchop.cpp
View File

@@ -363,7 +363,6 @@ try
std::vector<double> cellVolumes, cellPoreVolumes;
cellVolumes.resize(satnums.size(), 0.0);
cellPoreVolumes.resize(satnums.size(), 0.0);
int tesselatedCells = 0;
//double maxSinglePhasePerm = 0;
double Swirvolume = 0;
double Sworvolume = 0;
@@ -400,7 +399,6 @@ try
Swirvolume += minSw * cellPoreVolumes[cell_idx];
Sworvolume += maxSw * cellPoreVolumes[cell_idx];
}
++tesselatedCells; // keep count.
}
// If upscling=false, we still (may) want to have porosities together with endpoints

6
opm/core/transport/implicit/NormSupport.hpp
View File

@@ -44,7 +44,7 @@
namespace Opm {
namespace ImplicitTransportDefault {
template <typename T>
class MaxAbs : public ::std::binary_function <double, T, double> {
class MaxAbs {
public:
double
operator()(double x, const T& y) {
@@ -56,7 +56,7 @@ namespace Opm {
};
template <typename T>
class SumAbs : public ::std::binary_function <double, T, double> {
class SumAbs {
public:
double
operator()(double x, const T& y) {
@@ -68,7 +68,7 @@ namespace Opm {
};
template <typename T>
class Euclid : public ::std::binary_function <double, T, double> {
class Euclid {
public:
double
operator()(double x, const T& y) {

2
opm/porsol/mimetic/IncompFlowSolverHybrid.hpp
View File

@@ -155,7 +155,7 @@ namespace Opm {
/// and usually @code T @endcode is an alias for @code
/// double @endcode.
template<typename T>
class axpby : public std::binary_function<T,T,T> {
class axpby {
public:
/// @brief Constructor.
/// @param [in] a

11
opm/upscaling/UpscalerBase_impl.hpp
View File

@@ -296,16 +296,9 @@ namespace Opm
double side1_area = 0.0;
double side2_area = 0.0;
int num_faces = 0;
int num_bdyfaces = 0;
int num_side1 = 0;
int num_side2 = 0;
for (CellIter c = ginterf_.cellbegin(); c != ginterf_.cellend(); ++c) {
for (FaceIter f = c->facebegin(); f != c->faceend(); ++f) {
++num_faces;
if (f->boundary()) {
++num_bdyfaces;
int canon_bid = bcond_.getCanonicalBoundaryId(f->boundaryId());
if ((canon_bid - 1)/2 == flow_dir) {
double flux = flow_solution.outflux(f);
@@ -313,7 +306,6 @@ namespace Opm
double norm_comp = f->normal()[flow_dir];
// std::cout << "bid " << f->boundaryId() << " area " << area << " n " << norm_comp << std::endl;
if (canon_bid - 1 == 2*flow_dir) {
++num_side1;
if (flow_dir == pdrop_dir && flux > 0.0) {
#ifdef VERBOSE
std::cerr << "Flow may be in wrong direction at bid: " << f->boundaryId()<<" (canonical: "<<canon_bid
@@ -325,7 +317,6 @@ namespace Opm
side1_area += area;
} else {
assert(canon_bid - 1 == 2*flow_dir + 1);
++num_side2;
if (flow_dir == pdrop_dir && flux < 0.0) {
#ifdef VERBOSE
std::cerr << "Flow may be in wrong direction at bid: " << f->boundaryId()
@@ -340,8 +331,6 @@ namespace Opm
}
}
}
// std::cout << "Faces: " << num_faces << " Boundary faces: " << num_bdyfaces
// << " Side 1 faces: " << num_side1 << " Side 2 faces: " << num_side2 << std::endl;
// q is the average velocity.
return 0.5*(side1_flux/side1_area + side2_flux/side2_area);
}