3919 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Atgeirr Flø Rasmussen	68a0d3796b	Remove unused include.	2016-09-07 12:53:19 +02:00
Atgeirr Flø Rasmussen	98ec930a25	Merge pull request #770 from blattms/call-writeInit-before-distributing-grid ... Call writeInit with global grid and properties.	2016-09-07 11:29:19 +02:00
Joakim Hove	d7e054cbfa	Merge pull request #804 from joakim-hove/remove-shared-ptr ... shared_ptr<EclipseGrid> -> const EclipseGrid&	2016-09-07 11:12:29 +02:00
Atgeirr Flø Rasmussen	f78155fe23	Merge pull request #808 from qilicun/fix-pav ... Correct the formulation for PAV calculations.	2016-09-07 08:52:18 +02:00
Liu Ming	4b88d4edd1	use PV weighted pressure when HCPV is zero.	2016-09-07 14:00:30 +08:00
Liu Ming	d5b4194a0e	format fIP output for field units and check the phase is present or not.	2016-09-06 09:33:41 +08:00
Liu Ming	170607e60c	check if the phase is present.	2016-09-05 16:14:27 +08:00
Liu Ming	1943978dbd	update PAV formulation.	2016-09-05 10:38:57 +08:00
Atgeirr Flø Rasmussen	983c7d9957	Merge pull request #787 from totto82/fix_minpv_actnum ... BUGFIX. Correctly handle ACTNUM in minPvFillProps_()	2016-09-02 15:17:28 +02:00
Liu Ming	c5a490c75a	fix typo.	2016-09-02 16:58:42 +08:00
Liu Ming	490dbbf133	correct the formulation for PAV calculations.	2016-09-02 16:53:39 +08:00
Joakim Hove	10d76d5bb1	shared_ptr<EclipseGrid> -> const EclipseGrid&	2016-08-31 19:39:39 +02:00
Atgeirr Flø Rasmussen	5f1bcb2a59	Merge pull request #802 from atgeirr/qilicun-fip-support ... Output total fluid in place	2016-08-31 08:49:35 +02:00
Atgeirr Flø Rasmussen	b5e986df5f	Remove well state argument from computeFluidInPlace().	2016-08-30 13:34:18 +02:00
Atgeirr Flø Rasmussen	a2001ca2e1	Avoid variable shadowing.	2016-08-30 13:33:50 +02:00
Atgeirr Flø Rasmussen	69812fddd2	Remove unnecessary override of computeFluidInPlace(). ... It also called itself, causing infinite recursion.	2016-08-30 13:18:54 +02:00
Atgeirr Flø Rasmussen	61af1fa53d	Remove unused nnc arg from BlackoilOutputWriter constructor.	2016-08-30 13:18:06 +02:00
Liu Ming	46b0ef635b	fix typo.	2016-08-30 10:30:26 +02:00
Liu Ming	a1bf3769fe	format fip output.	2016-08-30 10:30:26 +02:00
Liu Ming	c9c7a5c744	compute hydrocarbon weighted pore voulme pressue and pv for fip regions.	2016-08-30 10:30:26 +02:00
Liu Ming	2ac3306c18	drop the for loop over fip regions.	2016-08-30 10:30:26 +02:00
Liu Ming	a492a60a64	document computeFluidInPlace function.	2016-08-30 10:30:26 +02:00
Liu Ming	b2432c871f	fix typo.	2016-08-30 10:30:25 +02:00
Liu Ming	aa96931f69	use a separate function to output fip and compress fipnum from eclipseState.	2016-08-30 10:30:25 +02:00
Liu Ming	59a2668152	compute different fip regions.	2016-08-30 10:30:25 +02:00
Liu Ming	7c3148c1f3	get cell FIPNUM values.	2016-08-30 10:30:25 +02:00
Liu Ming	90086f690e	only compute field fluid in place.	2016-08-30 10:30:25 +02:00
Liu Ming	056708574c	compute fluid in place by regions.	2016-08-30 10:30:25 +02:00
Liu Ming	28583e4237	Add computeFluidInPlace function.	2016-08-30 10:30:25 +02:00
Liu Ming	78a5381f5d	output water and gas fluid in place.	2016-08-30 10:29:24 +02:00
Liu Ming	148038939d	add computeFIP method.	2016-08-30 10:29:24 +02:00
Atgeirr Flø Rasmussen	379bd967e1	Merge pull request #801 from qilicun/update-missing-keyword-list ... NOSIM is supported, should remove from the list.	2016-08-29 08:30:09 +02:00
Liu Ming	60fd4add69	NOSIM is supported, should remove from the list.	2016-08-29 09:34:04 +08:00
Arne Morten Kvarving	a563360e74	Merge pull request #798 from akva2/add_multiconfiguration ... add multiconfiguration support to jenkins build script	2016-08-24 16:02:21 +02:00
Arne Morten Kvarving	4f779b7a01	add multiconfiguration support to jenkins build script ... also unifies build.sh and build-pr.sh and gets rid of build-opm-simulators.sh	2016-08-23 14:26:06 +02:00
Joakim Hove	5602e654c3	Merge pull request #795 from joakim-hove/arg-reorder ... Illustrate support of properties like KRW and FLUX in restart file.	2016-08-23 11:30:36 +02:00
Atgeirr Flø Rasmussen	183d2f4477	Merge pull request #762 from qilicun/messages-for-keywords-options ... Handle partially supported options manually.	2016-08-23 08:07:29 +02:00
Joakim Hove	71491cac6c	Merge pull request #796 from akva2/simplify_after_ert_reorg ... simplify jenkins build scripts after ert reorganization	2016-08-22 17:29:40 +02:00
Arne Morten Kvarving	cd822bc714	simplify jenkins build scripts after ert reorganization	2016-08-22 13:57:32 +02:00
Liu Ming	95ab7038ea	Rename addUnsupported to addSupported.	2016-08-22 16:14:37 +08:00
Joakim Hove	0f7c9f4b97	Added optional simProps argument to restart.	2016-08-20 20:10:50 +02:00
Joakim Hove	56a7775fee	Changed order of arguments to match opm-output.	2016-08-20 20:09:56 +02:00
Atgeirr Flø Rasmussen	c14b19c48b	Merge pull request #792 from qilicun/fix-polymer-inflow ... look for water injector only, if not find, just continue to next step.	2016-08-15 17:35:15 +02:00
Joakim Hove	f03fd5feee	Merge pull request #794 from jokva/parser-restart-config ... Match RestartConfig interface in opm-parser	2016-08-12 15:46:31 +02:00
Liu Ming	5f059da0a4	look for water injector only, if not find, just continue to next step.	2016-08-12 08:27:07 +08:00
Jørgen Kvalsvik	ab95133d1c	Match RestartConfig interface in opm-parser	2016-08-11 09:59:07 +02:00
Tor Harald Sandve	2b09aca23a	BUGFIX. Currently handle ACTNUM in minPvFillProps_() ... Make sure that inactive cells are not included in the averaging	2016-08-09 15:51:38 +02:00
Joakim Hove	0a4dfb6d69	Merge pull request #783 from pgdr/downstream-transmult-and-shared_ptrs ... TransMult, Init, and SimConfig are references, applyModifierDeck take…	2016-08-09 09:33:18 +02:00
Atgeirr Flø Rasmussen	d6230f74d5	Merge pull request #784 from totto82/fix_ntg_minpv ... BUGFIX. Use the modified NTG values in multiplyHalfIntersections_(..)	2016-08-09 08:29:39 +02:00
Tor Harald Sandve	b468d2baa1	BUGFIX. Use the modified NTG values in multiplyHalfIntersections_(..)	2016-08-08 13:22:02 +02:00