3890 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kai Bao	fcd541a1c1	removing the rebundant ms_wells_ in BlackoilMultiSegmentModel	2016-05-23 15:11:51 +02:00
Kai Bao	184bff95ba	using well_model_ to represent the WellModel member	2016-05-23 15:11:51 +02:00
Kai Bao	06775ee02c	Make BlackoilMultisegmentModel constructured from MultisegmentWells ... Instead of being coustructed based StandardWells and having a MultisegmentWells member.	2016-05-23 15:11:51 +02:00
Kai Bao	4254b48b57	unifying interface of a few functions of Wells classes ... updateWellControls() updateWellState() addWellControlEq() The change of function computeWellConnectionPressures() is not done completely. Should find a solution later.	2016-05-23 15:11:51 +02:00
Kai Bao	be165a26e0	adding a few more members to the Wells classes. ... gravity, vfp_properties_ and depth_. to further simplify the interfaces.	2016-05-23 15:11:51 +02:00
Kai Bao	50385013fe	adding variableWellStateInitials to MultisegmentWells	2016-05-23 15:11:51 +02:00
Kai Bao	7886e4b9d2	adding computeWellConnectionPressures to MultisegmentWells	2016-05-23 15:11:51 +02:00
Kai Bao	b4f4878901	fixing the errors from rebasing.	2016-05-23 15:11:51 +02:00
Kai Bao	60fb868727	adding updatePerfPhaseRatesAndPressures to MultisegmentWells	2016-05-23 15:11:51 +02:00
Kai Bao	508de4dc37	adding extractWellPerfProperties to MultisegmentWells ... removing extractWellPerfProperties in all the model classes.	2016-05-23 15:11:51 +02:00
Kai Bao	718ba5470b	adding const Wells* wells_ for MultisegmentWells ... for interface refactoring. At the moment, both wells_ and wells_multisegment_ contain all the wells.	2016-05-23 15:11:51 +02:00
Kai Bao	4180fea951	refactoring the construcor of MultisegmentWells ... MultisegmentWells is initialized with Wells structure.	2016-05-23 15:11:51 +02:00
Kai Bao	7d0d50eb53	changing reservoir related members to pointers for MultisegmentWells	2016-05-23 15:11:51 +02:00
Kai Bao	66cd66e61b	change reservoir related members to be pointers in StandardWells ... to fullfil the requirement of interface design.	2016-05-23 15:11:51 +02:00
Kai Bao	89a8f133fd	adding variableWellStateIndices to MultisegmentWells ... to remove the using of stdWells() in BlackoilMultiSegmentModel The code is copied from StandardWells, better solution need to be exploited.	2016-05-23 15:11:50 +02:00
Kai Bao	a8742a9348	introduce perforation densities and pressdiffs to MultisegmentWells ... to reduce dependence on StandardWells.	2016-05-23 15:11:50 +02:00
Kai Bao	25fbd20acf	adding a few member variables for MultisegmentWells ... and reduce the number of parameters of the related functions by using the new introduced member variables.	2016-05-23 15:11:50 +02:00
Kai Bao	bd03eff5a5	making two functions in StandardWells protected. ... computePropertiesForWellConnectionPressures computeWellConnectionDensitesPressures	2016-05-23 15:11:50 +02:00
Kai Bao	1f2442fe80	reducing paramter list for more functions in StandardWells ... computeWellFlux updateWellState updateWellControls addWellControlEq computeWellPotentials	2016-05-23 15:11:50 +02:00
Kai Bao	a35c3e7468	removing parameters for extractWellPerfProperties	2016-05-23 15:11:50 +02:00
Kai Bao	75c64b67d1	fixing the compilation from the rebase.	2016-05-23 15:11:50 +02:00
Kai Bao	0667fceb35	reducing the number of arguments of computeWellConnectionPressures ... and computeWellConnectionDensitesPressures. These functions need to be renamed.	2016-05-23 15:11:50 +02:00
Kai Bao	18a530f9be	removing paramters in computePropertiesForWellConnectionPressures	2016-05-23 15:11:50 +02:00
Kai Bao	22b5157bf2	adding a few fluid related members to StandardWells ... to reduce the number of the public function arguments.	2016-05-23 15:11:50 +02:00
Atgeirr Flø Rasmussen	d1da78b5b2	Merge pull request #692 from GitPaean/fixing_volumeratio_calculation ... fixing application of rs and rv to the volumeRatio calculation.	2016-05-23 10:02:37 +02:00
Atgeirr Flø Rasmussen	7dbd197650	Merge pull request #684 from totto82/liveoilsolvent2 ... Changes needed to run Model 2 with co2	2016-05-20 15:08:48 +02:00
Kai Bao	6f2a0c47a2	fixing application of rs and rv to the volumeRatio calculation. ... the use of parenthesis is wrong according to Cramer's rule	2016-05-20 14:52:24 +02:00
Joakim Hove	02da9a60f3	Merge pull request #691 from joakim-hove/solidify-restart-test ... Some checks for file open and file has keyword.	2016-05-19 21:14:24 +02:00
Atgeirr Flø Rasmussen	bd774ed06c	Merge pull request #679 from qilicun/log_simulation_messages ... write simulation details to log file.	2016-05-19 15:09:39 +02:00
Joakim Hove	cb4c25ca3d	Merge pull request #680 from pgdr/introducing-nnc ... Introducing NNC output	2016-05-19 13:44:31 +02:00
Pål Grønås Drange	2620dda8c3	Moved NNC to GeoProps, populating NNC at update ... * FlowMain now gets NNC by `geoprops_->nnc()` * Refactored update() * Moved big chunk of unused code to new private method pinchProcess_ * Reordered logic to unite the NNC logic	2016-05-19 13:33:09 +02:00
Pål Grønås Drange	973914931d	Introducing NNC output ... * Compute NNC by face2cell information from a grid * Pass NNC information to EclipseWriter * Made NNC respect ECLIPSE input data * nncStructure() is now exportNncStructure()	2016-05-19 13:23:18 +02:00
Tor Harald Sandve	cc2a7d8767	Cleanup in updateState in the solvent model	2016-05-19 12:38:44 +02:00
Tor Harald Sandve	0730ffcb69	BUGFIX. Wrong uses of parenthesis in Cramer's rule	2016-05-19 11:28:36 +02:00
Tor Harald Sandve	bd0ad6aa5b	Adapt to changes related to hydroCarbonState	2016-05-19 11:25:27 +02:00
Liu Ming	626bde704a	fix indentation.	2016-05-19 17:10:13 +08:00
Tor Harald Sandve	03d6dde203	Convergence improvment in the TL model ... -- division on zero is avoided -- if no solvent is present, pure values are used for the density and visocity	2016-05-19 10:49:22 +02:00
Tor Harald Sandve	8be3ca7557	Support for liveoil in combination with solvent ... - a solvent specific updateState is used to assure that the correct oil saturation is used to detect phase transision - presence of gas is compensated for in the oil phase	2016-05-19 10:49:22 +02:00
Joakim Hove	3729f91b6d	Some checks for file open and file has keyword. ... Using type 'const char*' instead of auto to guarantee C interoperability.	2016-05-19 10:02:28 +02:00
Liu Ming	b134455a4d	use OpmLog to control terminal output limits.	2016-05-19 10:51:52 +08:00
Atgeirr Flø Rasmussen	1f4b9e56f8	Merge pull request #690 from pgdr/try-to-disable-async-output ... WIP trying disabling async output default setting	2016-05-18 22:42:33 +02:00
Pål Grønås Drange	d995582f46	trying disabling async output default setting	2016-05-18 16:11:57 +02:00
Atgeirr Flø Rasmussen	9c771ab6b1	Merge pull request #687 from totto82/hydrocarbonstate ... Use stored hydrocarbonstate to get primal variables	2016-05-18 14:16:58 +02:00
Arne Morten Kvarving	fbb573947b	fixed: specifying pr's in jenkins trigger was broken ... invalid loop over array.	2016-05-18 10:29:08 +02:00
Tor Harald Sandve	cd91444bc9	Compute the hydroCarbonState after initializing from restart files	2016-05-13 14:09:51 +02:00
Tor Harald Sandve	5757ef8ad0	Adjust to upstream changes ... Change from std::vector<int> to std::vector<HydroCarbonState> for the hydroCarbonState	2016-05-13 12:40:50 +02:00
Tor Harald Sandve	01c782dbf3	Remove primalvariable_ and use hydroCarbonState instead ... the hydrocarbonstate is stored in the reservoir state and used instead of the primalvariable_ The initial hydrocarbonstate is computed using initHydroCarbonState(...);	2016-05-13 09:04:48 +02:00
Atgeirr Flø Rasmussen	ca40a31e7b	Merge pull request #681 from dr-robertk/PR/use_have_pthread ... Use HAVE_PTHREAD to enable async output.	2016-05-12 12:20:09 +02:00
Tor Harald Sandve	e8fcf9259c	Use stored hydrocarbonstate to get primal variables ... If hydrocarbonstate is not provided by the state fall back to the old behaviour of computing the hydrocarbonstate from the saturations	2016-05-12 10:38:49 +02:00
Atgeirr Flø Rasmussen	3074a043b4	Merge pull request #686 from totto82/sparsity_pattern ... Add the option of computing the full sparity pattern based on all phases	2016-05-11 17:38:54 +02:00