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

Merge pull request #3390 from akva2/janitoring

Browse Source 
fixed: do not assert conditions guaranteed by unsigned
This commit is contained in:
Bård Skaflestad 2021-06-18 16:52:47 +02:00 committed by GitHub
commit 7a9c9bedea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ebos/eclfluxmodule.hh
View File

@ -181,7 +181,7 @@ protected:
*/ */
unsigned upstreamIndex_(unsigned phaseIdx) const unsigned upstreamIndex_(unsigned phaseIdx) const
{ {
assert(0 <= phaseIdx && phaseIdx < numPhases); assert(phaseIdx < numPhases);
return upIdx_[phaseIdx]; return upIdx_[phaseIdx];
} }
@ -195,7 +195,7 @@ protected:
*/ */
unsigned downstreamIndex_(unsigned phaseIdx) const unsigned downstreamIndex_(unsigned phaseIdx) const
{ {
assert(0 <= phaseIdx && phaseIdx < numPhases); assert(phaseIdx < numPhases);
return dnIdx_[phaseIdx]; return dnIdx_[phaseIdx];
} }

3
opm/simulators/utils/DeferredLogger.cpp
View File

@ -17,8 +17,9 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <config.h>
#include <opm/simulators/utils/DeferredLogger.hpp> #include <opm/simulators/utils/DeferredLogger.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
namespace Opm namespace Opm
{ {

2
opm/simulators/utils/DeferredLogger.hpp
View File

@ -21,8 +21,6 @@
#ifndef OPM_DEFERREDLOGGER_HEADER_INCLUDED #ifndef OPM_DEFERREDLOGGER_HEADER_INCLUDED
#define OPM_DEFERREDLOGGER_HEADER_INCLUDED #define OPM_DEFERREDLOGGER_HEADER_INCLUDED
#include <opm/common/OpmLog/OpmLog.hpp>
#include <string> #include <string>
#include <vector> #include <vector>