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
3,686 Commits 24 Branches 102 Tags 90 MiB
d170bbb109
Commit Graph

3686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
d170bbb109 Print all well switching in parallel. 
As for each well only one process is responsible, the output process
does not see all wells. Ergo some well switching information was never
printed in a parallel run.

Therefore with this commit the well switching
message is printed regardless on which process it appears.
 2016-06-07 16:56:37 +00:00
Atgeirr Flø Rasmussen
5d38c77881 Merge pull request #707 from blattms/support-ignoreconvergencefailure-for-cpr 
Make CPR preconditioner honor linear_solver_ignoreconvergencefailure
 2016-06-07 14:13:52 +02:00
Markus Blatt
82556ca1d0 Fix uninitialized value 2016-06-07 12:40:24 +02:00
Markus Blatt
1656836f00 Change variable name along recommendation. 2016-06-07 12:38:56 +02:00
Markus Blatt
af881e84b2 Fix whitespace. 2016-06-07 12:37:21 +02:00
Atgeirr Flø Rasmussen
f9ecbaeefe Merge pull request #706 from andlaus/lad_to_dad 
rename some variables from "Lad" to "Eval" (was: to "Dad")
 2016-06-07 11:46:44 +02:00
Atgeirr Flø Rasmussen
bceaf56c7e Merge pull request #703 from atgeirr/log-output 
Log well control switching message.
 2016-06-07 11:39:01 +02:00
Atgeirr Flø Rasmussen
50e8c5dbd8 Merge pull request #708 from totto82/fix_hydrocarbonstate 
Adds has_disgas and has_vapoil flags to hydrocarbonstate initialization
 2016-06-07 11:38:27 +02:00
Andreas Lauser
a8df55e02f rename some variables from "*Lad" to "*Eval" 
this was an involuntary omission in the "local AD" to "dense AD"
rename...
 2016-06-07 11:12:33 +02:00
Tor Harald Sandve
d035881a0a Adds has_disgas and has_vapoil flags to hydrocarbonstate initialization 
Gas saturation must be used as primalvariable if DISGAS and VAPOIL is
not used.
 2016-06-07 08:23:47 +02:00
Atgeirr Flø Rasmussen
edae7da526 Merge pull request #705 from qilicun/use-debug-backend 
Write debug information into a separate file.
 2016-06-06 16:11:48 +02:00
Liu Ming
db1e0fa397 write all the messages into debug file. 2016-06-06 15:39:10 +02:00
Andreas Lauser
87c7b2c720 Merge pull request #704 from andlaus/localad_to_densead 
rename "local AD" to "dense AD"
 2016-06-06 14:03:09 +02:00
Liu Ming
865577742f write debug information into a separate file. 2016-06-06 12:20:41 +02:00
Markus Blatt
a1096f222c Make CPR preconditioner honor linear_solver_ignoreconvergencefailure 2016-06-06 08:43:56 +00:00
Andreas Lauser
d45ba7732e rename "local AD" to "dense AD" 2016-06-02 20:20:04 +02:00
Atgeirr Flø Rasmussen
cf5dbf292a Log well control switching message. 
Instead of writing to std::cout.
 2016-05-30 10:26:20 +02:00
Atgeirr Flø Rasmussen
8a76adb658 Merge pull request #700 from dr-robertk/PR/flag-to-ignore-solverconv 
Ignore linear solver convergence failure.
 2016-05-27 13:21:01 +02:00
Robert Kloefkorn
93386b44ed Merge remote-tracking branch 'upstream/master' into PR/flag-to-ignore-solverconv 2016-05-27 12:56:20 +02:00
Robert Kloefkorn
7dd76cc967 NewtonIterationBlackoilInterleaved: added flag to allow to ignore solver convergence 
failure.
 2016-05-27 12:55:46 +02:00
Atgeirr Flø Rasmussen
0659ae9356 Merge pull request #699 from blattms/add-missing-fstream-include 
Fix incomplete type error for std::ofstream in examples
 2016-05-27 11:15:47 +02:00
Markus Blatt
9bd2f7c1dc Fix incomplete type error for std::ofstream in examples 
On my system I got
```c++
error: variable ‘std::ofstream file’ has initializer but incomplete type
         std::ofstream file(fname.str().c_str());
```
This is fixed with this commit by including fstream. Previously, this include might have happened implicitely.
 2016-05-27 09:10:00 +00:00
Atgeirr Flø Rasmussen
decdd3185f Merge pull request #698 from blattms/prevent-dereferencing-null-point-during-paralle-IO 
Prevent dereferencing a null pointer during parallel output.
 2016-05-26 07:53:28 +02:00
Atgeirr Flø Rasmussen
ab0df10354 Merge pull request #696 from blattms/distribute-hydrocarbonstate 
Correctly distribute the hydro carbon state for parallel runs.
 2016-05-26 07:49:10 +02:00
