Markus Blatt 8df314e90f Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support ...

Manually resolved conficts in the following files
	examples/sim_fibo_ad.cpp
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
	opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp

In additions examples/sim_fibo_ad_cp.cpp was adapted to compile again.

2014-03-25 11:11:08 +01:00

..

AutoDiff.hpp

Rename AutoDiff::Forward -> Opm::AutoDiff.

2013-09-19 11:32:47 +02:00

AutoDiffBlock.hpp

Avoid infinite loop with two constant operands.

2013-10-24 13:41:55 +02:00

AutoDiffHelpers.hpp

Add an example program of FIBOS that uses CpGrid.

2014-03-13 16:33:36 +01:00

BlackoilPropsAd.cpp

Make BlackoilPropsAdInterface pure virtual again.

2014-03-04 13:09:23 +01:00

BlackoilPropsAd.hpp

Make BlackoilPropsAdInterface pure virtual again.

2014-03-04 13:09:23 +01:00

BlackoilPropsAdFromDeck.cpp

Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid.

2014-03-13 16:33:36 +01:00

BlackoilPropsAdFromDeck.hpp

Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid.

2014-03-13 16:33:36 +01:00

BlackoilPropsAdInterface.cpp

Added abstract class BlackoilPropsAdInterface.

2013-05-22 10:56:14 +02:00

BlackoilPropsAdInterface.hpp

Make BlackoilPropsAdInterface pure virtual again.

2014-03-04 13:09:23 +01:00

FullyImplicitBlackoilSolver_impl.hpp

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-03-25 11:11:08 +01:00

FullyImplicitBlackoilSolver.hpp

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-03-25 11:11:08 +01:00

GeoProps.hpp

Add an example program of FIBOS that uses CpGrid.

2014-03-13 16:33:36 +01:00

GridHelpers.cpp

Added function for querying the face area to the helpers.

2014-03-13 16:33:36 +01:00

GridHelpers.hpp

[bugfix] Fixes elementAt of CentroidIterator.

2014-03-13 16:33:36 +01:00

ImpesTPFAAD.cpp

Add an example program of FIBOS that uses CpGrid.

2014-03-13 16:33:36 +01:00

ImpesTPFAAD.hpp

Rename AutoDiff::ForwardBlock -> Opm::AutoDiffBlock.

2013-09-19 12:53:28 +02:00

opm-autodiff_doxygen_main.hpp

Documentation refinement. Added main doc file.

2013-09-19 14:45:40 +02:00

SimulatorCompressibleAd.cpp

fix the fallout of the SimulatorTimer::currentTime() -> SimulatorTimer::simulationTimeElapsed() rename

2014-03-11 16:01:59 +01:00

SimulatorCompressibleAd.hpp

fix some clang 3.3 warnings

2013-11-14 14:33:38 +01:00

SimulatorFullyImplicitBlackoil_impl.hpp

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-03-25 11:11:08 +01:00

SimulatorFullyImplicitBlackoil.hpp

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-03-25 11:11:08 +01:00

SimulatorFullyImplicitBlackoilOutput.cpp

Implemented VTK output for CpGrid using DUNE's VTKWriter and activated Matlab for CpGrid.

2014-03-13 16:33:36 +01:00

SimulatorFullyImplicitBlackoilOutput.hpp

Implemented VTK output for CpGrid using DUNE's VTKWriter and activated Matlab for CpGrid.

2014-03-13 16:33:36 +01:00

SimulatorIncompTwophaseAd.cpp

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-03-25 11:11:08 +01:00

SimulatorIncompTwophaseAd.hpp

Renamed misleading adfi -> fi.

2013-09-19 14:52:39 +02:00

TransportSolverTwophaseAd.cpp

Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid.

2014-03-13 16:33:36 +01:00

TransportSolverTwophaseAd.hpp

Rename AutoDiff::ForwardBlock -> Opm::AutoDiffBlock.

2013-09-19 12:53:28 +02:00

WellDensitySegmented.cpp

Fix indexing error in if-test.

2014-01-27 10:42:17 +01:00

WellDensitySegmented.hpp

Forward declare PhaseUsage as struct, not class.

2014-02-07 14:38:57 +01:00

WellStateFullyImplicitBlackoil.hpp

Add WellStateFullyImplicitBlackoil class.

2014-03-18 11:23:05 +01:00