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
2,125 Commits 24 Branches 102 Tags 90 MiB
ac0fdda48b
Commit Graph

2125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
ac0fdda48b A WIP version BlackoilMultiSegmentModel 
and also a Simulator Class and example for multisegment wells.
 2015-12-01 00:06:42 +01:00
Kai Bao
76be27a64c recovering BlackoilModelBase BlackoilModelBase_impl 
to be the same with the master branch.
The multisegment part should be in a new model.
 2015-12-01 00:06:42 +01:00
Kai Bao
b49d06f35c changing naming in WellStateMultiSegment 
to be more consistent with WellState.
 2015-12-01 00:06:42 +01:00
Kai Bao
d2728fbfc6 chaning the naming of the member functions of WellStateMultiSegment 
segPressures   -> segPress
perfPressures  -> perPress
to keep consist with the WellState
 2015-12-01 00:06:42 +01:00
Kai Bao
1788f5c1b3 changing ADB::M to be Eigen::SparseMatrix<double> 2015-12-01 00:06:42 +01:00
Kai Bao
07709c52c6 a wIP version. 2015-12-01 00:06:42 +01:00
Kai Bao
62bdd301d3 one version of the class WellMultiSegment. 2015-12-01 00:06:42 +01:00
Kai Bao
60dd7743c3 WIP of the WellMultiSegment and WellStateMultiSegment 2015-12-01 00:06:42 +01:00
Atgeirr Flø Rasmussen
c91e144a1d Merge pull request #548 from atgeirr/silence-warning 
Move boost include inside warning-suppressed block.
 2015-11-30 14:17:15 +01:00
Atgeirr Flø Rasmussen
88280c1207 Move boost include inside warning-suppressed block. 2015-11-30 14:15:19 +01:00
Atgeirr Flø Rasmussen
226e414380 Merge pull request #542 from andlaus/implement_MULTFLT_in_SCHEDULE_section 
implement abililty to change the geology during the simulation run
 2015-11-27 13:39:32 +01:00
Atgeirr Flø Rasmussen
315862ddd4 Merge pull request #545 from atgeirr/fix-min-iter 
Honor the min_iter parameter.
 2015-11-27 10:19:26 +01:00
Atgeirr Flø Rasmussen
979107ac4b Merge pull request #543 from totto82/new_trans 
Use cell centers based on cell corners
 2015-11-27 10:18:00 +01:00
Andreas Lauser
976d38bf37 implement abililty to change the geology during the simulation run 
i.e. it now supports stuff like MULTFLT in the schedule
section. Possibly, the MPI-parallel code paths need some fixes. (but
if the geology is not changed during the simulation, the parallel code
will do the same as before.)

the most fundamental change of this patch is that the
reference/pointer to the DerivedGeology object is made
non-constant. IMO that's okay, though, becase the geology can no
longer assumed to be constant over the whole simulation run.
 2015-11-26 13:35:33 +01:00
Tor Harald Sandve
67eadc30e5 Adapt to changes in EclipseGrids 
getCellCenter() in EclipseGrid no longer returns
tuble<double,double,double> but array<double,3>
This simplifies its usage.

Variable name is changed from cellCentroid to cellCenter to emphasize a
difference between the value in the unstructured grid and in EclispeGrid
 2015-11-25 15:15:22 +01:00
Atgeirr Flø Rasmussen
99fd5e977f Remove assert() that is now wrong due to minIter() treatment. 2015-11-25 11:08:10 +01:00
Atgeirr Flø Rasmussen
9275070bad Honor the min_iter parameter. 
This also required the minIter() accessor to be made public,
so made all of the remaining accessors public.
 2015-11-24 16:09:01 +01:00
Tor Harald Sandve
2a13275943 Use cell depth calculated directly from the corners of the cell 2015-11-24 10:20:12 +01:00
Tor Harald Sandve
aeb8807d89 Use cell centroid from EclipseGrid 
The cell center in EclipseGrid is computed based on averaging the
corners of the cells as in Eclipse and not computing the centroid of the
cell as in the unstructured grid in opm.
 2015-11-24 10:20:12 +01:00
Bård Skaflestad
c956494402 Merge pull request #540 from atgeirr/remember-asimpl 
Add asImpl() to method calls.
 2015-11-19 14:47:13 +01:00
Atgeirr Flø Rasmussen
a06892a070 Add asImpl() to method calls. 
This is needed by derived models.
 2015-11-19 14:39:49 +01:00
Bård Skaflestad
022bd6b8fe Merge pull request #536 from atgeirr/refactor-nonlinear 
Refactor nonlinear solver
 2015-11-18 11:47:43 +01:00
Atgeirr Flø Rasmussen
9bf79f6974 Merge pull request #506 from andlaus/thpress_from_initial 
adapt to the threshold pressure related API changes
 2015-11-17 09:03:08 +01:00
Bård Skaflestad
65da8b7e11 Merge pull request #531 from blattms/parallel-RateConverter 
Calculate parallel averages in RateConverter.

Closes issue #530
 2015-11-13 18:26:36 +01:00
