Reorganized, added opm/core/wells/ and opm/core/simulator/.

2012-06-05 15:42:49 +02:00
parent 831b2bb40b
commit 955b5ea068
23 changed files with 43 additions and 42 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,8 @@ opm/core/fluid/RockFromDeck.cpp                         \
 opm/core/fluid/SaturationPropsBasic.cpp                 \
 opm/core/fluid/SaturationPropsFromDeck.cpp              \
 opm/core/grid.c                                         \
+opm/core/newwells.c                                     \
+opm/core/GridManager.cpp                                \
 opm/core/grid/cart_grid.c                               \
 opm/core/grid/cornerpoint_grid.c                        \
 opm/core/grid/cpgpreprocess/geometry.c                  \
@@ -72,14 +74,12 @@ opm/core/utility/miscUtilities.cpp                      \
 opm/core/utility/miscUtilitiesBlackoil.cpp              \
 opm/core/utility/SimulatorTimer.cpp                     \
 opm/core/utility/StopWatch.cpp                          \
-opm/core/utility/newwells.c                             \
 opm/core/utility/writeVtkData.cpp			\
-opm/core/GridManager.cpp                                \
-opm/core/WellsManager.cpp                               \
-opm/core/WellsGroup.cpp					\
-opm/core/WellCollection.cpp				\
-opm/core/InjectionSpecification.cpp                     \
-opm/core/ProductionSpecification.cpp			\
+opm/core/wells/WellsManager.cpp                         \
+opm/core/wells/WellsGroup.cpp				\
+opm/core/wells/WellCollection.cpp			\
+opm/core/wells/InjectionSpecification.cpp               \
+opm/core/wells/ProductionSpecification.cpp		\
 opm/core/linalg/sparse_sys.c                            \
 opm/core/linalg/LinearSolverInterface.cpp               \
 opm/core/linalg/LinearSolverFactory.cpp                 \
@@ -158,6 +158,7 @@ opm/core/grid/cpgpreprocess/geometry.h                  \
 opm/core/grid/cpgpreprocess/facetopology.h              \
 opm/core/grid/cpgpreprocess/grdecl.h                    \
 opm/core/utility/Average.hpp                            \
+opm/core/utility/ColumnExtract.hpp			\
 opm/core/utility/ErrorMacros.hpp                        \
 opm/core/utility/Factory.hpp                            \
 opm/core/utility/MonotCubicInterpolator.hpp             \
@@ -193,17 +194,16 @@ opm/core/linalg/LinearSolverFactory.hpp                 \
 opm/core/grid.h                                         \
 opm/core/well.h                                         \
 opm/core/newwells.h                                     \
-opm/core/WellsGroup.hpp					\
-opm/core/WellCollection.hpp				\
-opm/core/InjectionSpecification.hpp			\
-opm/core/ProductionSpecification.hpp			\
-opm/core/BlackoilState.hpp                              \
-opm/core/ColumnExtract.hpp				\
+opm/core/wells/WellsManager.hpp                         \
+opm/core/wells/WellsGroup.hpp				\
+opm/core/wells/WellCollection.hpp			\
+opm/core/wells/InjectionSpecification.hpp		\
+opm/core/wells/ProductionSpecification.hpp		\
 opm/core/GridAdapter.hpp                                \
 opm/core/GridManager.hpp                                \
-opm/core/TwophaseState.hpp                              \
-opm/core/WellsManager.hpp                               \
-opm/core/WellState.hpp                                  \
+opm/core/simulator/BlackoilState.hpp                    \
+opm/core/simulator/TwophaseState.hpp                    \
+opm/core/simulator/WellState.hpp                        \
 opm/core/pressure/fsh.h                                 \
 opm/core/pressure/HybridPressureSolver.hpp              \
 opm/core/pressure/IncompTpfa.hpp                        \
--- a/examples/sim_wateroil.cpp
+++ b/examples/sim_wateroil.cpp
@@ -27,7 +27,7 @@
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
 #include <opm/core/newwells.h>
-#include <opm/core/WellsManager.hpp>
+#include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/initState.hpp>
 #include <opm/core/utility/SimulatorTimer.hpp>
