OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
e99e023980
opm-simulators/opm/core
History
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
..
linalg Disable warning for using DUNE's FieldVector::size 2012-09-24 00:21:06 +02:00
pressure Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
props Merge remote-tracking branch 'hnil/hnil_class' into combined. 2013-03-14 16:18:39 +01:00
simulator Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
transport Merge remote-tracking branch 'hnil/hnil_class' into combined. 2013-03-14 16:18:39 +01:00
utility Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
wells Merge remote-tracking branch 'hnil/hnil_class' into combined. 2013-03-14 16:18:39 +01:00
newwells.h Fix error in doc. 2013-03-07 15:14:24 +01:00
well.h Document the obsolescent well representation. 2012-06-25 00:55:50 +02:00