OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,204 Commits 24 Branches 102 Tags 90 MiB
0cf6699591
Commit Graph

5204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
1e0428d821 Merge pull request #1208 from atgeirr/refactor-sequential-solver 
Refactor sequential solver
 2017-06-09 15:10:11 +02:00
Atgeirr Flø Rasmussen
2941f85706 Merge pull request #1182 from akva2/polymer_regtest 
add regression test for flow_polymer
 2017-06-09 14:57:38 +02:00
Arne Morten Kvarving
09cbcee62c add regression test for flow_polymer 2017-06-09 13:11:05 +02:00
Atgeirr Flø Rasmussen
462d90aeb1 Merge pull request #1207 from GitPaean/improve_WellModelMatrixAdapter 
making wellMod_ in WellModelMatrixAdapter is actually a well model
 2017-06-09 10:46:13 +02:00
Robert Kloefkorn
ee7520d896 [cleanup] initialized Eval variables with 0. 2017-06-08 15:35:40 +02:00
Atgeirr Flø Rasmussen
fa4d4fb0fb Make argument of setParameters() a const reference. 2017-06-08 11:03:27 +02:00
Atgeirr Flø Rasmussen
2f30897c70 Make proper convergence check for iterated sequentical implicit. 2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen
fd36a122c6 Modifications to catch up with master branch. 2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen
1a3c1d3058 Further templatized sequential model and simulator classes. 
Now the actual pressure and transport model classes are not specified,
but taken as template template parameters, also grid and well model
are templates for both the sequential model and the simulator class,
although at this point only StandardWells is expected to work with
the sequential model.
 2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen
6e66d885fb Pass 0 min_iter for pressure and transport solve. 2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen
5290b000ef Add setParameters(), return int from minIter(), maxIter(). 2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen
56597a9238 Merge pull request #1205 from atgeirr/tcpu-work 
Implement TCPU
 2017-06-08 09:08:51 +02:00
Atgeirr Flø Rasmussen
60985fdbeb Merge pull request #1168 from nairr/term_output_mod 
Logging of multiple problems/warnings
 2017-06-07 15:47:34 +02:00
Rohith Nair
c1e76d6b51 edit 2017-06-07 14:49:00 +02:00
Rohith Nair
deaf90f211 edit 2017-06-07 14:47:45 +02:00
Rohith Nair
58285bb8f8 edit 2017-06-07 14:46:04 +02:00
Rohith Nair
348cb5e5a4 Changes made as requested 2017-06-07 14:40:18 +02:00
Kai Bao
908b2bdf81 making wellMod_ in WellModelMatrixAdapter is actually a well model 
instead of the BlackoilModelEbos, which reduces some confusion and also
removes a few unnecessary wrapping functions.
 2017-06-07 14:26:00 +02:00
Tor Harald Sandve
2a66aa23a9 Merge pull request #1198 from dr-robertk/PR/fix-densewell-for-2p 
[bugfix] Fix invalid read in WellDenseStandard when used with 2P Model.
 2017-06-07 13:57:44 +02:00
Rohith Nair
c12665e04f -Added exception TooManyIterations 
-Combined log messages from NonLinearSolver_impl.hpp and AdaptiveTimeStepping_impl.hpp
 2017-06-07 10:37:25 +02:00
Atgeirr Flø Rasmussen
42aa343d9f Write total solver time to TCPU. 2017-06-06 21:35:05 +02:00
Atgeirr Flø Rasmussen
2d0701c1e8 Include possibility for arbitrary summary data. 
This adapts to the upstream API change in opm-data, and adds a
proof-of-concept dummy TCPU field.
 2017-06-06 11:42:51 +02:00
Atgeirr Flø Rasmussen
e5732ea0a7 Merge pull request #1204 from atgeirr/all-messages-to-terminal-option 
Logging flexibility improvements.
 2017-06-06 07:13:52 +02:00
Atgeirr Flø Rasmussen
b62d84f7b8 Logging flexibility improvements. 
Added "all_messages_to_terminal" parameter (defaulting to false),
it true, all messages (including note and debug) will be sent to
the terminal.

In addition, parser messages are tagged, to make the terminal output
less likely to be overwhelmed.
 2017-06-02 15:26:23 +02:00
Atgeirr Flø Rasmussen
efc553b175 Merge pull request #1203 from atgeirr/debug-time-report 
Add DebugTimeReport utility.
 2017-06-02 14:14:28 +02:00
Atgeirr Flø Rasmussen
ee63732b62 Merge pull request #1202 from dr-robertk/PR/fix-no-output-run 
[bugfix] Only create asyncOutput when output is enabled globally.
 2017-06-02 14:13:36 +02:00
