OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,394 Commits 31 Branches 117 Tags
39e23c4d41877ff1341c860c0ee52381189e1c94
Commit Graph
11394 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve 39e23c4d41 store polymer rates for output 2020-06-23 12:01:34 +02:00
Atgeirr Flø Rasmussen 3766f19de3 Merge pull request #2680 from atgeirr/minor-flexible-solver-improvements 
Minor flexible solver improvements
 2020-06-21 14:37:01 +02:00
Atgeirr Flø Rasmussen c58456faae Add missing include. 2020-06-20 16:28:59 +02:00
Atgeirr Flø Rasmussen 427eac5132 Use macro for instantiations, and clean up includes. 2020-06-19 16:37:43 +02:00
Atgeirr Flø Rasmussen 171656144f Install FlexibleSolver_impl.hpp for downstream users. 2020-06-19 16:04:27 +02:00
Atgeirr Flø Rasmussen fb99dd6fee Use unique_ptr rather than shared_ptr. 2020-06-19 16:03:46 +02:00
Atgeirr Flø Rasmussen 226697ec6f Merge pull request #2679 from akva2/janitoring 
make parseSuccess dependent on MPI
 2020-06-19 15:10:38 +02:00
Atgeirr Flø Rasmussen 5105b80e50 Merge pull request #2667 from atgeirr/flexible-solver-separate-compile-unit 
Use explicit instantiation for FlexibleSolver to reduce compile times.
 2020-06-19 15:03:30 +02:00
Atgeirr Flø Rasmussen faddef0321 Do not instantiate things requiring MPI when HAVE_MPI is false. 2020-06-19 10:01:16 +02:00
Arne Morten Kvarving 41e7201c73 make parseSuccess dependent on MPI 
avoids unused warnings when building without
 2020-06-19 09:46:21 +02:00
Atgeirr Flø Rasmussen 678756b9e1 Merge pull request #2678 from joakim-hove/fix-sequential 
Add actionState argument also for non MPI branch
 2020-06-19 06:54:16 +02:00
Joakim Hove 5484264854 Add actionState argument also for non MPI branch 2020-06-19 05:21:05 +02:00
Joakim Hove d89a2e5eb7 Merge pull request #2674 from joakim-hove/use-action-state 
Add Action::State member to EclPropblem and pass it to io/ActionX
 2020-06-18 18:39:08 +02:00
Bård Skaflestad bc3632f3f0 Merge pull request #2592 from alfbr/udq-test 
Udq test
 2020-06-18 13:36:33 +02:00
Atgeirr Flø Rasmussen e4ea932a9d Merge pull request #2661 from totto82/fixUpwindMSW_clean 
Fix upwinding for friction, acceleration, valve and SIGD for MSW
 2020-06-18 11:40:31 +02:00
Atgeirr Flø Rasmussen dcd5d21415 Split constructor to reduce instantiation. 
Without the split, certain combinations with Dune::Amg::SequentialInformation
as template argument for Comm needlessly get instantiated.
 2020-06-18 08:28:20 +02:00
Atgeirr Flø Rasmussen 3784ab9d77 Amended copyrights and made the _impl.hpp a proper header file. 2020-06-17 21:07:13 +02:00
Tor Harald Sandve 1fe5a2812f relax rel_tol for msw restart case 2020-06-17 15:08:47 +02:00
Atgeirr Flø Rasmussen f24b2cd708 Split instantiation files to enable parallel build. 2020-06-17 13:03:57 +02:00
Joakim Hove b52366926a Add Action::State member to EclPropblem and pass it to io/ActionX 2020-06-17 12:25:03 +02:00
Atgeirr Flø Rasmussen 2dc2e053d1 Change order of constructor arguments. 
This allows simplification, and having just two constructors.
 2020-06-17 09:31:19 +02:00
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 a6d186551b Use explicit instantiation for FlexibleSolver to reduce compile times. 2020-06-17 07:43:30 +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