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

Renamed newwells.h -> wells.h.

Browse Source 
Also moved implementation file to subdir.
This commit is contained in:
Atgeirr Flø Rasmussen
2013-03-18 10:33:34 +01:00
parent 1e6e733bb7
commit 2405758e2d
23 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists_files.cmake
+2 -2
View File
@@ -46,7 +46,6 @@ list (APPEND MAIN_SOURCE_FILES
opm/core/linalg/LinearSolverUmfpack.cpp
opm/core/linalg/call_umfpack.c
opm/core/linalg/sparse_sys.c
opm/core/newwells.c
opm/core/pressure/CompressibleTpfa.cpp
opm/core/pressure/FlowBCManager.cpp
opm/core/pressure/IncompTpfa.cpp
@@ -131,6 +130,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/core/wells/WellCollection.cpp
opm/core/wells/WellsGroup.cpp
opm/core/wells/WellsManager.cpp
opm/core/wells/wells.c
)
# originally generated with the command:
@@ -202,7 +202,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/linalg/blas_lapack.h
opm/core/linalg/call_umfpack.h
opm/core/linalg/sparse_sys.h
opm/core/newwells.h
opm/core/wells.h
opm/core/pressure/CompressibleTpfa.hpp
opm/core/pressure/FlowBCManager.hpp
opm/core/pressure/HybridPressureSolver.hpp
examples/compute_tof.cpp
+1 -1
View File
@@ -27,7 +27,7 @@
#include <opm/core/grid.h>
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/initState.hpp>
examples/compute_tof_from_files.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include <opm/core/grid.h>
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/initState.hpp>
examples/sim_2p_comp_reorder.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include <opm/core/grid.h>
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/initState.hpp>
examples/sim_2p_incomp.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include <opm/core/grid.h>
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/initState.hpp>
examples/wells_example.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/pressure/IncompTpfa.hpp>
#include <opm/core/props/IncompPropertiesFromDeck.hpp>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/grid.h>
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/simulator/TwophaseState.hpp>
opm/core/pressure/CompressibleTpfa.cpp
+1 -1
View File
@@ -27,7 +27,7 @@
#include <opm/core/linalg/sparse_sys.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
opm/core/pressure/IncompTpfa.cpp
+1 -1
View File
@@ -31,7 +31,7 @@
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <iomanip>
#include <cmath>
#include <algorithm>
opm/core/pressure/tpfa/cfs_tpfa_residual.c
+1 -1
View File
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <string.h>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/linalg/blas_lapack.h>
#include <opm/core/linalg/sparse_sys.h>
opm/core/pressure/tpfa/cfs_tpfa_residual.h
+1 -1
View File
@@ -21,7 +21,7 @@
#define OPM_CFS_TPFA_HEADER_INCLUDED
#include <opm/core/grid.h>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/pressure/tpfa/compr_source.h>
opm/core/pressure/tpfa/ifs_tpfa.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include <opm/core/linalg/sparse_sys.h>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/pressure/flow_bc.h>
#include <opm/core/pressure/tpfa/ifs_tpfa.h>
opm/core/simulator/SimulatorCompressibleTwophase.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include <opm/core/pressure/CompressibleTpfa.hpp>
#include <opm/core/grid.h>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/pressure/flow_bc.h>
#include <opm/core/simulator/SimulatorReport.hpp>
opm/core/simulator/SimulatorIncompTwophase.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include <opm/core/pressure/IncompTpfa.hpp>
#include <opm/core/grid.h>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/pressure/flow_bc.h>
#include <opm/core/simulator/SimulatorReport.hpp>
opm/core/simulator/WellState.hpp
+1 -1
View File
@@ -20,7 +20,7 @@
#ifndef OPM_WELLSTATE_HEADER_INCLUDED
#define OPM_WELLSTATE_HEADER_INCLUDED
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <vector>
namespace Opm
opm/core/utility/miscUtilities.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/grid.h>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
opm/core/utility/miscUtilitiesBlackoil.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include <opm/core/utility/miscUtilitiesBlackoil.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/grid.h>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp>
opm/core/newwells.h → opm/core/wells.h
+3 -3
View File
@@ -17,8 +17,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef OPM_NEWWELLS_H_INCLUDED
#define OPM_NEWWELLS_H_INCLUDED
#ifndef OPM_WELLS_H_INCLUDED
#define OPM_WELLS_H_INCLUDED
/**
@@ -332,4 +332,4 @@ clone_wells(const struct Wells *W);
}
#endif
#endif /* OPM_NEWWELLS_H_INCLUDED */
#endif /* OPM_WELLS_H_INCLUDED */
opm/core/wells/InjectionSpecification.hpp
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef OPM_INJECTORSPECIFICATION_HPP
#define OPM_INJECTORSPECIFICATION_HPP
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
namespace Opm
{
opm/core/wells/ProductionSpecification.hpp
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef OPM_PRODUCTIONSPECIFICATION_HPP
#define OPM_PRODUCTIONSPECIFICATION_HPP
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
namespace Opm
{
opm/core/wells/WellsGroup.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include <opm/core/wells/WellsGroup.hpp>
#include <cmath>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/props/phaseUsageFromDeck.hpp>
namespace Opm
opm/core/wells/WellsManager.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/grid.h>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/wells/WellCollection.hpp>
opm/core/newwells.c → opm/core/wells/wells.c
+1 -1
View File
@@ -34,7 +34,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <assert.h>
#include <stddef.h>
tests/test_wells.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#define BOOST_TEST_MODULE WellsModuleTest
#include <boost/test/unit_test.hpp>
#include <opm/core/newwells.h>
#include <opm/core/wells.h>
#include <iostream>
#include <vector>