3646 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tor Harald Sandve	18246263e9	Move computation of well potentials from simulator class ot model class ... - the computation of well potentials in the model class calculates the well potentials using computeWellFlux() - in this way the well potential calculations also handle well where some perforations are closed by the simulator due to cross-flow. - the well potentials pr perforation and phase is stored in the well state.	2016-04-19 09:21:15 +02:00
Atgeirr Flø Rasmussen	d9787f7593	Merge pull request #655 from akva2/updates_for_16.04_packaging ... Updates for 16.04 packaging	2016-04-18 11:49:36 +02:00
Arne Morten Kvarving	0fe722068a	update redhat packaging ... - deal with module renaming - deal upstream with module renaming and additions - use boost 1.48 only on rhel6. rhel7 supplies a newer boost by default.	2016-04-18 11:44:26 +02:00
Arne Morten Kvarving	0155535079	update debian packaging ... - deal with module renaming - deal with upstream module renaming and additions - enable MPI and add related dependencies	2016-04-18 11:26:25 +02:00
Andreas Lauser	4baf0f6acf	Merge pull request #654 from andlaus/nested_ad ... Fix build	2016-04-18 11:01:39 +02:00
dr-robertk	93f48d6ad9	Merge pull request #647 from GitPaean/wells_refactoring_onlytemplate_function ... Moving more well related functions to StandardWells	2016-04-16 12:37:42 +02:00
Andreas Lauser	0405953a64	adapt code w.r.t. the removal of the tags for Opm::Evaluation	2016-04-15 18:49:29 +02:00
Atgeirr Flø Rasmussen	fbe7a2242b	Merge pull request #653 from dr-robertk/PR/cleanup-backuprestore ... BackupRestore: remove all specializations for BlackoilState.	2016-04-15 13:15:35 +02:00
Robert Kloefkorn	da0e725eb8	BackupRestore: remove all specializations for BlackoilState. This is now covered by ... SimulationDataContainer.	2016-04-15 12:21:47 +02:00
Kai Bao	adb140a788	fixing the running of flow_multisegment	2016-04-14 16:05:19 +02:00
Kai Bao	75b73a893e	putting Vector and ADB to be inside StandardWells and wellhelpers	2016-04-14 16:05:19 +02:00
Kai Bao	14d774e08f	removing blank lines in CMakeLists_files ... Not sure how the lines happened, probably from the rebase process.	2016-04-14 16:05:19 +02:00
Kai Bao	19734f2103	adding extractWellPerfProperties to StandardWellsSolvent ... to fix the flow_solvent running.	2016-04-14 16:05:19 +02:00
Kai Bao	5da57973fe	adding updateWellState and updateWellControls to StandardWells	2016-04-14 16:05:18 +02:00
Kai Bao	376c940f09	moving updatePerfPhaseRatesAndPressures to StandardWells	2016-04-14 16:05:18 +02:00
Kai Bao	c398a6e424	puting computeWellFlux in StandardWells	2016-04-14 16:05:18 +02:00
Kai Bao	e9e1b9fda8	adding extractWellPerfProperties to StandardWells ... It causes problem for the flow_multisegment. So the version in BlackoilModelBase is kept for now. On the other hand, it is few of functions that will be both required by the standard wells and multisegment wells. Some decision will be made later on how to put this function.	2016-04-14 16:05:18 +02:00
Kai Bao	c8b66821d5	adding computeWellConnectionDensitesPressures to StandardWells class.	2016-04-14 16:05:18 +02:00
Kai Bao	5d99fac207	adding StandardWellsSolvent for Solvent model.	2016-04-14 16:05:18 +02:00
Kai Bao	bca23d34c1	making StandardWells non-templated ... we will focus on template functions instead.	2016-04-14 16:05:18 +02:00
Kai Bao	266f6f2df5	adding computePropertiesForWellConnectionPressures to StandardWells ... tested with flow. Not sure how other flow siblings work.	2016-04-14 16:05:18 +02:00
Kai Bao	3bcfc905bd	makding StandardWells a template based on SolutionState and WellState ... may need to be adjusted later.	2016-04-14 16:05:18 +02:00
Atgeirr Flø Rasmussen	fd99a9e6e9	Merge pull request #652 from GitPaean/buggy_pointer_usage ... correcting buggy pointer usage for visc parameters in effective viscosity calcuation	2016-04-14 15:42:00 +02:00
Kai Bao	c120313f09	renaming visc parameters to mu_w for better readability	2016-04-14 15:09:03 +02:00
Kai Bao	104f6053f1	removing blank spaces and replacing the tab with spaces by retab	2016-04-14 14:57:26 +02:00
Kai Bao	30774d8309	correcting buggy visc pointer usage in effective viscosity calculation	2016-04-14 14:52:00 +02:00
Atgeirr Flø Rasmussen	c64593a023	Merge pull request #650 from GitPaean/mixing_parameters_fixing ... using effective polymer viscosity for polymer mobility calculation.	2016-04-14 14:16:45 +02:00
Bård Skaflestad	4ec1a306ad	Merge pull request #651 from atgeirr/restore-output ... Re-enable output for 2-phase sims.	2016-04-14 13:54:24 +02:00
Kai Bao	666f91505d	using effective polymer viscosity for polymer mobility calculation.	2016-04-14 13:45:21 +02:00
Atgeirr Flø Rasmussen	a031c25ced	Re-enable output for 2-phase sims. ... This was disabled when the facilities were moved to opm-output. Now that the simulators are in the opm-simulators module and not opm-core we can re-enable it.	2016-04-14 13:08:24 +02:00
Bård Skaflestad	e83518108e	Merge pull request #646 from atgeirr/import-sim ... Import simulator, update code	2016-04-14 12:49:09 +02:00
Pål Grønås Drange	170a71eef8	Using API get3DProperties.	2016-04-14 11:37:27 +02:00
Atgeirr Flø Rasmussen	be67e0f7a5	Update include file locations.	2016-04-14 11:32:08 +02:00
Atgeirr Flø Rasmussen	4d2cc114b7	Add imported files to Cmake list.	2016-04-14 11:32:08 +02:00
Joakim Hove	6f6f1afb8f	Replaced SimulatorState -> SimulationDatacontainer ... Have removed the SimulatorState base class, and instead replaced with the SimulationDatacontainer class from opm-common. The SimulatorState objects were typcially created with a default constructor, and then explicitly initialized with a SimulatorState::init() method. For the SimulationDataContainer RAII is employed; the init( ) has been removed - and there is no default constructor.	2016-04-14 11:32:08 +02:00
Liu Ming	bfb5a49af1	rename ParseMode in examples folder.	2016-04-14 11:32:08 +02:00
Jørgen Kvalsvik	6ec0594f17	Improve includes from opm-parser ... Adopting to opm-parser PR#661, add previously missing includes. https://github.com/OPM/opm-parser/pull/661	2016-04-14 11:32:08 +02:00
Atgeirr Flø Rasmussen	6d80b5b03f	In sim_2p_incomp, avoid running everything twice. ... There were loops (over all timesteps) both in the main() function and the simulator class. Note: This simulator cannot properly handle changing well configurations, and will now use only the initial configuration (first report step), instead of possibly crashing later.	2016-04-14 11:32:08 +02:00
Andreas Lauser	29f4be0f6c	use the error macros from opm-common	2016-04-14 11:32:08 +02:00
Joakim Hove	d23c4e5518	Updated to use ParseMode.	2016-04-14 11:32:08 +02:00
Atgeirr Flø Rasmussen	03a84a3ac4	Use existing TimeMap, instead of creating new.	2016-04-14 11:32:08 +02:00
Atgeirr Flø Rasmussen	9f587fee21	Bugfix: avoid using TimeMap without deck. ... This made the simulator crash when there is no deck involved.	2016-04-14 11:32:07 +02:00
Andreas Lauser	b27aadc083	adapt the the table related API changes of opm-parser	2016-04-14 11:32:07 +02:00
Atgeirr Flø Rasmussen	e439084f81	Fix: eclipseState no longer shadowed.	2016-04-14 11:32:07 +02:00
Andreas Lauser	5b5f6e6aa6	Glue in support for the grid property modifier keywords ... this basically means using Opm::EclipseState instead of the raw deck for these keywords. with this, property modifiers like ADD, MULT, COPY and friends are supported for at least the PERM* keywords. If additional keywords are required these can be added relatively easily as well. no ctest regressions have been observed with this patch on my machine.	2016-04-14 11:32:07 +02:00
Andreas Lauser	12ece55907	rename all "newParserDeck" objects to "deck" ... The "new" parser is now "the" parser...	2016-04-14 11:32:07 +02:00
Andreas Lauser	c89e1ed0b6	convert the examples and the tests to opm-parser	2016-04-14 11:32:07 +02:00
Joakim Hove	9f6d658486	Removed WellsManager constructor which takes an ole Eclipsegridparser instance.	2016-04-14 11:32:07 +02:00
Andreas Lauser	f0e86b98e3	catch all exceptions in all tutorials and examples	2016-04-14 11:32:07 +02:00
Andreas Lauser	e8458e9a23	convert THROW to OPM_THROW	2016-04-14 11:32:07 +02:00