1285 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Markus Blatt	cb43fc5e94	Unifies the phase indices with the ones in opm-core. ... The initial definition of the phase indices seems to be in opm/core/props/BlackoilPhases.hpp. Nevertheless there were several redefinitions of the same or similar enums (either Aqua, Liquid, and Vapor, or Water, Oil, and Gas). Surprisingly most often these definitions did not use the original values. This is bound to break if there is a change upstream. This patch limits the definition to one place in opm-autodiff, namely opm/autodiff/BlackoilPropsAdInterface.hpp. To avoid downstream confusion we define both the Water and Aqua triplets. In addition we define the maximum number of phases to use at compile time.	2015-01-19 20:18:14 +01:00
Atgeirr Flø Rasmussen	325ad95e80	Merge pull request #274 from blattms/generic-transmissibilities ... Implement generic transmissibilities computations using the GridHelpers	2015-01-15 22:40:05 +01:00
Markus Blatt	dca6b436a7	Activates transmissibilities test for CpGrid without warnings. ... Tests run fine for both grids.	2015-01-15 21:27:07 +01:00
Markus Blatt	57bf00cd27	[bugfix] Fixes cellCentroidCoordinate implementation. ... Somehow this was never defined for CpGrid due to a copy&paste error.	2015-01-15 21:24:35 +01:00
Markus Blatt	a3acd22f24	Implement transmissibilities using the generic GridHelpers interface.	2015-01-15 21:24:35 +01:00
Atgeirr Flø Rasmussen	656e688692	Merge pull request #272 from blattms/add-facetag-access-2 ... Adds free function to access the face tag to UgGridHelpers.	2015-01-15 20:30:51 +01:00
Atgeirr Flø Rasmussen	7086ece5a2	Merge pull request #273 from blattms/ports-transmissilities-test-to-grid-helpers ... Ports transmissibilities test to grid helpers	2015-01-15 14:46:31 +01:00
Atgeirr Flø Rasmussen	9d6e55c4a1	Merge pull request #268 from dr-robertk/PR/EclipseWriter-revision-to-write-substeps ... Support of writing substeps with EclipseWriter.	2015-01-15 13:52:35 +01:00
Robert K	e577b3b2d9	SimulatorFullyImplicitBlackoil: only access output parameters when output is enabled.	2015-01-15 13:31:28 +01:00
Markus Blatt	b0707e05bf	Ported test_transmissibilities to the UgGridHelpers interface. ... Previously, there were a completely different check for UnstructuredGrid and CpGrid. The latter probably not working properly due to missing support in the DUNE grid interface. This commit resorts the code to use the UgGridHelpers abtraction instead of UnstructuredGrid's legacy grid interface. Thus one code can be used to do the checks for both grids. For UG the code compiles and the test is successful. For CpGrid it compiles but of course the test still fails due to missing transmissibility multiplier support. This will be sorted out in a different PR.	2015-01-14 11:56:37 +01:00
Markus Blatt	e681d6b836	Use correct constructor for ntgGeology. ... This should have been in the previous PR. But I missed it when splitting things up.	2015-01-14 11:56:37 +01:00
Markus Blatt	4a0fbafbcc	Adds free function to access the face tag to UgGridHelpers. ... It uses the iterator over the cell faces to identify the face tag in constant time.	2015-01-13 20:31:13 +01:00
Bård Skaflestad	18fa00b542	Merge pull request #270 from blattms/transmissibility-check-with-local ... Use correct constructor of DerivedGeology used with CpGrid in test_trans...	2015-01-12 15:23:30 +01:00
Markus Blatt	55fb6fa7ed	Use correct constructor of DerivedGeology used with CpGrid in test_transmissibilities. ... The constructor now needs and additional boolean to flag whether to local permeabilities. The old one used is not there anymore. Therefor this patch moves the code to the new constructor interface.	2015-01-12 14:56:42 +01:00
Robert K	7fd9895a12	Merge remote-tracking branch 'upstream/master' into PR/EclipseWriter-revision-to-write-substeps	2015-01-12 12:35:22 +01:00
Atgeirr Flø Rasmussen	86e5677b8e	Merge pull request #269 from totto82/rsrv_fix ... BUGFIX: Avoid inclusion of disgas in the vapoil contribution	2015-01-12 10:08:13 +01:00
Tor Harald Sandve	088cac6801	BUGFIX: Avoid inclusion of disgas in the vapoil contribution ... A temporary copy is added to avoid inclusion of dissolved gas when the vaporized oil contribution is added in the accumulation term for the oil phase.	2015-01-12 07:19:18 +01:00
Robert K	6b4a63787d	cleanup of unused code.	2015-01-09 16:27:37 +01:00
Robert K	f11d1758c1	also write initial data when using adaptive time stepping.	2015-01-09 16:26:48 +01:00
Robert K	a9edc45a49	Added flag for matlab output. default behavior is the same as before. ... Also, avoid possibly uninitialized variables.	2015-01-09 16:26:30 +01:00
Robert K	e7e63e1989	make writing of substeps work	2015-01-09 16:26:30 +01:00
Atgeirr Flø Rasmussen	7a3008db72	Merge pull request #265 from totto82/fix_stoppedwells2 ... Account for the renaming in the wellsManager	2015-01-09 13:16:37 +01:00
Atgeirr Flø Rasmussen	20599ab698	Merge pull request #263 from totto82/phase_pressure ... Use phase pressures for the fluid properties	2015-01-09 10:35:34 +01:00
Tor Harald Sandve	eefac9584e	Add on overload of computePressure() that accepts explicit saturations ... The overload is used direcly in variableState() to clean the code as well as in the orignal computePressures(state) implementation.	2015-01-07 12:46:12 +01:00
Tor Harald Sandve	23f1f443fc	Fix the fall out in case of missing gas phase	2015-01-07 08:34:08 +01:00
Tor Harald Sandve	5572a14c20	Account for the renaming in the wellsManager ... Shut is renamed to stopped in the wellsManager in order to better reflect the name logic in the deck. This PR implements the nessesary change in opm-autodiff	2014-12-19 07:18:36 +01:00
Atgeirr Flø Rasmussen	29df1cab88	Merge pull request #262 from bska/fix-make-install ... Fix "make install" in opm-autodiff	2014-12-18 11:20:49 +01:00
Tor Harald Sandve	0a0a3b2ba6	Use phase pressures for the fluid properties ... There has been an inconsitancy in which pressure to use in the evaluation of the fluid properties. With this commit the phase pressure is used for all the evaluation of the fluid properties.	2014-12-18 08:51:08 +01:00
Bård Skaflestad	b9b2b9f520	Really catch up to file renaming. ... Pointy hat: @bska	2014-12-17 11:39:51 +01:00
Bård Skaflestad	c04351d4ac	Merge pull request #261 from atgeirr/master ... Fix call to DerivedGeology constructor.	2014-12-17 11:37:15 +01:00
Bård Skaflestad	6c7bdecd30	Catch up to file renaming ... This fixes "make install" which would otherwise fail with a diagnostic message of the form CMake Error at cmake_install.cmake:64 (FILE): file INSTALL cannot find opm/autodiff/ConservativeSparseSparseProduct.h Thanks to HudsonBuildServer for highlighting the issue.	2014-12-17 11:34:08 +01:00
Atgeirr Flø Rasmussen	e52af158fc	Fix call to DerivedGeology constructor. ... New argument to constructor was not provided, still compiled due to default argument.	2014-12-17 11:32:20 +01:00
Bård Skaflestad	5ce5658892	Merge pull request #260 from atgeirr/add-generic-local-trans ... Add a generic (throwing) tpfa_loc_trans_compute_().	2014-12-17 10:50:17 +01:00
Atgeirr Flø Rasmussen	e1af08c5d2	Add a generic (throwing) tpfa_loc_trans_compute_(). ... Without this, we may have link errors with CpGrid, since only an UnstructuredGrid specialization was provided.	2014-12-17 10:47:16 +01:00
Atgeirr Flø Rasmussen	012485e139	Merge pull request #259 from OPM/revert-241-write_transmissibilities ... Revert "register the transmissibilities at the EcliseWriter"	2014-12-17 10:18:35 +01:00
Atgeirr Flø Rasmussen	5ae5525209	Revert "register the transmissibilities at the EcliseWriter"	2014-12-17 10:18:23 +01:00
Atgeirr Flø Rasmussen	1348658507	Merge pull request #249 from totto82/locTrans ... Compute half transmissibilities based on local coordinate system	2014-12-17 00:20:11 +01:00
Atgeirr Flø Rasmussen	f8ad85d83e	Merge pull request #241 from andlaus/write_transmissibilities ... register the transmissibilities at the EcliseWriter	2014-12-16 23:35:26 +01:00
Atgeirr Flø Rasmussen	28af900f0b	Merge pull request #250 from dr-robertk/PR/performance-avoid-zero-matrix-entries ... Further performance improvement by avoiding zeros in matrix-matrix product.	2014-12-16 14:12:14 +01:00
Joakim Hove	f1e64a3b9b	Merge pull request #257 from joakim-hove/move-log ... Renamed ParserLog -> OpmLog	2014-12-16 13:23:17 +01:00
Joakim Hove	78ba6760da	ERT-747: Renamed ParserLog -> Logger	2014-12-15 12:23:09 +01:00
Joakim Hove	d948777ea0	Merge pull request #255 from andlaus/remove_strict_parsing ... adapt to the removal of the "strict parsing" concept	2014-12-11 13:20:08 +01:00
Bård Skaflestad	9a599d0e24	Merge pull request #256 from totto82/addregionTrans ... Add contribution from region multipliers	2014-12-10 17:02:08 +01:00
Tor Harald Sandve	25a4bb5fbe	Add contribution from region multipliers ... The multiplier contribution from the getRegionMultiplier is added to the face multipliers. The getRegionMultiplier method is called with the cell index on both side of the face in order to return the correct region multiplier across faults.	2014-12-10 11:46:49 +01:00
Tor Harald Sandve	6ae7f460ff	Implement code style comments	2014-12-10 07:34:56 +01:00
Tor Harald Sandve	02724b7f7a	Implement comments for PR#249 ... 1) Add the possibility for the user to chose between local and global coordinate permeability in the transmissibility calculations. 2) Trow for CpGrid 3) Add default for switch	2014-12-10 07:29:05 +01:00
Tor Harald Sandve	b11534b137	Compute half transmissibilities based on local coordinate system ... hTrans(cellFaceIdx) = K(cellNo,j) * sum( C(:,i) .* N(:,j), 2) / sum(C.*C, 2), Only for diagonal tensors, off-diagonal permeability values are ignored without warning	2014-12-10 07:29:05 +01:00
Andreas Lauser	69c4a6d591	adapt to the removal of the "strict parsing" concept	2014-12-09 14:18:42 +01:00
Atgeirr Flø Rasmussen	c051c7bd85	Merge pull request #254 from bska/cmake_254 ... Synchronise build system with OPM core	2014-12-08 15:31:31 +01:00
Arne Morten Kvarving	a9deb4b367	fix opm-parser find rule ... deals with the fallout of opm-parser #365 and #366	2014-12-08 15:26:48 +01:00