7971 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Arne Morten Kvarving	4933c10035	reduce scope of variable	2018-04-13 11:25:10 +02:00
Arne Morten Kvarving	ee57c82834	changed: mark constructors explicit	2018-04-13 11:25:10 +02:00
Arne Morten Kvarving	fddad72a3e	fixed: quell signed/unsigned comparison warning	2018-04-13 11:25:10 +02:00
Atgeirr Flø Rasmussen	63dabb4777	Merge pull request #1450 from GitPaean/update_VFP_related ... adapting to the change related to VFP from the parser.	2018-04-12 11:20:21 +02:00
Tor Harald Sandve	6a3b869331	Merge pull request #1452 from andlaus/dissolve_aux ... adapt to the removal of the `ewoms/aux` directory	2018-04-11 12:50:12 +02:00
Kai Bao	ed49fd1e88	adapting to the change related to VFP from the parser.	2018-04-11 09:22:52 +02:00
Andreas Lauser	55093b4918	adapt to the removal of the ewoms/aux directory	2018-04-10 10:17:31 +02:00
Arne Morten Kvarving	e163c97fc2	Merge pull request #1441 from totto82/fix_co2case ... Some minor fixes to RESV and initial well composition	2018-04-09 14:30:41 +02:00
Atgeirr Flø Rasmussen	d211c1927f	Merge pull request #1393 from andlaus/minimal_changes_for_blackoil_energy ... Minimal changes for blackoil energy	2018-04-06 16:11:57 +02:00
Andreas Lauser	3924bb1e6e	explicitly disable all extensions supported by black oil model for the base simulator ... this should not really be necessary because they are supposed to be disabled by default, but it makes things a bit more explicit	2018-04-06 11:01:33 +02:00
Andreas Lauser	b74d39f2e1	make flow compile in face of the energy conservation changes of the eWoms black oil model ... with this, flow does *not* yet support thermal simulations, this patch merely makes it compile while nothing user-facing is supposed to change.	2018-04-06 11:01:33 +02:00
Atgeirr Flø Rasmussen	a32a5b24eb	Merge pull request #1448 from bska/missing-include ... Include <sstream> for Class "ostringstream"	2018-04-04 19:41:17 +02:00
Bård Skaflestad	0f4354d8fd	Include <sstream> for Class "ostringstream" ... Some implementations do not get a transitive definition of class "ostringstream" in scope through the other headers and therefore fail to compile the member function SimulatorReport::reportStep(std::ostringstream&)	2018-04-04 19:00:51 +02:00
Atgeirr Flø Rasmussen	9897ae361e	Merge pull request #1428 from totto82/relax_convergence ... Add option for relaxed CNV tolerance	2018-04-04 16:38:47 +02:00
Atgeirr Flø Rasmussen	ce308455ab	Merge pull request #1433 from totto82/fix_reportStep ... Add reportStep method in SimulatorReport and use it	2018-04-04 15:23:01 +02:00
Atgeirr Flø Rasmussen	4f39cdc9c9	Merge pull request #1439 from GitPaean/silencing_warning_extra_ ... silencing warning related to extra ; from BlackoilAmg	2018-04-04 14:32:18 +02:00
Atgeirr Flø Rasmussen	482c63e274	Merge pull request #1446 from GitPaean/removing_flowmainpolymer ... Removing flowmainpolymer	2018-04-04 14:30:37 +02:00
Joakim Hove	024472b773	Merge pull request #1445 from joakim-hove/missing-LGR-features ... Mark LGR related keywords as unsupported	2018-04-03 14:35:44 +02:00
Atgeirr Flø Rasmussen	b9c5d26cdc	Merge pull request #1447 from akva2/fix_tests_data ... setup-opm-data -> setup-opm-tests	2018-04-03 13:16:42 +02:00
Arne Morten Kvarving	b7f791c623	setup-opm-data -> setup-opm-tests	2018-04-03 12:40:45 +02:00
Atgeirr Flø Rasmussen	b9d7b69bd6	Merge pull request #1444 from akva2/missing_data_to_tests ... fixed: missing opm-data -> opm-tests references	2018-04-03 12:31:47 +02:00
Kai Bao	87b3cccd7f	removing WPIMULT from MissingFeatures	2018-04-03 11:11:25 +02:00
Kai Bao	7eaaae3906	removing FlowMainPolymer.hpp	2018-04-03 11:08:25 +02:00
Joakim Hove	5629b9b422	Mark LGR related keywords as unsupported	2018-04-03 09:40:36 +02:00
Arne Morten Kvarving	067d4cd259	fixed: missing opm-data -> opm-tests references	2018-04-03 08:26:37 +02:00
Arne Morten Kvarving	701fcbeb12	Merge pull request #1436 from akva2/data_to_tests ... Use opm-tests	2018-03-27 14:57:00 +02:00
Arne Morten Kvarving	dfe2f17dee	use opm-tests	2018-03-27 11:14:23 +02:00
Joakim Hove	1d7735fc82	Merge pull request #1443 from stefoss23/RemoveMessageContainer ... Made changes to comply w/ removal of MessageContainer.	2018-03-26 13:04:38 +02:00
Steinar Foss	a931901374	Made changes to comply w/ removal of MessageContainer.	2018-03-26 12:13:55 +02:00
Andreas Lauser	550c4b5bd5	Merge pull request #1442 from crayxt/patch-1 ... Fix a typo.	2018-03-26 10:32:38 +02:00
Baurzhan Muftakhidinov	02e8b6e021	Fix a typo.	2018-03-24 21:07:03 +05:00
Tor Harald Sandve	4e9403b8f8	Correct the RESV calculation for unsaturated cases ... Make sure that the reservoar volumes always stays positive. i.e. we can not remove more dissolved gas from the rate than the total volume amout of gas.	2018-03-23 15:23:47 +01:00
Tor Harald Sandve	975a9a6766	Fix intial fluid distribution in the well ... Solve the well equation in order to determine the initial fluid content of the well used for the hydrostatic pressure calculation in the well.	2018-03-23 12:56:19 +01:00
Kai Bao	90e69b59cf	silencing warning related to extra ; from BlackoilAmg	2018-03-14 12:02:07 +01:00
Atgeirr Flø Rasmussen	6f18f7115f	Merge pull request #1438 from GitPaean/fixing_testtest_multmatrixtransposed ... fixing test_multmatrixtransposed	2018-03-13 13:32:17 +01:00
Kai Bao	f098579e0b	fixing test_multmatrixtransposed	2018-03-13 12:58:44 +01:00
Andreas Lauser	4a6ab7ac76	Merge pull request #1434 from andlaus/tasklets ... tasklets mop-up	2018-03-13 12:15:57 +01:00
Andreas Lauser	a42ece61ed	BlackoilModelEbos: set the default output directory to the empty string ... an empty string is interpreted as "write the output files into the same directory as the input". this is the current 'flow' default behavior, plain ebos uses "." as the default location for output, i.e., the current directory from which the simulator is run from.	2018-03-12 15:17:39 +01:00
Andreas Lauser	71d353326a	move the old "ThreadHandle" mechanism back to opm-simulators ... this class is only used by the legacy simulators, `flow` uses the `EclWriter` class provided by eWoms. In turn, this class uses the new-and-shiny "tasklet" mechanism.	2018-03-12 15:17:39 +01:00
Tor Harald Sandve	7c9dab1a64	Add reportStep method in SimulatorReport and use it	2018-03-12 14:48:34 +01:00
Tor Harald Sandve	15aeac3f90	Add option for relaxed CNV tolerance ... Use a relaxed tolerance for individual cells (CNV) when iter > max_strict_iter. tolerance_cnv_relaxed_ is defauled to 1.0e9 This assure the same behaviour as current master, where CNV criterion is ignored when iter > max_strict_iter TODO: Test this with a stricter default ( <= 1.0)	2018-03-12 08:23:57 +01:00
Atgeirr Flø Rasmussen	79bc265de8	Merge pull request #1431 from GitPaean/silencing_warning_from_opm_common_pr_348 ... adding POLYMW to the injectorType determination	2018-03-10 13:19:37 +01:00
Kai Bao	b0edfd2f04	adding POLYMW to the injectorType determination ... just to silence a warning resulting from OPM/opm-common#348.	2018-03-09 14:40:49 +01:00
Atgeirr Flø Rasmussen	14645fb1b8	Merge pull request #1429 from akva2/remove_repo_update_data ... changed: remove repos from regression data update script	2018-03-09 14:15:24 +01:00
Atgeirr Flø Rasmussen	1380564256	Merge pull request #1425 from totto82/fix_enable_storage_term_false ... Bugfix. enableStorageCache=false	2018-03-09 14:13:10 +01:00
Atgeirr Flø Rasmussen	cef255b212	Merge pull request #1430 from atgeirr/fix-boost-dyn-link ... Leave BOOST_TEST_DYN_LINK setting to the build system.	2018-03-09 14:12:09 +01:00
Atgeirr Flø Rasmussen	42c41efa4e	Leave BOOST_TEST_DYN_LINK setting to the build system.	2018-03-09 12:56:51 +01:00
Atgeirr Flø Rasmussen	8070e9d229	Merge pull request #1397 from blattms/system-amg-rebased ... Add support for CPR (and variants) for flow_ebos	2018-03-09 12:46:27 +01:00
Arne Morten Kvarving	a7d1544585	changed: remove repos from regression data update script	2018-03-09 09:35:15 +01:00
Atgeirr Flø Rasmussen	d4096f43f7	Merge pull request #1427 from GitPaean/fixing_trans_pvto_test ... fixing test_transmissibilitymultipliers	2018-03-08 08:48:38 +01:00