Markus Blatt
ecf4ab91c8 Fixes size in assrtion of BlackoilStateDatahandle::scatter 2016-05-25 14:36:33 +00:00
Markus Blatt
e9b8721d2a Prevent dereferencing a null pointer during parallel output. 
ParallelDebugOutput will always dereference its member variable
globalReservoirState_ even if it will not be used for any output.
In g++ this throws when using -D_GLIBCXX_DEBUG -DDEBUG -DGLIBCXX_FORCE_NEW.
I any case we will have a dangling reference into Nirvana in
PackUnPackSimulationDataContainer. This commit fixes this by always
initializing the pointer globalReservoirState_. In the case where the rank
does not perform any output its size will be zero.
 2016-05-25 13:49:33 +00:00
Markus Blatt
8dd3794562 Fixes copy&paste bugs from resize code movement 2016-05-25 13:07:29 +00:00
Markus Blatt
c247652188 Moved resizing of BlackoilState members to the data handle. 
Seems much less messy.
 2016-05-25 12:47:24 +00:00
Markus Blatt
509cd6f0b1 Use correct size when resizing hydroCarbonState. 
The size is the number of cells and not dependent on the number of phases.
This was a typical copy&paste mistake that wasted space.
Kudos to atgeirr for catching this.
 2016-05-25 12:43:12 +00:00
Atgeirr Flø Rasmussen
69469bf537 Merge pull request #694 from atgeirr/fix-nnc-vs-noncartesian 
Separate non-neighbour and non-cartesian connections.
 2016-05-25 13:38:15 +02:00
Markus Blatt
22e71dff08 Correctly distribute the hydro carbon state for parallel runs. 
This is needed since hydro carbon state is used to get the
primal variables since PR #687, commit 9c771ab6. Therefore we
now distribute the state along with rest of the black oil state
variable at the start of a parallel simulation.

This closes issue #695
 2016-05-24 20:02:24 +00:00
Atgeirr Flø Rasmussen
0f290e3f6e Separate non-neighbour and non-cartesian connections. 
The non-cartesian connections are required by the output facilities,
while the truly non-neighbour connections (meaning those not in the grid)
should be used by all other code.
 2016-05-24 11:54:17 +02:00
Atgeirr Flø Rasmussen
ad604bca89 Merge pull request #685 from GitPaean/well_refactoring_interface_refactoring 
Well interface refactoring
 2016-05-24 10:58:57 +02:00
Kai Bao
0ebd25f66a fixing the compilation error due to rebasing. 2016-05-23 15:42:05 +02:00
Kai Bao
d2d9bd8a80 moving depth difference calcualtion to init() for MultisegmentWells 
instead of recalculating them for each iterations.
 2016-05-23 15:11:52 +02:00
Kai Bao
c2bdaa1b92 fixing the calculation of volumeRatio. 
due to the wrong use of parenthesis.
 2016-05-23 15:11:52 +02:00
Kai Bao
879f127ae8 moving variableStateExtractWellsVars() from models to Well Models. 2016-05-23 15:11:52 +02:00
Kai Bao
fbe7143f54 using WellModel functions in BlackoilPolymerModel. 
reducing some repeated code.
 2016-05-23 15:11:52 +02:00
Kai Bao
846ff890de refactoring the interface of computeWellPotentials() 
to reduce the cost of makeConstantState when not calculating the
potentials.
 2016-05-23 15:11:52 +02:00
Kai Bao
19a256dce0 some pure cleaning up. 2016-05-23 15:11:52 +02:00
Kai Bao
f2b7f2a56c moving numWellVars from models to Wells. 2016-05-23 15:11:52 +02:00
Kai Bao
b3d1c0eabc initializing the pointers to be nullptr in the Wells classes 2016-05-23 15:11:52 +02:00
Kai Bao
4527034f29 removing variableStateInitials() from BlackoilMultiSegmentModel 
which is not helpful anymore.
 2016-05-23 15:11:52 +02:00
Kai Bao
a102e934ac removing baseSolveWellEq from BlackoilMultiSegmentModel 
to solve the different interfaces of computeWellConnectionPressures for
StandardWells and MultisegmentWells, a function
computeWellConnectionPressures was introduced for the models.
 2016-05-23 15:11:52 +02:00
Kai Bao
01328559e2 removing the updateWellState from the models. 2016-05-23 15:11:52 +02:00
Kai Bao
4e8099057e small cleaning up for BlackoilMultiSegmentModel_impl 2016-05-23 15:11:51 +02:00
Kai Bao
fcd541a1c1 removing the rebundant ms_wells_ in BlackoilMultiSegmentModel 2016-05-23 15:11:51 +02:00
Kai Bao
184bff95ba using well_model_ to represent the WellModel member 2016-05-23 15:11:51 +02:00
Kai Bao
06775ee02c Make BlackoilMultisegmentModel constructured from MultisegmentWells 
Instead of being coustructed based StandardWells and having a
MultisegmentWells member.
 2016-05-23 15:11:51 +02:00
Kai Bao
4254b48b57 unifying interface of a few functions of Wells classes 
updateWellControls()
updateWellState()
addWellControlEq()

The change of function computeWellConnectionPressures() is not done
completely. Should find a solution later.
 2016-05-23 15:11:51 +02:00