Markus Blatt
5449047682 Splits a very long line. 2015-11-13 15:52:01 +01:00
Markus Blatt
8148c37d57 Improved documentation 2015-11-13 15:46:45 +01:00
Markus Blatt
980928bfa9 Fix boolean in specialization. 
The default implementation is the parallel version. Therefore the boolean
in the specialization (sequential run) needs to be false.
 2015-11-13 15:46:34 +01:00
Markus Blatt
f8715e31e7 Calculate parallel averages in RateConverter. 
Previously, local averages were calculated and used in the
well equations. With this commit we add versions of defineState and
calcAverages that take into account the parallel domain decomposition
and calculate correct averages.

Function  calcAverages has a boolean template parameter
indicating whether this is a parallel run. Additionally we introduce
AverageIncrementCalculator with the same boolean template parameter.
In a parallel run we check whether the cell is owned by the process and
only in this case return an increment bigger than zero. In a sequential run
(no MPI or just one process -> empty boost::any parameter) no overhead is
introduced.
 2015-11-13 15:46:34 +01:00
Andreas Lauser
4f23ef92e3 adapt to the threshold pressure related API changes 
to be able to determine the threshold pressure from the initial
condition it needs to be able to access the initial condition, i.e.,
the initial simulator state, material properties object and gravity
constant need to be passed to the thresholdPressure() function.
 2015-11-13 15:38:28 +01:00
Atgeirr Flø Rasmussen
88fbe5e9b6 Ensure non-null model in constructor. 2015-11-13 15:08:00 +01:00
Atgeirr Flø Rasmussen
2a0051655c Merge pull request #520 from totto82/surface_dens 
Support for non-constant surface densities
 2015-11-13 11:40:30 +01:00
Atgeirr Flø Rasmussen
87330984aa Adapt to renaming of class. 2015-11-12 17:55:13 +01:00
Atgeirr Flø Rasmussen
29a1a891d2 Make nonlinearIteration() the only interface to the model. 
This means that details such as calling assemble(), solveJacobianSystem(),
updateState() etc. are now left to the model class. This will make it easier
to create new model classes with different behaviour (such as sequential models).
 2015-11-12 17:47:18 +01:00
Atgeirr Flø Rasmussen
7c21a630e5 Rename NewtonSolver -> NonlinearSolver. 2015-11-12 17:42:47 +01:00
Atgeirr Flø Rasmussen
9a4bb383df Merge pull request #538 from atgeirr/silence-warning 
Silence unused argument warning.
 2015-11-12 17:38:49 +01:00
Atgeirr Flø Rasmussen
ea8eab6e66 Silence unused argument warning. 2015-11-12 17:38:07 +01:00
Atgeirr Flø Rasmussen
d3db342085 Merge pull request #529 from dr-robertk/PR/adaptive-timestepping-revision 
BlackOilModelBase: revision of adaptive time stepping.
 2015-11-12 17:23:15 +01:00
Bård Skaflestad
112b0b7e6e Merge pull request #537 from andlaus/update_cdash_drop_site 
cdash: update dropsite
 2015-11-11 19:22:09 +01:00
Andreas Lauser
0df880ce43 cdash: update dropsite 2015-11-11 16:50:25 +01:00
Robert Kloefkorn
ab12d95273 relativeChange: brackets for if statement. 2015-11-10 10:07:57 -07:00
Robert Kloefkorn
ebf61ed1bd added docu. 2015-11-10 10:05:06 -07:00
Robert Kloefkorn
31aa0544e7 computeTimeError --> relativeChange. 2015-11-10 10:00:04 -07:00
Robert Kloefkorn
77f9977ca8 BlackOilModelBase: revision of adaptive time stepping such that time error is computed 
by model.
 2015-11-10 09:53:25 -07:00
Tor Harald Sandve
a47c9add9b Change interface of surfaceDensity() 
Add phaseIdx as input and return array of n density values for the
phase. And adapt the usage accordingly.
 2015-11-10 14:54:49 +01:00
Bård Skaflestad
308a3fd57e Merge pull request #535 from atgeirr/bug-in-scalar-autodiff 
Fix bug in scalar autodiff
 2015-11-10 14:02:49 +01:00
Atgeirr Flø Rasmussen
a8227f977e Modify test to trigger on buggy behaviour in AutoDiff. 2015-11-10 13:37:36 +01:00
Atgeirr Flø Rasmussen
5977590e70 Bugfix for scalar AutoDiff class. 
Missing chain-rule usage in Scalar/AD operator.
 2015-11-10 13:37:36 +01:00
Tor Harald Sandve
a46b64adcd Support for non constant surface densities 
The surface density function returns one value pr cell to allow for non
constant surface densities.
 2015-11-10 12:49:19 +01:00
Bård Skaflestad
91af12034c Merge pull request #533 from atgeirr/install-flow-solvent 
Add flow_solvent to list of programs to be installed.
 2015-11-05 14:18:24 +01:00
Atgeirr Flø Rasmussen
7c620f11fd Add flow_solvent to list of programs to be installed. 2015-11-05 08:33:14 +01:00