@@ -44,9 +44,9 @@

 #include <opm/core/linalg/LinearSolverFactory.hpp>

-#include <opm/core/ColumnExtract.hpp>
-#include <opm/core/BlackoilState.hpp>
-#include <opm/core/WellState.hpp>
+#include <opm/core/utility/ColumnExtract.hpp>
+#include <opm/core/simulator/BlackoilState.hpp>
+#include <opm/core/simulator/WellState.hpp>
 #include <opm/core/transport/GravityColumnSolver.hpp>

 #include <opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp>
--- a/examples/spu_2p.cpp
+++ b/examples/spu_2p.cpp
@@ -43,7 +43,7 @@
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
 #include <opm/core/newwells.h>
-#include <opm/core/WellsManager.hpp>
+#include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/initState.hpp>
 #include <opm/core/utility/SimulatorTimer.hpp>
@@ -69,8 +69,8 @@
 #include <opm/core/transport/CSRMatrixBlockAssembler.hpp>
 #include <opm/core/transport/SinglePointUpwindTwoPhase.hpp>

-#include <opm/core/ColumnExtract.hpp>
-#include <opm/core/TwophaseState.hpp>
+#include <opm/core/utility/ColumnExtract.hpp>
+#include <opm/core/simulator/TwophaseState.hpp>
 #include <opm/core/transport/GravityColumnSolver.hpp>

 #include <opm/core/transport/reorder/TransportModelTwophase.hpp>
--- a/examples/wells_example.cpp
+++ b/examples/wells_example.cpp
@@ -5,14 +5,14 @@

 #include "opm/core/utility/initState.hpp"
 #include "opm/core/utility/SimulatorTimer.hpp"
-#include <opm/core/WellsManager.hpp>
+#include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/GridManager.hpp>
 #include <opm/core/pressure/IncompTpfa.hpp>
 #include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
 #include <opm/core/newwells.h>
 #include <opm/core/grid.h>
 #include <opm/core/utility/miscUtilities.hpp>
-#include <opm/core/TwophaseState.hpp>
+#include <opm/core/simulator/TwophaseState.hpp>
 #include <opm/core/pressure/FlowBCManager.hpp>
 #include <opm/core/linalg/LinearSolverFactory.hpp>
 #include <opm/core/fluid/RockCompressibility.hpp>
--- a/opm/core/utility/newwells.c
+++ b/opm/core/utility/newwells.c
--- a/opm/core/pressure/CompressibleTpfa.cpp
+++ b/opm/core/pressure/CompressibleTpfa.cpp
@@ -28,8 +28,8 @@
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/newwells.h>
-#include <opm/core/BlackoilState.hpp>
-#include <opm/core/WellState.hpp>
+#include <opm/core/simulator/BlackoilState.hpp>
+#include <opm/core/simulator/WellState.hpp>

 #include <algorithm>
 #include <cmath>
