11370 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tor Harald Sandve	43d434d42e	trivial clean up	2020-06-17 08:39:19 +02:00
Tor Harald Sandve	e9d040a284	Fix upwining for friction, acceleration, valve and SIGD for MSW ... Note 1: The rate vectors used for the pressure equation now contains derivatives wrt to the upwind segment for fractions. To make sure derivatives wrt. to different segmens gets mixed we disregard the derivatives for the properties (density, viscosity) evaluated at the upwind segment. Note 2: A factor 2 is added to the velocity head term similar as in the friction term Note 3: A sign change is added to the acceleration term for massrates > 0. Is this correct. It seems like the reference simulator does this.	2020-06-17 08:39:19 +02:00
Atgeirr Flø Rasmussen	9c552ec812	Merge pull request #2675 from totto82/changeRstTest ... change MSW restart test to read the schedule	2020-06-16 19:48:13 +02:00
Tor Harald Sandve	da3801ea14	change MSW restart test to read the schedule	2020-06-16 15:06:45 +02:00
Bård Skaflestad	0310fa4edf	Merge pull request #2673 from blattms/fix-tranyxyz-sub-3D ... [bugfix] Fix TRANXYZ for problems with less than 3 dimensions. Also subsumes and closes #2150.	2020-06-15 17:15:48 +02:00
Atgeirr Flø Rasmussen	16a599684d	Merge pull request #2672 from akva2/fix_harmless_ubsan ... changed: delay deck dereference	2020-06-15 10:42:44 +02:00
Markus Blatt	2e9cfffea6	Fix TRANXYZ for problems with less than 3 dimensions. ... Up to now We always assumed that cardDims[i]>1 holds. which it does for most of the cases. But when e.g. simulating a vertical stack of 5 cells flow would report the transmissibilities in the Z direction in TRANX and output TRANZ as zero. Similar problems should be there for 2D grids. With this commit we actually check whether there can be neighbours in the X and Z direction to prevent this behavior.	2020-06-15 10:40:26 +02:00
Arne Morten Kvarving	44bec2d7db	changed: delay deck dereference ... this was harmless unless enableExperiments was given, since the deck ref is not used otherwise, but it caused an UBSAN issue when run in parallel.	2020-06-15 09:50:06 +02:00
Bård Skaflestad	0dfcb8f411	Merge pull request #2671 from bska/shorten-update-title ... update_data: Move List of Changed Tests to Commit Message Body	2020-06-15 09:31:02 +02:00
Bård Skaflestad	cab9be486c	update_data: Move List of Changed Tests to Commit Message Body ... This way we are less at risk of overrunning GitHub's 256 character limit for issue/PR title lengths when a PR happens to affect many regression tests.	2020-06-13 12:14:36 +02:00
Joakim Hove	f03dd20b96	Merge pull request #2636 from joakim-hove/serialize-gpmaint ... Instantiate packer for std::optional<GPMaint>	2020-06-12 12:19:28 +02:00
Joakim Hove	bba5ca48ba	Merge pull request #2668 from joakim-hove/aicd ... Aicd	2020-06-12 09:12:33 +02:00
Arne Morten Kvarving	e9c56f869e	Merge pull request #2670 from bska/remove-duplicate-decl ... Remove Redundant 'packSize' Declaration	2020-06-12 08:27:20 +02:00
Joakim Hove	754f74df01	Adapt variant serialization to four types	2020-06-12 07:21:46 +02:00
Bård Skaflestad	201ef4adef	Remove Redundant 'packSize' Declaration ... The 'std::string' case is covered by a call to ADD_PACK_PROTOTYPES.	2020-06-12 00:14:41 +02:00
Joakim Hove	baba9b6773	Merge pull request #2642 from joakim-hove/icd-variant ... Use std::variant access to Segment::icd	2020-06-11 11:32:08 +02:00
Joakim Hove	be5f3ff2e1	Use std::variant access to Segment::icd	2020-06-10 20:41:14 +02:00
Joakim Hove	a1306a62fc	Add serialization of std::variant<T1,T2,T3>	2020-06-10 20:41:14 +02:00
Kai Bao	23a9f4732b	Merge pull request #2666 from atgeirr/msw-log-output-cleanup ... Prettifying and reducing log output from MSW.	2020-06-10 19:44:01 +02:00
Atgeirr Flø Rasmussen	dd8e42958a	Prettifying and reducing log output from MSW.	2020-06-10 16:36:17 +02:00
Markus Blatt	b1adbd45cb	Merge pull request #2663 from akva2/fix_timestamp_gen ... fixed: fix parallel builds	2020-06-09 17:31:25 +02:00
Arne Morten Kvarving	6ab90bb0e3	fixed: fix parallel builds ... we need the update-version target to run to generate the necessary headers.	2020-06-09 15:08:30 +02:00
Joakim Hove	c977a28cfa	Merge pull request #2660 from joakim-hove/restart-testing-enable-adaptive-timestepping ... Changes in running of restart regression tests	2020-06-08 13:52:06 +02:00
Joakim Hove	df11bb5b55	Changes in running of restart regression tests ... - The parallel test gets a designated driver - The serial test is run with default adpative timestepping	2020-06-08 12:53:29 +02:00
Atgeirr Flø Rasmussen	1afbe4b0a8	Merge pull request #2659 from akva2/move_timestamp ... changed: move moduleVersion to a separate object library	2020-06-08 12:51:56 +02:00
Arne Morten Kvarving	5d423e2300	changed: move moduleVersion to a separate object library ... this to minimize re-linking due to compile timestamp support	2020-06-08 10:07:22 +02:00
Joakim Hove	04f6c24022	Merge pull request #2648 from joakim-hove/use-connections-segment-perf-length ... Use WellConnections.segment_perf_length()	2020-06-05 11:05:57 +02:00
Joakim Hove	5b940836ec	Remove MultisegmentWell::calculateSICDFlowScalingFactors()	2020-06-04 14:13:14 +02:00
Markus Blatt	c57a901e51	Merge pull request #2650 from blattms/prevent-deadlock-after-parsing ... Prevent deadlock after parsing if there were error in parallel	2020-06-04 12:24:44 +02:00
Markus Blatt	9870206c53	flow --help|--print-properties=1|--print-parameters=1} returns 0 ... Previously (in this PR) they returned an error code.	2020-06-03 16:49:29 +02:00
Markus Blatt	2457133ebf	Use MPI_Abort to make flow return nonzero error codes in parallel. ... The previously used MPI_Finalize might have resulted in returning zero even if there were problems.	2020-06-03 16:48:50 +02:00
Markus Blatt	f8201e5a94	Catch parser errors in parallel and abort. ... Previously only the master process was aware of the error and flow did deadlock in parallel runs if there were parser errors encountered. With this commit all processes are made aware of the problem and flow aborts with an error code.	2020-06-03 11:14:57 +02:00
Atgeirr Flø Rasmussen	e8f49d61a3	Merge pull request #2646 from atgeirr/fix-closing-wells-after-chopping ... Fix bug in well closing, and allow more chopping by default.	2020-06-02 19:17:31 +02:00
Atgeirr Flø Rasmussen	a75d21e403	Fix bug in well closing, and allow more chopping by default.	2020-06-02 12:44:46 +02:00
Atgeirr Flø Rasmussen	6f1a159adc	Merge pull request #2611 from totto82/improveConvergenceMSW ... Improve convergence msw	2020-05-30 17:00:30 +02:00
Tor Harald Sandve	222b246f77	Merge pull request #2644 from atgeirr/msw-improvements ... Treat zero rate case for VFP tables.	2020-05-29 16:01:23 +02:00
Tor Harald Sandve	b11d805e45	fix output message	2020-05-29 15:40:44 +02:00
Atgeirr Flø Rasmussen	b5bee4d114	Treat zero rate case for VFP tables.	2020-05-29 14:06:51 +02:00
Atgeirr Flø Rasmussen	dba1b46e8c	Merge pull request #2643 from atgeirr/fix-casename ... Always create proper case name.	2020-05-29 13:48:18 +02:00
Atgeirr Flø Rasmussen	300bd7d81a	Merge pull request #2641 from atgeirr/bump-version ... Bump version number	2020-05-29 13:35:20 +02:00
Atgeirr Flø Rasmussen	cdbbdd828e	Always create proper case name. ... Without this, rank 0 gets an empty case name, resulting in buggy VTK output with filenames containing the genereric stem "sim" rather than the case name as stem.	2020-05-29 10:28:42 +02:00
Atgeirr Flø Rasmussen	2261c1ee74	Merge pull request #2637 from hnil/hide_vtk ... Hide vtk	2020-05-29 08:21:31 +02:00
Joakim Hove	4ab3b92298	Merge pull request #2631 from hakonhagland/refac_run_simulator ... Refactor runSimulator().	2020-05-29 07:25:49 +02:00
Joakim Hove	f43c997a10	Merge pull request #2640 from joakim-hove/rename-icd ... Rename SpiralICD -> ICD	2020-05-29 07:24:49 +02:00
Atgeirr Flø Rasmussen	432dd31af8	Bump version number	2020-05-28 16:50:44 +02:00
Atgeirr Flø Rasmussen	20c63f9f49	Merge pull request #2624 from OPM/fix/adapt-to-propertysystem-changes ... adapt to changes in the property system	2020-05-28 12:05:17 +02:00
Markus Blatt	0ad9bc5465	Merge pull request #2633 from blattms/require-umfpack ... Mark SuiteSparse as required.	2020-05-28 11:49:03 +02:00
Joakim Hove	195d2b1c21	Rename SpiralICD -> SICD	2020-05-28 11:10:51 +02:00
Atgeirr Flø Rasmussen	83cafe9517	Merge pull request #2632 from atgeirr/add-printvfp-util ... Add a small utility to print a slice of a VFP table.	2020-05-27 09:34:22 +02:00
hnil	16edd5ecc5	fixed commented code	2020-05-26 22:04:42 +02:00