OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #899 from andlaus/error_macros_to_opm_common

Browse Source 
Error macros to opm common
This commit is contained in:
Atgeirr Flø Rasmussen committed 2015-10-12 13:31:42 +02:00
2 parents 0184d4a71d 26c6077ddb
commit 08eea02316
68 files changed
+65 -192
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CMakeLists_files.cmake
-2
View File
@@ -418,10 +418,8 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/utility/CompressedPropertyAccess.hpp
opm/core/utility/compressedToCartesian.hpp
opm/core/utility/DataMap.hpp
opm/core/utility/ErrorMacros.hpp
opm/core/utility/Event.hpp
opm/core/utility/Event_impl.hpp
opm/core/utility/Exceptions.hpp
opm/core/utility/Factory.hpp
opm/core/utility/MonotCubicInterpolator.hpp
opm/core/utility/memcmp_double.h
examples/compute_eikonal_from_files.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include <opm/core/flowdiagnostics/AnisotropicEikonal.hpp>
#include <opm/core/grid.h>
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/StopWatch.hpp>
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
examples/compute_initial_state.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include <opm/core/grid.h>
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/simulator/initStateEquil.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
examples/compute_tof.cpp
+1 -1
View File
@@ -27,7 +27,7 @@
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/SparseTable.hpp>
#include <opm/core/utility/StopWatch.hpp>
#include <opm/core/utility/Units.hpp>
examples/compute_tof_from_files.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/SparseTable.hpp>
#include <opm/core/utility/StopWatch.hpp>
#include <opm/core/utility/miscUtilities.hpp>
examples/sim_2p_comp_reorder.cpp
+1 -1
View File
@@ -27,7 +27,7 @@
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/simulator/initState.hpp>
#include <opm/core/simulator/SimulatorReport.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
examples/sim_2p_incomp.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/simulator/initState.hpp>
#include <opm/core/simulator/SimulatorReport.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
opm/core/flowdiagnostics/DGBasis.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "config.h"
#include <opm/core/flowdiagnostics/DGBasis.hpp>
#include <opm/core/grid.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <numeric>
namespace Opm
opm/core/flowdiagnostics/FlowDiagnostics.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <opm/core/flowdiagnostics/FlowDiagnostics.hpp>
#include <opm/core/wells.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <algorithm>
#include <numeric>
opm/core/flowdiagnostics/TofDiscGalReorder.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include <opm/core/flowdiagnostics/TofDiscGalReorder.hpp>
#include <opm/core/flowdiagnostics/DGBasis.hpp>
#include <opm/core/grid.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/SparseTable.hpp>
#include <opm/core/utility/VelocityInterpolation.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
opm/core/flowdiagnostics/TofReorder.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "config.h"
#include <opm/core/flowdiagnostics/TofReorder.hpp>
#include <opm/core/grid.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/SparseTable.hpp>
#include <algorithm>
opm/core/grid/CellQuadrature.hpp
+1 -1
View File
@@ -21,7 +21,7 @@
#define OPM_CELLQUADRATURE_HEADER_INCLUDED
#include <opm/core/grid.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <algorithm>
#include <cmath>
opm/core/grid/FaceQuadrature.hpp
+1 -1
View File
@@ -20,7 +20,7 @@
#ifndef OPM_FACEQUADRATURE_HEADER_INCLUDED
#define OPM_FACEQUADRATURE_HEADER_INCLUDED
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/grid.h>
#include <cmath>
opm/core/grid/GridManager.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include <opm/core/grid/cart_grid.h>
#include <opm/core/grid/cornerpoint_grid.h>
#include <opm/core/grid/MinpvProcessor.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <array>
opm/core/grid/MinpvProcessor.hpp
+1 -1
View File
@@ -21,7 +21,7 @@
#define OPM_MINPVPROCESSOR_HEADER_INCLUDED
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <array>
opm/core/io/eclipse/EclipseGridInspector.cpp
+1 -1
View File
@@ -38,7 +38,7 @@
#include "config.h"
#endif
#include <opm/core/io/eclipse/EclipseGridInspector.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <stdexcept>
opm/core/io/eclipse/EclipseWriter.cpp
+1 -1
View File
@@ -31,7 +31,7 @@
#include <opm/core/simulator/SimulatorTimerInterface.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/io/eclipse/EclipseWriteRFTHandler.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/parameters/Parameter.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/Units.hpp>
opm/core/io/eclipse/writeECLData.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include <opm/core/grid.h>
#include <opm/core/io/eclipse/writeECLData.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <vector>
opm/core/io/vtk/writeVtkData.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include <opm/core/io/vtk/writeVtkData.hpp>
#include <opm/core/utility/DataMap.hpp>
#include <opm/core/grid.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <boost/lexical_cast.hpp>
#include <set>
#include <cmath>
opm/core/linalg/LinearSolverFactory.cpp
+1 -1
View File
@@ -36,7 +36,7 @@
#endif
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <string>
opm/core/linalg/LinearSolverIstl.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include <opm/core/linalg/LinearSolverIstl.hpp>
#include <opm/core/linalg/ParallelIstlInformation.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
// Silence compatibility warning from DUNE headers since we don't use
// the deprecated member anyway (in this compilation unit)
opm/core/linalg/LinearSolverPetsc.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include <unordered_map>
#define PETSC_CLANGUAGE_CXX 1 //enable CHKERRXX macro.
#include <petsc.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
namespace Opm
{
opm/core/linalg/ParallelIstlInformation.hpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include <opm/core/grid.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <boost/any.hpp>
#include <exception>
opm/core/pressure/CompressibleTpfa.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include <opm/core/pressure/tpfa/trans_tpfa.h>
#include <opm/core/linalg/LinearSolverInterface.hpp>
#include <opm/core/linalg/sparse_sys.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/wells.h>
#include <opm/core/simulator/BlackoilState.hpp>
opm/core/pressure/FlowBCManager.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "config.h"
#include <opm/core/pressure/FlowBCManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/grid.h>
#include <vector>
opm/core/pressure/IncompTpfa.cpp
+1 -1
View File
@@ -30,7 +30,7 @@
#include <opm/core/linalg/sparse_sys.h>
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/wells.h>
#include <iostream>
opm/core/pressure/IncompTpfaSinglePhase.cpp
+1 -1
View File
@@ -30,7 +30,7 @@
#include <opm/core/linalg/sparse_sys.h>
// #include <opm/core/simulator/TwophaseState.hpp>
// #include <opm/core/simulator/WellState.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
// #include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/wells.h>
// #include <iostream>
opm/core/props/BlackoilPropertiesBasic.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "config.h"
#include <opm/core/props/BlackoilPropertiesBasic.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <iostream>
namespace Opm
opm/core/props/IncompPropertiesBasic.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include "config.h"
#include <opm/core/props/IncompPropertiesBasic.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <iostream>
namespace Opm
opm/core/props/IncompPropertiesFromDeck.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include <opm/core/props/IncompPropertiesFromDeck.hpp>
#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <iostream>
namespace Opm
opm/core/props/IncompPropertiesShadow_impl.hpp
+1 -1
View File
@@ -4,7 +4,7 @@
#error Do not include IncompPropertiesShadow_impl.hpp directly!
#endif /* OPM_INCOMPPROPERTIESSHADOW_HEADER_INCLUDED */
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
namespace Opm
{
opm/core/props/IncompPropertiesSinglePhase.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include <opm/core/props/IncompPropertiesSinglePhase.hpp>
#include <opm/core/grid.h>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
// #include <iostream>
namespace Opm
opm/core/props/phaseUsageFromDeck.hpp
+1 -1
View File
@@ -21,7 +21,7 @@
#define OPM_PHASEUSAGEFROMDECK_HEADER_INCLUDED
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
opm/core/props/pvt/BlackoilPvtProperties.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include <opm/core/props/pvt/PvtConstCompr.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/linearInterpolation.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
opm/core/props/pvt/PvtConstCompr.hpp
+1 -1
View File
@@ -21,7 +21,7 @@
#define OPM_PVTCONSTCOMPR_HEADER_INCLUDED
#include <opm/core/props/pvt/PvtInterface.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <vector>
#include <algorithm>
opm/core/props/pvt/PvtLiveGas.cpp
+1 -1
View File
@@ -30,7 +30,7 @@
#include "config.h"
#include <opm/core/props/pvt/PvtLiveGas.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/linearInterpolation.hpp>
#include <algorithm>
opm/core/props/pvt/PvtLiveOil.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "config.h"
#include <opm/core/props/pvt/PvtLiveOil.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/linearInterpolation.hpp>
#include <algorithm>
opm/core/props/pvt/PvtPropertiesBasic.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include "config.h"
#include <opm/core/props/pvt/PvtPropertiesBasic.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
namespace Opm
opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include <opm/core/props/pvt/PvtPropertiesIncompFromDeck.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
opm/core/props/pvt/ThermalGasPvtWrapper.hpp
+1 -1
View File
@@ -20,7 +20,7 @@
#define OPM_THERMAL_GAS_PVT_WRAPPER_HPP
#include <opm/core/props/pvt/PvtInterface.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
opm/core/props/pvt/ThermalOilPvtWrapper.hpp
+1 -1
View File
@@ -21,7 +21,7 @@
#define OPM_THERMAL_OIL_PVT_WRAPPER_HPP
#include <opm/core/props/pvt/PvtInterface.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
opm/core/props/pvt/ThermalWaterPvtWrapper.hpp
+1 -1
View File
@@ -21,7 +21,7 @@
#define OPM_THERMAL_WATER_PVT_WRAPPER_HPP
#include <opm/core/props/pvt/PvtInterface.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
opm/core/props/rock/RockCompressibility.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/linearInterpolation.hpp>
opm/core/props/rock/RockFromDeck.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include "config.h"
#include <opm/core/props/rock/RockFromDeck.hpp>
#include <opm/core/grid.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
opm/core/props/satfunc/SaturationPropsBasic.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "config.h"
#include <opm/core/props/satfunc/SaturationPropsBasic.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <iostream>
namespace Opm
opm/core/simulator/AdaptiveTimeStepping.hpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include <utility>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/simulator/TimeStepControlInterface.hpp>
opm/core/simulator/SimulatorCompressibleTwophase.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include <opm/core/simulator/SimulatorCompressibleTwophase.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/pressure/CompressibleTpfa.hpp>
opm/core/simulator/SimulatorIncompTwophase.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include <opm/core/simulator/SimulatorIncompTwophase.hpp>
#include <opm/core/utility/NullStream.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/pressure/IncompTpfa.hpp>
opm/core/simulator/SimulatorState.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/simulator/SimulatorState.hpp>
#include <opm/core/grid.h>
opm/core/simulator/TimeStepControl.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include <iostream>
#include <stdexcept>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/simulator/TimeStepControl.hpp>
opm/core/simulator/initState_impl.hpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/grid.h>
#include <opm/core/grid/GridHelpers.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/MonotCubicInterpolator.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/props/IncompPropertiesInterface.hpp>
opm/core/transport/implicit/CSRMatrixUmfpackSolver.hpp
+1 -1
View File
@@ -37,7 +37,7 @@
#define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
#include <opm/core/linalg/call_umfpack.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
namespace Opm
{
opm/core/transport/implicit/SimpleFluid2pWrappingProps_impl.hpp
+1 -1
View File
@@ -30,7 +30,7 @@
#include <opm/core/transport/implicit/SimpleFluid2pWrappingProps.hpp>
#include <cassert>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
namespace Opm{
inline SimpleFluid2pWrappingProps::SimpleFluid2pWrappingProps(const Opm::IncompPropertiesInterface& props)
opm/core/utility/ErrorMacros.hpp
-62
View File
@@ -1,62 +0,0 @@
/*
Copyright 2013 Andreas Lauser
Copyright 2009, 2010 SINTEF ICT, Applied Mathematics.
Copyright 2009, 2010 Statoil ASA.
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef OPM_ERRORMACROS_HPP
#define OPM_ERRORMACROS_HPP
#include <string>
#include <sstream>
#include <exception>
#include <stdexcept>
#include <cassert>
// macros for reporting to stderr
#ifdef OPM_VERBOSE // Verbose mode
# include <iostream>
# define OPM_REPORT do { std::cerr << "[" << __FILE__ << ":" << __LINE__ << "] " } while (false)
# define OPM_MESSAGE(x) do { OPM_REPORT; std::cerr << x << "\n"; } while (false)
# define OPM_MESSAGE_IF(cond, m) do {if(cond) OPM_MESSAGE(m);} while (false)
#else // non-verbose mode (default)
# define OPM_REPORT do {} while (false)
# define OPM_MESSAGE(x) do {} while (false)
# define OPM_MESSAGE_IF(cond, m) do {} while (false)
#endif
// Macro to throw an exception. NOTE: For this macro to work, the
// exception class must exhibit a constructor with the signature
// (const std::string &message). Since this condition is not fulfilled
// for the std::exception, you should use this macro with some
// exception class derived from either std::logic_error or
// std::runtime_error.
//
// Usage: OPM_THROW(ExceptionClass, "Error message " << value);
#define OPM_THROW(Exception, message) \
do { \
std::ostringstream oss__; \
oss__ << "[" << __FILE__ << ":" << __LINE__ << "] " << message; \
OPM_MESSAGE(message); \
throw Exception(oss__.str()); \
} while (false)
// throw an exception if a condition is true
#define OPM_ERROR_IF(condition, message) do {if(condition){ OPM_THROW(std::logic_error, message);}} while(false)
#endif // OPM_ERRORMACROS_HPP
opm/core/utility/Exceptions.hpp
-63
View File
@@ -1,63 +0,0 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2013 by Andreas Lauser *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
* \file
* \brief Provides the OPM specific exception classes.
*/
#ifndef OPM_EXCEPTIONS_HPP
#define OPM_EXCEPTIONS_HPP
#include <stdexcept>
// the OPM-specific exception classes
namespace Opm {
class NotImplemented : public std::logic_error
{
public:
explicit NotImplemented(const std::string &message)
: std::logic_error(message)
{}
};
class NumericalProblem : public std::runtime_error
{
public:
explicit NumericalProblem(const std::string &message)
: std::runtime_error(message)
{}
};
class MaterialLawProblem : public NumericalProblem
{
public:
explicit MaterialLawProblem(const std::string &message)
: NumericalProblem(message)
{}
};
class LinearSolverProblem : public NumericalProblem
{
public:
explicit LinearSolverProblem(const std::string &message)
: NumericalProblem(message)
{}
};
}
#endif // OPM_EXCEPTIONS_HPP
opm/core/utility/Factory.hpp
+1 -1
View File
@@ -35,7 +35,7 @@
#ifndef OPM_FACTORY_HEADER
#define OPM_FACTORY_HEADER
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <map>
#include <memory>
opm/core/utility/NonuniformTableLinear.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include <vector>
#include <utility>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/linearInterpolation.hpp>
namespace Opm
opm/core/utility/RootFinders.hpp
+1 -1
View File
@@ -36,7 +36,7 @@
#ifndef OPM_ROOTFINDERS_HEADER
#define OPM_ROOTFINDERS_HEADER
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <algorithm>
#include <limits>
opm/core/utility/SparseTable.hpp
+1 -1
View File
@@ -39,7 +39,7 @@
#include <numeric>
#include <algorithm>
#include <boost/range/iterator_range.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <ostream>
opm/core/utility/SparseVector.hpp
+1 -1
View File
@@ -41,7 +41,7 @@
#include <numeric>
#include <algorithm>
#include <boost/range/iterator_range.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
namespace Opm
{
opm/core/utility/StopWatch.cpp
+1 -1
View File
@@ -37,7 +37,7 @@
#endif
#include <boost/date_time/posix_time/posix_time.hpp>
#include <opm/core/utility/StopWatch.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
namespace Opm
{
opm/core/utility/UniformTableLinear.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include <utility>
#include <iostream>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
namespace Opm {
opm/core/utility/miscUtilities.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <iostream>
#include <algorithm>
#include <functional>
opm/core/utility/miscUtilitiesBlackoil.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/Units.hpp>
#include <algorithm>
opm/core/utility/parameters/ParameterGroup_impl.hpp
+1 -1
View File
@@ -44,7 +44,7 @@
#include <opm/core/utility/parameters/ParameterStrings.hpp>
#include <opm/core/utility/parameters/ParameterTools.hpp>
#include <opm/core/utility/parameters/Parameter.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
namespace Opm {
namespace parameter {
opm/core/wells/WellsManager.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
#include <opm/core/grid.h>
#include <opm/core/wells.h>
#include <opm/core/well_controls.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/wells/WellCollection.hpp>
#include <opm/core/props/phaseUsageFromDeck.hpp>
opm/core/wells/WellsManager_impl.hpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include <opm/core/utility/Units.hpp>
#include <opm/core/grid/GridHelpers.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/compressedToCartesian.hpp>
#include <algorithm>
tests/test_blackoilfluid.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/core/props/pvt/BlackoilPvtProperties.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>