--- a/opm/core/simulator/BlackoilState.hpp
+++ b/opm/core/simulator/BlackoilState.hpp
--- a/opm/core/simulator/TwophaseState.hpp
+++ b/opm/core/simulator/TwophaseState.hpp
--- a/opm/core/simulator/WellState.hpp
+++ b/opm/core/simulator/WellState.hpp
--- a/opm/core/utility/ColumnExtract.hpp
+++ b/opm/core/utility/ColumnExtract.hpp
--- a/opm/core/wells/InjectionSpecification.cpp
+++ b/opm/core/wells/InjectionSpecification.cpp
@@ -1,4 +1,5 @@
-#include <opm/core/InjectionSpecification.hpp>
+#include <opm/core/wells/InjectionSpecification.hpp>
+
 namespace Opm
 {

--- a/opm/core/wells/InjectionSpecification.hpp
+++ b/opm/core/wells/InjectionSpecification.hpp
--- a/opm/core/wells/ProductionSpecification.cpp
+++ b/opm/core/wells/ProductionSpecification.cpp
@@ -1,4 +1,4 @@
-#include <opm/core/ProductionSpecification.hpp>
+#include <opm/core/wells/ProductionSpecification.hpp>

 namespace Opm
 {
--- a/opm/core/wells/ProductionSpecification.hpp
+++ b/opm/core/wells/ProductionSpecification.hpp
--- a/opm/core/wells/WellCollection.cpp
+++ b/opm/core/wells/WellCollection.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "WellCollection.hpp"
+#include <opm/core/wells/WellCollection.hpp>

 namespace Opm
 {
--- a/opm/core/wells/WellCollection.hpp
+++ b/opm/core/wells/WellCollection.hpp
@@ -23,7 +23,7 @@ along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 #define	OPM_WELLCOLLECTION_HPP

 #include <vector>
-#include <opm/core/WellsGroup.hpp>
+#include <opm/core/wells/WellsGroup.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/eclipse/EclipseGridParser.hpp>

--- a/opm/core/wells/WellsGroup.cpp
+++ b/opm/core/wells/WellsGroup.cpp
@@ -17,7 +17,7 @@
  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <opm/core/WellsGroup.hpp>
+#include <opm/core/wells/WellsGroup.hpp>
 #include <cmath>
 #include <opm/core/newwells.h>
 #include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
--- a/opm/core/wells/WellsGroup.hpp
+++ b/opm/core/wells/WellsGroup.hpp
@@ -20,8 +20,8 @@
 #ifndef OPM_WELLSGROUP_HPP
 #define	OPM_WELLSGROUP_HPP

-#include <opm/core/InjectionSpecification.hpp>
-#include <opm/core/ProductionSpecification.hpp>
+#include <opm/core/wells/InjectionSpecification.hpp>
+#include <opm/core/wells/ProductionSpecification.hpp>
 #include <opm/core/eclipse/EclipseGridParser.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
--- a/opm/core/wells/WellsManager.cpp
+++ b/opm/core/wells/WellsManager.cpp
@@ -18,13 +18,13 @@
 */


-#include <opm/core/WellsManager.hpp>
+#include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/eclipse/EclipseGridParser.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/newwells.h>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/Units.hpp>
-#include <opm/core/WellCollection.hpp>
+#include <opm/core/wells/WellCollection.hpp>
 #include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>

 #include <tr1/array>
--- a/opm/core/wells/WellsManager.hpp
+++ b/opm/core/wells/WellsManager.hpp
@@ -21,8 +21,8 @@
 #define OPM_WELLSMANAGER_HEADER_INCLUDED


-#include <opm/core/WellCollection.hpp>
-#include <opm/core/WellsGroup.hpp>
+#include <opm/core/wells/WellCollection.hpp>
+#include <opm/core/wells/WellsGroup.hpp>

 struct Wells;
 struct UnstructuredGrid;
--- a/tests/test_column_extract.cpp
+++ b/tests/test_column_extract.cpp
@@ -6,7 +6,7 @@

 #define BOOST_TEST_MODULE ColumnExtractTest
 #include <boost/test/unit_test.hpp>
-#include <opm/core/ColumnExtract.hpp>
+#include <opm/core/utility/ColumnExtract.hpp>
 #include <opm/core/GridManager.hpp>
 #include <opm/core/eclipse/EclipseGridParser.hpp>

--- a/tutorials/tutorial3.cpp
+++ b/tutorials/tutorial3.cpp
@@ -37,7 +37,7 @@

 #include <opm/core/transport/reorder/TransportModelTwophase.hpp>

-#include <opm/core/TwophaseState.hpp>
+#include <opm/core/simulator/TwophaseState.hpp>

 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/Units.hpp>
--- a/tutorials/tutorial4.cpp
+++ b/tutorials/tutorial4.cpp
@@ -44,12 +44,12 @@
 #include <opm/core/transport/CSRMatrixBlockAssembler.hpp>
 #include <opm/core/transport/SinglePointUpwindTwoPhase.hpp>

-#include <opm/core/TwophaseState.hpp>
+#include <opm/core/simulator/TwophaseState.hpp>

 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
-#include <opm/core/WellCollection.hpp>
+#include <opm/core/wells/WellCollection.hpp>

 /// \page tutorial4 Well controls
 ///