Atgeirr Flø Rasmussen
5f66a8ff4f Add DebugTimeReport utility. 2017-06-02 13:48:24 +02:00
Robert Kloefkorn
46f66e34b9 [bugfix] Only create asyncOutput when output is enabled globally. 2017-06-02 13:09:48 +02:00
Atgeirr Flø Rasmussen
9a32e2baca Merge pull request #1201 from atgeirr/fix-warning 
Fix minor warning (returning a const double).
 2017-06-02 12:47:55 +02:00
Atgeirr Flø Rasmussen
c8e1f31f1d Fix minor warning (returning a const double). 2017-06-02 11:17:37 +02:00
Atgeirr Flø Rasmussen
37cbdbced2 Merge pull request #1199 from atgeirr/multiphase-upwind-refactor 
Multiphase upwind refactor
 2017-06-02 11:13:14 +02:00
Atgeirr Flø Rasmussen
4c70c831d4 Merge pull request #1176 from totto82/impl_solvent 
Implement solvent model in flow_ebos
 2017-06-02 10:08:49 +02:00
Atgeirr Flø Rasmussen
f5795322fa Add missing include directive for std::sort(). 2017-06-02 08:52:16 +02:00
Atgeirr Flø Rasmussen
7e8ed40714 Use free function for multi-phase upwinding. 2017-06-01 14:15:31 +02:00
Atgeirr Flø Rasmussen
33025d752e Clarified notation in test. 2017-06-01 14:07:57 +02:00
Atgeirr Flø Rasmussen
f707abae36 Add unit test for connectionMultiPhaseUpwind(). 2017-06-01 13:55:11 +02:00
Atgeirr Flø Rasmussen
80c38d5a1a Add connectionMultiPhaseUpwind() free function. 2017-06-01 11:01:25 +02:00
Robert Kloefkorn
3db16ede73 [bugfix] Fix invalid read in WellDenseStandard when used with 2P Model. 2017-05-31 16:17:59 +02:00
Tor Harald Sandve
f671af6cd6 Clean-up of the solvent implementation 2017-05-30 14:33:17 +02:00
Tor Harald Sandve
8b75e2eedc Minor fixes solvent model 
1) Fix GRAT controlled wells
2) Fix seg_fault in computeWellPotentials for solvent simulations
3) Fix mem_issus for RESV combinded with solvent
 2017-05-30 14:22:19 +02:00
Tor Harald Sandve
683ba7e929 Fix fallout from rebase 2017-05-30 14:22:19 +02:00
Tor Harald Sandve
441a8895ac Improvments for solvent model 
- add dss to appleyard chopping
- support for bhp injectors with solvent
- copy perfSolventRates between the time steps.
- fix bug in well access indicies when numComponents ~= numPhases
 2017-05-30 14:22:19 +02:00
Tor Harald Sandve
50c1a1404a Remove BlackoilSolventState 
The solvent saturation is added to BlackoilState and the
BlackoilSolventState is thus redundant.
 2017-05-30 14:22:19 +02:00
Tor Harald Sandve
b987e4b324 Implement solvent model in flow_ebos 
1) Extends the well model to account for solvent surface volumes
2) Add solvent to updateState
3) Add solvent to well and field output

The solvent parts is encapsled in if (has_solvent_) and should not effect
the standard runs.
 2017-05-30 14:22:19 +02:00
Markus Blatt
138eb2c91b Merge pull request #1193 from dr-robertk/PR/fix-mpi-deadlock-in-output 
Bugfix: fix MPI deadlock in output when asyncOutput is enabled.
 2017-05-30 11:33:54 +02:00
Atgeirr Flø Rasmussen
1e5652ac3b Merge pull request #1191 from totto82/fix_output_new_timestep 
FIX output the correct next timestep after convergece failure
 2017-05-30 10:39:21 +02:00
Robert Kloefkorn
e46810d2dc [bugfix] 1) create asyncOutput object on all ranks to avoid deadlock in 
MPI_Bcast call in writeTimeStepWithCellProperties.
2) ThreadHandle waits on destruction until all objects have been dealt with.
 2017-05-29 18:08:18 +02:00
Tor Harald Sandve
434f96db0a FIX output the correct next timestep after convergece failure 2017-05-29 09:48:34 +02:00
Joakim Hove
a61d8ab14a Merge pull request #1187 from joakim-hove/cmake-no-dev 
Added -Wno-dev to Eigen cmake args.
 2017-05-23 15:14:10 +02:00
Tor Harald Sandve
095c580933 Merge pull request #1174 from totto82/FIX_flowsolvent 
BUGFIX Don't try to compute effective properties for FIP if no solvent
 2017-05-22 15:02:09 +02:00