1271 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tor Harald Sandve	024fe9c7b6	Apply threshold pressure for all dp ... The threshold pressure is applied for all dp. The sign of the threshold pressure is given by the sign of the dp.	2014-09-03 11:05:14 +02:00
Atgeirr Flø Rasmussen	2d146b2a63	Merge pull request #195 from totto82/rs_rv_output ... Add output of RS and RV to outputStateMatlab	2014-09-02 15:50:09 +02:00
Tor Harald Sandve	e4dc5c28b3	Add output of RS and RV to outputStateMatlab	2014-09-02 15:08:22 +02:00
Bård Skaflestad	be589ba5f3	Merge pull request #189 from atgeirr/add-minpv ... Add MINPV support to grid creation for fully implicit sims.	2014-08-29 09:16:55 +02:00
Bård Skaflestad	d0b677920a	Merge pull request #190 from atgeirr/threshold-pressure ... Threshold pressure	2014-08-29 09:14:24 +02:00
Bård Skaflestad	de33d39f46	Merge pull request #191 from atgeirr/fix-warnings ... Suppress warnings of various kinds.	2014-08-28 16:11:27 +02:00
Markus Blatt	7127101c1c	Makes distinction between functions more clear. ... Currently, there are two abstract interface for the grids. One that usually returns pods and arrays of them that also can be used by C and is used also in opm-core, and one that returns Eigen datastructures needed within opm-autodiff. This commit adds a postfix ToEigen to those functions (faceCells, and cellCentroidsZ) one could imagine to also return pods and arrays of them. This should at least resolve the confusion about the two faceCells functions. The next step will be issue #192 Fixes #176	2014-08-28 14:44:13 +02:00
Atgeirr Flø Rasmussen	971e01fdd7	Suppress warnings of various kinds.	2014-08-27 19:56:13 +02:00
Atgeirr Flø Rasmussen	6ba5068928	Make simulator programs actually obtain threshold pressures.	2014-08-27 18:23:11 +02:00
Atgeirr Flø Rasmussen	a48ab0188a	Fix bug: exactly the wrong potentials were nullified.	2014-08-27 18:23:11 +02:00
Atgeirr Flø Rasmussen	efbf42120b	Resize array before assigning elements.	2014-08-27 18:23:10 +02:00
Atgeirr Flø Rasmussen	3fdfeec10c	Pass dummy threshold pressures through simulator to solver.	2014-08-27 18:23:10 +02:00
Atgeirr Flø Rasmussen	4af03dcdb8	Change setThresholdPressures() interface. ... Now it takes a std::vector instead of an Eigen::Array, more importantly it expects one element per face, not interior face. The mapping now takes place in setThresholdPressures().	2014-08-27 18:20:36 +02:00
Atgeirr Flø Rasmussen	dc9ce967a2	Remove files added by mistake.	2014-08-27 18:20:36 +02:00
Atgeirr Flø Rasmussen	dfc726bceb	Rename variable. ... Changed threshold_pressures_by_face_ -> threshold_pressures_by_interior_face_.	2014-08-27 18:20:36 +02:00
Atgeirr Flø Rasmussen	c5de6635c5	Add setThresholdPressures() method.	2014-08-27 18:20:36 +02:00
Atgeirr Flø Rasmussen	f7fa3488cb	Add applyThresholdPressures() method and usage. ... Note that this commit does not introduce any way to set use_threshold_pressure to true, so the new code is not run.	2014-08-27 18:20:36 +02:00
Atgeirr Flø Rasmussen	102881bff8	Merge pull request #185 from totto82/fix_updateState ... Use default primary variable (Sg) for cells almost full of water	2014-08-26 22:35:16 +02:00
Atgeirr Flø Rasmussen	09eb0d455e	Add MINPV support to grid creation for fully implicit sims.	2014-08-25 16:05:42 +02:00
Bård Skaflestad	53e6bfcd3d	Merge pull request #187 from osae/satFunc-eclState ... Provide eclipse state to saturation property init.	2014-08-25 13:56:14 +02:00
Bård Skaflestad	077b01b767	Merge pull request #188 from OPM/support-resv ... Support RESV controls	2014-08-25 13:54:30 +02:00
Bård Skaflestad	d8452145ae	Merge pull request #186 from atgeirr/use-pinch ... Use direct deck-using version of grid construction method.	2014-08-22 20:36:26 +02:00
osae	98afdc7fc2	Provide eclipse state to saturation property init.	2014-08-22 15:30:05 +02:00
Atgeirr Flø Rasmussen	e35546070f	Use direct deck-using version of grid construction method.	2014-08-21 15:26:07 +02:00
Atgeirr Flø Rasmussen	bb9f0ee1dd	Merge pull request #184 from totto82/add_rs_output ... Output rs and rv	2014-08-19 14:39:42 +02:00
Atgeirr Flø Rasmussen	735feef0ab	Avoid unintended switch fall-through. ... Added break statements to all cases, for consistency.	2014-08-19 14:15:50 +02:00
Atgeirr Flø Rasmussen	3ae39f74e5	Delete unneeded typedef after merge.	2014-08-19 14:15:08 +02:00
Atgeirr Flø Rasmussen	7c866f6a7d	Fix wrongly merged comments.	2014-08-19 13:27:42 +02:00
Atgeirr Flø Rasmussen	e644c51750	Merge branch 'master' into support-resv ... Conflicts: examples/sim_fibo_ad.cpp examples/sim_fibo_ad_cp.cpp opm/autodiff/SimulatorFullyImplicitBlackoil.hpp opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp	2014-08-19 09:53:20 +02:00
Tor Harald Sandve	6ae3212341	Use default primary variable (Sg) for cells almost full of water	2014-08-18 12:28:25 +02:00
Tor Harald Sandve	7e297dfaf9	Output rs and rv ... The Rs and Rv values for each timestep are written to files	2014-08-18 08:51:14 +02:00
Atgeirr Flø Rasmussen	b1db55cbe8	Merge pull request #183 from atgeirr/fix-output ... Fix output statements in SimulatorFullyImplicitBlackoil::run().	2014-08-15 14:19:48 +02:00
Atgeirr Flø Rasmussen	fed1653e44	Merge pull request #182 from atgeirr/bugfix-updatestate ... Bugfix for updateState()	2014-08-15 14:19:33 +02:00
Atgeirr Flø Rasmussen	5f9841eacc	Fix output statements in run(). ... This fixes the following bugs: - No longer overwrite the matlab-output files each step. - Create output also for the initial state. - Change filenames of matlab-output by one (initial state is 000.txt, final state is NNN.txt and not (NNN-1).txt for total of NNN steps). - Eclipse binary output matches eclipse output (includes the same steps including initial state) for the same case. Also added several comments outlining the parts of the run() function.	2014-08-14 16:07:58 +02:00
Atgeirr Flø Rasmussen	69697adb04	Fix saturation-change bug in updateState().	2014-08-14 14:21:33 +02:00
Atgeirr Flø Rasmussen	cb2522314d	Improve exception message, add (disabled) debugging helpers.	2014-08-14 14:20:43 +02:00
Atgeirr Flø Rasmussen	d8a7165ccb	Throw if elliptic solve fails.	2014-08-14 14:19:55 +02:00
Atgeirr Flø Rasmussen	687465d591	Merge pull request #181 from atgeirr/num-wells-can-change ... Allow number of wells to increase during simulation	2014-08-14 14:17:28 +02:00
Atgeirr Flø Rasmussen	11cd1061d1	Handle increasing numbers of active wells during simulation. ... This uses partialCopy() to transfer the previous wells' data to the new well state object.	2014-08-13 15:56:36 +02:00
Atgeirr Flø Rasmussen	43c00773db	Add partialCopy() method for transferring well states. ... Also add numWells() and numPhases() helpers.	2014-08-13 15:55:50 +02:00
Bård Skaflestad	6fccb4b446	Merge pull request #179 from atgeirr/restructure-sim ... Restructure fully implicit blackoil simulators	2014-08-13 10:23:41 +02:00
Atgeirr Flø Rasmussen	ebac36ddfc	Merge branch 'master' into restructure-sim ... Conflicts: opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp	2014-08-13 00:02:42 +02:00
Atgeirr Flø Rasmussen	087971383c	Merge pull request #163 from osae/vappars ... kw VAPPARS etc	2014-08-12 23:29:09 +02:00
osae	6eea5e22a1	Update of hysteresis model is now performed prior ... to each time step, thus also capturing the initial state.	2014-08-12 19:53:38 +02:00
osae	8e679382dd	Fixing some syntax.	2014-08-12 19:48:48 +02:00
osae	ca046987a7	Guard against "too small" max saturation. ... This parameter might well be user configurable ...	2014-08-12 19:42:30 +02:00
osae	64231809f5	Bugfix, correcting incomplete merge.	2014-08-12 19:36:25 +02:00
Atgeirr Flø Rasmussen	1b7e748431	Update sim_fibo_ad_cp to use refactored simulator class. ... Also add some other features that have been added to sim_fibo_ad but not to sim_fibo_ad_cp: - (Un)Strict parsing parameter. - EQUIL init (currently throws, since initEquil not yet made generic).	2014-08-12 12:54:55 +02:00
Atgeirr Flø Rasmussen	80b0921ce3	Use generic WellsManager constructor. ... Also fix minor whitespace issues.	2014-08-12 12:54:16 +02:00
Atgeirr Flø Rasmussen	bb118a9a39	Remove superfluous output and use const.	2014-08-12 12:53:11 +02:00