opm-simulators/opm/core/wells
Atgeirr Flø Rasmussen e99e023980 Merge remote-tracking branch 'hnil/hnil_class' into combined.
Conflicts:
	CMakeLists.txt
	examples/sim_wateroil.cpp
	opm/core/grid/cpgpreprocess/geometry.c
	opm/core/transport/reorder/ReorderSolverInterface.hpp
	opm/core/transport/reorder/TofDiscGalReorder.cpp
	opm/core/transport/reorder/TofDiscGalReorder.hpp
	opm/core/transport/reorder/TofReorder.cpp
	opm/core/transport/reorder/TofReorder.hpp
	opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
	opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
2013-03-14 16:18:39 +01:00
..
InjectionSpecification.cpp Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
InjectionSpecification.hpp Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
ProductionSpecification.cpp Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
ProductionSpecification.hpp Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
WellCollection.cpp Changed OpenRS->OPM in copyright notices and #include guards. 2013-01-29 13:42:24 +01:00
WellCollection.hpp Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00
WellsGroup.cpp Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
WellsGroup.hpp Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
WellsManager.cpp Merge remote-tracking branch 'hnil/hnil_class' into combined. 2013-03-14 16:18:39 +01:00
WellsManager.hpp Clone wells object when constructing from existing. 2012-10-05 10:15:06 +02:00