11619 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tor Harald Sandve	2f37742c21	add model6 to update ref	2020-09-14 15:56:48 +02:00
Tor Harald Sandve	8c69741bd5	rename test case for model6	2020-09-14 15:53:37 +02:00
Tor Harald Sandve	c2c009ecb6	clean-up based on review	2020-09-14 15:42:48 +02:00
Tor Harald Sandve	d930cc8ad4	add 2p+msw test case	2020-09-14 15:14:22 +02:00
Tor Harald Sandve	1a7b617074	guards against non-exsisting phases	2020-09-14 14:44:16 +02:00
Tor Harald Sandve	a323487b3b	Fix the equation index for 2p oil-water simulations	2020-09-14 14:44:16 +02:00
Tor Harald Sandve	bcc0a1be69	only output connection saturation for existing phases	2020-09-14 14:44:16 +02:00
Bård Skaflestad	4b72b476b5	Merge pull request #2784 from alfbr/missing-features ... Removed OPERATER and OPERNUM since they are supported.	2020-09-13 23:57:19 +02:00
Alf B. Rustad	d0c110e935	Removed duplicated OPTIONS	2020-09-13 23:15:01 +02:00
Alf B. Rustad	1b05ed1199	Removed OPERATER and OPERNUM since they are supported.	2020-09-13 22:40:20 +02:00
Bård Skaflestad	09412bea62	Merge pull request #2776 from blattms/apply-all-multz ... Apply minimum of Z multiplier for PINCH(5)==ALL, Prepare for PINCH(5)==TOP	2020-09-11 16:29:00 +02:00
Markus Blatt	c2362daae9	reactive applyMultipliers_(trans, outsideFaceIdx, ..) for PINCH(5)=ALL ... Should make the tests succeed.	2020-09-10 10:20:17 +02:00
Joakim Hove	bbcbb14a62	Merge pull request #2780 from joakim-hove/add-pinch-barrier ... Add test of PINCH::ALL + MULTZ with a barrier	2020-09-10 10:06:02 +02:00
Markus Blatt	06827bdd17	Apply only MULTZ+ in applyAllZMultipliers_, prepare for PINCH(5)=TOP ... For PINCH(5)==ALL, we take the minimum of MULTZ+ and ignore MULTZ-. We also prepare for PINCH(5)==TOP taking only the toplevel MULTZ+ value. For non-vertical directions we use both MULTZ+ and MULTZ-	2020-09-10 09:12:34 +02:00
Joakim Hove	a920828b1c	Add test of PINCH::ALL + MULTZ with a barrier	2020-09-10 09:04:31 +02:00
Bård Skaflestad	8033e8fc67	Merge pull request #2781 from blattms/fix_pinchmode_all_parallel_3 ... fix insideCartElmIdx and outsideCartElmIdx order for faces in parallel (2)	2020-09-09 23:30:24 +02:00
Markus Blatt	d2a2d5074d	Rely on insideCartElemIdx<outsideCartElemIdx in allpyAllZMultipliers_ ... and simpily code under that assumption.	2020-09-09 21:41:52 +02:00
Bård Skaflestad	f771088414	Merge pull request #2779 from joakim-hove/use-make-unique ... Use std::make_unique<>	2020-09-08 22:44:57 +02:00
Bård Skaflestad	c8ae87b8bb	Merge pull request #2778 from blattms/fix-parallel-summary-output ... Fixes determining whether index of summary keyword is on process.	2020-09-08 22:04:10 +02:00
Joakim Hove	c0187ffc73	Use std::make_unique<>	2020-09-08 21:57:26 +02:00
Markus Blatt	ee6044b2e0	Fixes determining whether index of summary keyword is on process. ... We used a method isGlobalIdxOnThisRank to determine whether to write an entry for a summary keyword (like BPR). Unfortunately, this did exactly what the name suggested, but we actually passed a cartesian index to it. That meant that a lower cartesian index might have found on many processes (with different cartesian index and hence resulting in wrong values), while higher for ones no process would have been found with it (resulting in writing zeros). With this commit we store a sorted list of cartesian indices and query that in the renamed and restructured function isCartesianidxOnThisRank. Most probably this broke during refactoring. Closes #2665	2020-09-08 20:44:27 +02:00
Atgeirr Flø Rasmussen	76384344ca	Merge pull request #2777 from GitPaean/adding_well_assembly_timing ... adding timing for the well assembly	2020-09-08 16:02:16 +02:00
Kai Bao	7b4142e9b6	adding timing for the well assembly ... And changes the indentation of the linear solver setup time a little to show it is part of the linear solve time.	2020-09-08 11:12:41 +02:00
Markus Blatt	11f9eb9d88	Base face processing decision of faces on cartesian indices ... This will process the same faces in serial and parallel. Hence it make the silent assumption that we only process faces from low cartesian index to high cartesian index hold again. This should fix PINCH MULTZ ALL in parallel.	2020-09-08 11:10:31 +02:00
Joakim Hove	00c5d9f016	Merge pull request #2775 from joakim-hove/add-report-step-arg ... Add report_step argument to UDQConfig::eval()	2020-09-08 11:05:29 +02:00
Joakim Hove	7d3ff894ee	Merge pull request #2765 from joakim-hove/add-pinch-testing ... Add regression testing for MULTZ + PINCH::ALL	2020-09-08 10:12:22 +02:00
Joakim Hove	3a3e217941	Add regression testing for MULTZ + PINCH::ALL	2020-09-08 08:35:52 +02:00
Joakim Hove	ead673b58a	Add report_step argument to UDQConfig::eval()	2020-09-08 07:39:03 +02:00
Bård Skaflestad	9d6a0be776	Merge pull request #2772 from blattms/prevent-copy-in-rateconverter ... Prevent another copy of cell to region mapping in RateConverter.	2020-09-07 17:13:22 +02:00
Markus Blatt	578ca0a725	Fixed unused variable warning.	2020-09-07 16:42:01 +02:00
Markus Blatt	c21f1e72f8	Prevent another copy of cell to region mapping in RateConverter. ... RateConverter itself already copies this and offers the mapping. With this commit we just use that.	2020-09-07 15:36:07 +02:00
Markus Blatt	53005c477d	Merge pull request #2762 from ducbueno/opencl-stdwell-clean ... Fixed out of resources problem	2020-09-03 19:50:39 +02:00
Jose Eduardo Bueno	525faf7b5d	Changed work_group_size	2020-09-03 14:25:50 -03:00
Jose Eduardo Bueno	f8898e3158	New function for setting OpenCL in wellContribs	2020-09-03 13:30:12 -03:00
Markus Blatt	3ee0db8cf4	Merge pull request #2760 from atgeirr/inform-user ... Use log mechanism for info output	2020-09-03 17:15:00 +02:00
Markus Blatt	ba8782eeca	Merge pull request #2761 from akva2/fix_flexible_serial ... fixed: use the proper linear operator without wells in matrix in serial	2020-09-03 17:08:40 +02:00
Arne Morten Kvarving	273d465c32	fixed: use the proper linear operator without wells in matrix in serial	2020-09-03 15:53:57 +02:00
Atgeirr Flø Rasmussen	3dffb5d4da	Use log mechanism for info output, and tell the user the deck has been read.	2020-09-03 15:11:25 +02:00
Markus Blatt	d51b4a53e8	Merge pull request #2758 from atgeirr/reinstate-lost-features ... Reinstate lost logging of header and parameters.	2020-09-03 15:08:55 +02:00
Jose Eduardo Bueno	c7adc3495f	Initial commit	2020-09-03 09:46:44 -03:00
Atgeirr Flø Rasmussen	92bdcbf597	Reinstate lost logging of header and parameters. ... Also re-add the ability to do strict parsing.	2020-09-03 14:07:33 +02:00
Atgeirr Flø Rasmussen	4f7421d64d	Merge pull request #2746 from bska/restart-active-group-constraints ... Restore Groups' Active Constraints on Restart	2020-09-03 10:35:55 +02:00
Bård Skaflestad	6220cdf613	Restore Groups' Active Constraints on Restart ... First step towards better restarts of models with group control.	2020-09-03 01:11:32 +02:00
Bård Skaflestad	bdc34a7580	Distribute Group Values at Parallel Restart ... Mostly to prepare for restoring the groups' active controls from restart information.	2020-09-03 01:11:32 +02:00
Bård Skaflestad	a0373ed428	Support Distributing Guiderates in Parallel Restart ... In preparation of distributing group-related information (e.g., the active constraint).	2020-09-03 01:11:32 +02:00
Bård Skaflestad	399ff94bce	Merge pull request #2752 from joakim-hove/pass-udq-state ... Pass the UDQState member when evaluating UDQ	2020-09-03 01:00:03 +02:00
Markus Blatt	5193b0c90e	Merge pull request #2756 from blattms/fix-opencl-shadowing-warnings ... [opencl] Fixes shadowing variable warnings.	2020-09-02 22:51:28 +02:00
Markus Blatt	27931c4303	[opencl] Fixes shadowing variable warnings. ... These seemed familar and I would have sworn that I already fixed them somewhen. Might have been reintroduced by rebasing.	2020-09-02 22:46:44 +02:00
Markus Blatt	e997d7b130	Merge pull request #2751 from ducbueno/opencl-stdwell-clean ... AddStandardWell functionality in OpenCL backend	2020-09-02 22:02:05 +02:00
Bård Skaflestad	d14aaa3401	Merge pull request #2709 from bska/report-guiderates ... Report Guiderates at Well and Group Levels	2020-09-02 21:37:08 +02:00