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

Moved deprecated opm/core/well.h -> opm/core/pressure/legacy_well.h

Browse Source 
Still used by some pressure system assemblers.
This commit is contained in:
Atgeirr Flø Rasmussen 2013-03-18 10:23:51 +01:00
parent 0a935774d2
commit 1e6e733bb7
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists_files.cmake
View File

@ -72,7 +72,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/core/pressure/tpfa/compr_source.c
opm/core/pressure/tpfa/ifs_tpfa.c
opm/core/pressure/tpfa/trans_tpfa.c
opm/core/pressure/well.c
opm/core/pressure/legacy_well.c
opm/core/props/BlackoilPropertiesBasic.cpp
opm/core/props/BlackoilPropertiesFromDeck.cpp
opm/core/props/IncompPropertiesBasic.cpp
@ -212,6 +212,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/pressure/flow_bc.h
opm/core/pressure/fsh.h
opm/core/pressure/fsh_common_impl.h
opm/core/pressure/legacy_well.h
opm/core/pressure/mimetic/hybsys.h
opm/core/pressure/mimetic/hybsys_global.h
opm/core/pressure/mimetic/mimetic.h
@ -321,7 +322,6 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/utility/parameters/ParameterXML.hpp
opm/core/utility/parameters/tinyxml/tinystr.h
opm/core/utility/parameters/tinyxml/tinyxml.h
opm/core/well.h
opm/core/wells/InjectionSpecification.hpp
opm/core/wells/ProductionSpecification.hpp
opm/core/wells/WellCollection.hpp

2
opm/core/pressure/TPFACompressiblePressureSolver.hpp
View File

@ -25,7 +25,7 @@
#include <opm/core/pressure/tpfa/trans_tpfa.h>
#include <opm/core/linalg/sparse_sys.h>
#include <opm/core/pressure/flow_bc.h>
#include <opm/core/well.h>
#include <opm/core/pressure/legacy_well.h>
#include <opm/core/pressure/tpfa/compr_quant.h>
#include <opm/core/GridAdapter.hpp>
#include <stdexcept>

2
opm/core/pressure/fsh.h
View File

@ -52,7 +52,7 @@
*/
#include <opm/core/grid.h>
#include <opm/core/well.h>
#include <opm/core/pressure/legacy_well.h>
#include <opm/core/pressure/flow_bc.h>
#ifdef __cplusplus

2
opm/core/pressure/fsh_common_impl.c
View File

@ -25,7 +25,7 @@
#include <string.h>
#include <opm/core/grid.h>
#include <opm/core/well.h>
#include <opm/core/pressure/legacy_well.h>
#include <opm/core/pressure/flow_bc.h>
#include <opm/core/pressure/fsh.h>

2
opm/core/pressure/well.c → opm/core/pressure/legacy_well.c
View File

@ -19,7 +19,7 @@
#include <stdlib.h>
#include <opm/core/well.h>
#include <opm/core/pressure/legacy_well.h>
/* Release memory resources for cell->well mapping. */

6
opm/core/well.h → opm/core/pressure/legacy_well.h
View File

@ -17,8 +17,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef OPM_WELL_HEADER_INCLUDED
#define OPM_WELL_HEADER_INCLUDED
#ifndef OPM_LEGACY_WELL_HEADER_INCLUDED
#define OPM_LEGACY_WELL_HEADER_INCLUDED
/**
* \file
@ -133,4 +133,4 @@ derive_cell_wells(int nc, well_t *W, int *cwpos, int *cwells);
}
#endif
#endif /* OPM_WELL_HEADER_INCLUDED */
#endif /* OPM_LEGACY_WELL_HEADER_INCLUDED */

2
opm/core/pressure/mimetic/hybsys_global.h
View File

@ -93,7 +93,7 @@ extern "C" {
#endif
#include <opm/core/grid.h>
#include <opm/core/well.h>
#include <opm/core/pressure/legacy_well.h>
#include <opm/core/linalg/sparse_sys.h>

2
opm/core/pressure/tpfa/cfs_tpfa.c
View File

@ -4,7 +4,7 @@
#include <stdlib.h>
#include <string.h>
#include <opm/core/well.h>
#include <opm/core/pressure/legacy_well.h>
#include <opm/core/linalg/blas_lapack.h>
#include <opm/core/linalg/sparse_sys.h>
#include <opm/core/pressure/flow_bc.h>

2
opm/core/pressure/tpfa/cfs_tpfa.h
View File

@ -21,7 +21,7 @@
#define OPM_CFS_TPFA_HEADER_INCLUDED
#include <opm/core/grid.h>
#include <opm/core/well.h>
#include <opm/core/pressure/legacy_well.h>
#include <opm/core/pressure/flow_bc.h>
#ifdef __cplusplus