OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 21:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
7aa8728be9
opm-simulators/opm/core/props
History
Markus Blatt c282949400 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Manually resolved conflicts:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/simulator/initState_impl.hpp
	opm/core/wells/WellsManager.cpp
	opm/core/wells/WellsManager.hpp
2014-03-27 15:27:11 +01:00
..
pvt Remove unused "typedef"s 2013-09-26 19:22:59 +02:00
rock Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support 2014-02-19 15:22:18 +01:00
satfunc Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 2014-03-27 15:27:11 +01:00
BlackoilPhases.hpp Add a facility for checking/assigning presence of free phases 2013-12-03 15:56:18 +01:00
BlackoilPropertiesBasic.cpp convert users of the ASSERT and the ASSERT2 macros to standard assert() 2013-09-05 13:04:37 +02:00
BlackoilPropertiesBasic.hpp Add phaseUsage() method to BlackoilPropertiesInterface. 2013-05-13 16:20:00 +02:00
BlackoilPropertiesFromDeck.cpp Merge pull request #528 from blattms/fix-nonunifom 2014-03-19 12:31:05 +01:00
BlackoilPropertiesFromDeck.hpp Added suport for grid apart from UG for BlackoilPropertiesFromDeck 2014-02-25 15:45:15 +01:00
BlackoilPropertiesInterface.hpp fix a few CLang warnings 2013-07-30 16:27:20 +02:00
IncompPropertiesBasic.cpp convert THROW to OPM_THROW 2013-09-05 13:04:37 +02:00
IncompPropertiesBasic.hpp Use markdown for parameter lists. 2013-03-22 10:02:04 +01:00
IncompPropertiesFromDeck.cpp convert THROW to OPM_THROW 2013-09-05 13:04:37 +02:00
IncompPropertiesFromDeck.hpp Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
IncompPropertiesInterface.hpp Moved fluid -> props and subdirs. 2013-03-14 09:56:48 +01:00
IncompPropertiesShadow_impl.hpp fix headers 2013-09-11 13:11:47 +02:00
IncompPropertiesShadow.hpp Use underscore for data members 2013-07-30 13:24:57 +02:00
phaseUsageFromDeck.hpp add back blank line as requested by @bska 2014-02-07 19:35:28 +01:00