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,889 Commits 24 Branches 102 Tags 90 MiB
28583e4237
Commit Graph

2386 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
ccde26143c Merge pull request #709 from qilicun/add-new-type 
Support new message type: Prtinfo
 2016-06-08 11:35:31 +02:00
Tor Harald Sandve
d1d3b86299 Allow for 2 phase initialization using EQUIL 2016-06-08 09:22:52 +02:00
Liu Ming
7ca182f962 change Prtinfo to Note. 2016-06-08 09:18:10 +02:00
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
Markus Blatt
82d6d949db Fix the parallel L-infinity norm calculation. 
It was computing a global maximum before, which obviously is not the same thing.
 2016-06-07 15:10:25 +02: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
Liu Ming
b2c126f7c2 Support new message type: Prtinfo 2016-06-07 14:11:24 +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
Jørgen Kvalsvik
71560b5fb2 BlackoilOutputWriter rewritten to use opm-output 
Changes to BlackoilOutputWriter as mandated by the split and rewrite of
opm-output. Notable changes:

* BlackoilOutputWriter is no longer a child class of OutputWriter.
* Minor interface changes; writeTimeStep requires a Wells pointer
* restore requires a Wells* pointer
* VTK/Matlab support rewrites; no longer inherits OutputWriter
* WellStateFullyImplicitBlackoil::report added, to write its data to a
  opm-output understood format

Relies on utility/Compat.hpp for quick conversion to the opm-output
defined formats.
 2016-06-07 10:15:07 +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
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
Robert Kloefkorn
7dd76cc967 NewtonIterationBlackoilInterleaved: added flag to allow to ignore solver convergence 
failure.
 2016-05-27 12:55:46 +02: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
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
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
Kai Bao
be165a26e0 adding a few more members to the Wells classes. 
gravity, vfp_properties_ and depth_.

to further simplify the interfaces.
 2016-05-23 15:11:51 +02:00
Kai Bao
50385013fe adding variableWellStateInitials to MultisegmentWells 2016-05-23 15:11:51 +02:00
Kai Bao
7886e4b9d2 adding computeWellConnectionPressures to MultisegmentWells 2016-05-23 15:11:51 +02:00
Kai Bao
b4f4878901 fixing the errors from rebasing. 2016-05-23 15:11:51 +02:00
Kai Bao
60fb868727 adding updatePerfPhaseRatesAndPressures to MultisegmentWells 2016-05-23 15:11:51 +02:00
Kai Bao
508de4dc37 adding extractWellPerfProperties to MultisegmentWells 
removing extractWellPerfProperties in all the model classes.
 2016-05-23 15:11:51 +02:00
Kai Bao
718ba5470b adding const Wells* wells_ for MultisegmentWells 
for interface refactoring.
At the moment, both wells_ and wells_multisegment_ contain all the
wells.
 2016-05-23 15:11:51 +02:00
Kai Bao
4180fea951 refactoring the construcor of MultisegmentWells 
MultisegmentWells is initialized with Wells structure.
 2016-05-23 15:11:51 +02:00
Kai Bao
7d0d50eb53 changing reservoir related members to pointers for MultisegmentWells 2016-05-23 15:11:51 +02:00
Kai Bao
66cd66e61b change reservoir related members to be pointers in StandardWells 
to fullfil the requirement of interface design.
 2016-05-23 15:11:51 +02:00
Kai Bao
89a8f133fd adding variableWellStateIndices to MultisegmentWells 
to remove the using of stdWells() in BlackoilMultiSegmentModel
The code is copied from StandardWells, better solution need to be
exploited.
 2016-05-23 15:11:50 +02:00
Kai Bao
a8742a9348 introduce perforation densities and pressdiffs to MultisegmentWells 
to reduce dependence on StandardWells.
 2016-05-23 15:11:50 +02:00
Kai Bao
25fbd20acf adding a few member variables for MultisegmentWells 
and reduce the number of parameters of the related functions by using
the new introduced member variables.
 2016-05-23 15:11:50 +02:00
Kai Bao
bd03eff5a5 making two functions in StandardWells protected. 
computePropertiesForWellConnectionPressures
computeWellConnectionDensitesPressures
 2016-05-23 15:11:50 +02:00
Kai Bao
1f2442fe80 reducing paramter list for more functions in StandardWells 
computeWellFlux
updateWellState
updateWellControls
addWellControlEq
computeWellPotentials
 2016-05-23 15:11:50 +02:00
Kai Bao
a35c3e7468 removing parameters for extractWellPerfProperties 2016-05-23 15:11:50 +02:00
Kai Bao
75c64b67d1 fixing the compilation from the rebase. 2016-05-23 15:11:50 +02:00
Kai Bao
0667fceb35 reducing the number of arguments of computeWellConnectionPressures 
and computeWellConnectionDensitesPressures.

These functions need to be renamed.
 2016-05-23 15:11:50 +02:00
Kai Bao
18a530f9be removing paramters in computePropertiesForWellConnectionPressures 2016-05-23 15:11:50 +02:00
Kai Bao
22b5157bf2 adding a few fluid related members to StandardWells 
to reduce the number of the public function arguments.
 2016-05-23 15:11:50 +02:00
Atgeirr Flø Rasmussen
d1da78b5b2 Merge pull request #692 from GitPaean/fixing_volumeratio_calculation 
fixing application of rs and rv to the volumeRatio calculation.
 2016-05-23 10:02:37 +02:00
Atgeirr Flø Rasmussen
7dbd197650 Merge pull request #684 from totto82/liveoilsolvent2 
Changes needed to run Model 2 with co2
 2016-05-20 15:08:48 +02:00
Kai Bao
6f2a0c47a2 fixing application of rs and rv to the volumeRatio calculation. 
the use of parenthesis is wrong according to Cramer's rule
 2016-05-20 14:52:24 +02:00
Atgeirr Flø Rasmussen
bd774ed06c Merge pull request #679 from qilicun/log_simulation_messages 
write simulation details to log file.
 2016-05-19 15:09:39 +02:00
Pål Grønås Drange
2620dda8c3 Moved NNC to GeoProps, populating NNC at update 
* FlowMain now gets NNC by `geoprops_->nnc()`
* Refactored update()
* Moved big chunk of unused code to new private method pinchProcess_
* Reordered logic to unite the NNC logic
 2016-05-19 13:33:09 +02:00
Pål Grønås Drange
973914931d Introducing NNC output 
* Compute NNC by face2cell information from a grid
* Pass NNC information to EclipseWriter
* Made NNC respect ECLIPSE input data
* nncStructure() is now exportNncStructure()
 2016-05-19 13:23:18 +02:00
Tor Harald Sandve
cc2a7d8767 Cleanup in updateState in the solvent model 2016-05-19 12:38:44 +02:00
Tor Harald Sandve
0730ffcb69 BUGFIX. Wrong uses of parenthesis in Cramer's rule 2016-05-19 11:28:36 +02:00
Tor Harald Sandve
bd0ad6aa5b Adapt to changes related to hydroCarbonState 2016-05-19 11:25:27 +02:00
Liu Ming
626bde704a fix indentation. 2016-05-19 17:10:13 +08:00
Tor Harald Sandve
03d6dde203 Convergence improvment in the TL model 
-- division on zero is avoided
-- if no solvent is present, pure values are used for the density and
visocity
 2016-05-19 10:49:22 +02:00
Tor Harald Sandve
8be3ca7557 Support for liveoil in combination with solvent 
- a solvent specific updateState is used to assure that the correct oil
saturation is used to detect phase transision
- presence of gas is compensated for in the oil phase
 2016-05-19 10:49:22 +02:00
Liu Ming
b134455a4d use OpmLog to control terminal output limits. 2016-05-19 10:51:52 +08:00
Pål Grønås Drange
d995582f46 trying disabling async output default setting 2016-05-18 16:11:57 +02:00
Atgeirr Flø Rasmussen
9c771ab6b1 Merge pull request #687 from totto82/hydrocarbonstate 
Use stored hydrocarbonstate to get primal variables
 2016-05-18 14:16:58 +02:00
Tor Harald Sandve
cd91444bc9 Compute the hydroCarbonState after initializing from restart files 2016-05-13 14:09:51 +02:00
Tor Harald Sandve
5757ef8ad0 Adjust to upstream changes 
Change from std::vector<int> to std::vector<HydroCarbonState> for the
hydroCarbonState
 2016-05-13 12:40:50 +02:00
Tor Harald Sandve
01c782dbf3 Remove primalvariable_ and use hydroCarbonState instead 
the hydrocarbonstate is stored in the reservoir state and
used instead of the primalvariable_
The initial hydrocarbonstate is computed using
initHydroCarbonState(...);
 2016-05-13 09:04:48 +02:00
Atgeirr Flø Rasmussen
ca40a31e7b Merge pull request #681 from dr-robertk/PR/use_have_pthread 
Use HAVE_PTHREAD to enable async output.
 2016-05-12 12:20:09 +02:00
Tor Harald Sandve
e8fcf9259c Use stored hydrocarbonstate to get primal variables 
If hydrocarbonstate is not provided by the state fall back to
the old behaviour of computing the hydrocarbonstate from the saturations
 2016-05-12 10:38:49 +02:00
Tor Harald Sandve
09ab530674 Add the option of computing the full sparity pattern based on all phases 
- For some cases (for instance involving solvent flow) the reasoning for
only adding the pressure derivatives seems to fail. As getting the
sparsity pattern is non-trivial, in terms of work, the full sparsity
pattern is only added when specified by the parameter
"require_full_sparsity_pattern"
- For solvent runs "require_full_sparsity_pattern" defaults to true for
all other runs the default is to only extract the sparsity pattern from
the pressure derivatives.
 2016-05-11 15:13:52 +02:00
Atgeirr Flø Rasmussen
5fabce7c2c Check if dir already exists before creating. 
May be necessary on some platforms for the current dir (".").
 2016-05-10 09:22:31 +02:00
Liu Ming
f5a57b8a26 Let OpmLog control output. 2016-05-10 13:51:10 +08:00
Robert Kloefkorn
42a76e3da6 SimulatorFullyImplicitBlackoilOutput: use HAVE_PTHREAD to enable async_output by 
default.
 2016-05-09 16:58:07 +02:00
Kai Bao
28e65283d9 initializing top_well_segments_ when constructing MultisegmentWells 
not wait until BlackoilMultiSegmentModel.
 2016-05-09 10:33:53 +02:00
Kai Bao
9bdf1d5b93 removing unhelpful public functions in MultisegmentWells 2016-05-09 10:33:53 +02:00
Kai Bao
f8a6ae4f8c adding num_phases_ to MultisegmentWells 
and removing all the np in the argument of the public methods.
 2016-05-09 10:33:53 +02:00
Kai Bao
40baf3b720 moving updateWellControls to MultisegmentWells 2016-05-09 10:33:53 +02:00
Kai Bao
868efa97a0 moving addWellControlEq to MultisegmentWells 2016-05-09 10:33:53 +02:00
Kai Bao
5ba53a7a39 moving addWellFluxEq to MultisegmentWells 2016-05-09 10:33:53 +02:00
Kai Bao
89117c0294 moving computeSegmentPressuresDelta to MultisegmentWells 2016-05-09 10:33:53 +02:00
Kai Bao
580ac7df6b moving computeSegmentFluidProperties to MultisegmentWells 2016-05-09 10:33:53 +02:00
Kai Bao
944ebec4c0 moving computeWellFlux to MultisegmentWells 2016-05-09 10:33:53 +02:00
Kai Bao
484c48e0fe moving onlyWellDerivs() to MultisegmentWells 
it is only used for MultisegmentWells
 2016-05-09 10:33:53 +02:00
Kai Bao
ec3b50d092 adding updateWellState to MultisegmentWells 2016-05-09 10:33:53 +02:00
Kai Bao
15ff16efd2 removing multi-segment member variables from BlackoilMultiSegmentModel 2016-05-09 10:33:53 +02:00
Kai Bao
a07843a896 adding the member variables to MultisegmentWells 
and ther public interfaces. Probably the mutable interfaces can be
removed after moving the functions to the Wells class.
 2016-05-09 10:33:53 +02:00
Kai Bao
05e164b609 adding number of segment and performation to MultisegmentWells 2016-05-09 10:33:52 +02:00
Kai Bao
f319514581 using the MultisegmentWells class in BlackoilMultiSegmentModel 2016-05-09 10:33:52 +02:00
Kai Bao
aa6065a70c introducing a new class MultisegmentWells 
which will handle the multi-segment wells related.
 2016-05-09 10:33:52 +02:00
Liu Ming
431a21d632 write simulation details to log file. 2016-05-09 13:33:44 +08:00
Kai Bao
8236a32aee sliencing a few shadowing warnings. 2016-05-06 17:59:00 +02:00
Atgeirr Flø Rasmussen
8e550bf98c Merge pull request #668 from qilicun/get-messages-from-parser 
extract messages from parser.
 2016-05-04 10:16:57 +02:00
Pål Grønås Drange
96d073a13e set default output directory to . 2016-05-03 17:38:29 +02:00
Pål Grønås Drange
c5d68f802a one line shared_ptr to ref fix 2016-05-03 15:38:04 +02:00
Joakim Hove
58851e8c02 Merge pull request #666 from kjellkongsvik/clean_EclipseWriter 
Remove parameters from EclipseWriter constructor
 2016-05-03 15:37:30 +02:00
Arne Morten Kvarving
5bc252c4ab fixed: build with g++ 5.3 
this partially fixes the build on ubuntu xenial.
it also breaks due to an updated eigen, but with this
you can build with the old eigen instead of the distro
supplied eigen.
 2016-04-29 19:02:56 +02:00
Atgeirr Flø Rasmussen
34bc69c257 Move helpers to the detail namespace, layout changes. 
The helpers were moved to the bottom of the file for clarity.
Misc. layout and whitespace changes, also fix two minor
errors in comments.
 2016-04-29 14:59:18 +02:00
Atgeirr Flø Rasmussen
8ea71e2f15 Use a small lambda to avoid repeating code. 2016-04-29 14:58:44 +02:00
Kjell W. Kongsvik
be1ffec94f Remove phaseUsage parameter as it can be found internally 2016-04-29 13:12:43 +02:00
Kjell W. Kongsvik
e4688c32ce Reverted back parameters so that output grid is not unsafely recreated 2016-04-29 13:06:36 +02:00
Kjell W. Kongsvik
c7bbd2489e Use output_dir_ member instead of querying the parameters again. 2016-04-29 13:06:36 +02:00
Kjell W. Kongsvik
385c7e74d2 Remove parameters from EclipseWriter constructor 2016-04-29 13:06:36 +02:00
Kai Bao
08e691e262 moving variableWellStateInitials to StandardWells. 2016-04-29 10:07:10 +02:00
Kai Bao
15380fd370 moving variableWellStateIndices to StandardWells 
Probably it is the time to introduce SeqQs and SeqP for the
multi-segment wells.
 2016-04-29 10:07:10 +02:00
Kai Bao
e7d00f4f99 adding variableStateWellIndices to StandardWells 
to handle different types of variables later for different types of
wells.
 2016-04-29 10:07:10 +02:00
Kai Bao
b87920e5e4 moving computeWellPotentials to StandardWells 2016-04-29 10:07:10 +02:00
Kai Bao
13acc8ee03 moving computeWellConnectionPressures to StandardWells 
the results look okay, while the running for flow_solvent needs further
investigation even the results with flow_solvent actually look okay.

With two different version of
computePropertiesForWellConnectionPressures, flow_solvent produces the
same results. This is something needs further investigation.

The current implementation requires a copy of
computeWellConnectionPressure in StandardWells and StandardWellsSolvent.
That means probably we need to introduce the asImpl() for the Wells.
 2016-04-29 10:07:10 +02:00
Kai Bao
dcca0b0b76 moving addWellControlEq to StandardWells 2016-04-29 10:07:10 +02:00
Kai Bao
eb278c3c9a moving addWellFluxEq() to StandardWells 
Conflicts:
	opm/autodiff/BlackoilModelBase_impl.hpp
 2016-04-29 10:07:10 +02:00
Liu Ming
c23fa6f359 correct spelling. 2016-04-29 14:16:48 +08:00
Liu Ming
f29f087435 extract messages from parser. 2016-04-29 14:13:21 +08:00
Joakim Hove
240e08733e Merge pull request #663 from joakim-hove/restart-refactor 
Change method name -> IOConfig::restart()
 2016-04-28 22:20:31 +02:00
Joakim Hove
ead88e9ee4 Change method name -> IOConfig::restartRequested() 2016-04-28 15:58:17 +02:00
Atgeirr Flø Rasmussen
0d85f3642c Access water/gas quantities only if active phase. 2016-04-26 08:24:54 +02:00
babrodtk
613052525b Code cleanup 2016-04-26 07:49:12 +02:00
babrodtk
a1504a2bff Runs first iterations of two-phase case plausibly 2016-04-26 07:49:12 +02:00
babrodtk
2ac514a1ea Checkpoint 2016-04-26 07:49:12 +02:00
Kai Bao
9afadffea9 fixing flow_polymer running cases without polymer. 2016-04-21 12:59:11 +02:00
Atgeirr Flø Rasmussen
cc8facc378 Merge pull request #659 from GitPaean/fixing_flow_solvent_running_without_solvent 
adding the has_solvent_ flag to StandardWellsSolvent
 2016-04-21 12:28:54 +02:00
Kai Bao
cc79dff708 adding the has_solvent_ flag to StandardWellsSolvent 
flow_solvent is able to run cases without solvent.
 2016-04-21 11:17:39 +02:00
Atgeirr Flø Rasmussen
4af2b4a915 Silence some recently introduced warnings. 2016-04-21 10:29:09 +02:00
Joakim Hove
1f64f79f6d Merge pull request #657 from pgdr/eclipsegrid-is-input 
Using getInputGrid API from Parser
 2016-04-20 15:50:33 +02:00
Atgeirr Flø Rasmussen
07fec302f4 Cherry-pick Atgeirr's Remove Deck parameter patch 
Remove Deck parameter from GridInit constructor.

Possible because we now use the EclipseGrid-taking
overload of processEclipseFormat() for CpGrid.
 2016-04-20 15:30:45 +02:00
Kai Bao
be55efa484 fixing the compilation and running resulting from PR648 2016-04-20 14:42:56 +02:00
Kai Bao
e67e31171d adding one line comment for WellModel in BlackoilModelBase 2016-04-20 14:26:13 +02:00
Kai Bao
350a38164e fixing the compilation and running of flow_multisegment 2016-04-20 14:26:13 +02:00
Kai Bao
a72f04a564 fixing the compilation and running of flow_polymer 2016-04-20 14:26:13 +02:00
Kai Bao
b82e917b0d improving the initSolvent in StandardWellsSolvent 2016-04-20 14:26:13 +02:00
Kai Bao
ebe60bc5d7 puting WellModel before Implementation in the template. 2016-04-20 14:26:13 +02:00
Kai Bao
5bce482086 fixing the compilation and running of flow_solvent 2016-04-20 14:26:13 +02:00
Kai Bao
b464e4fb4a adding WellModel as template class for BlackoilModelBase 
the compilation and running of flow are recovered.

Conflicts:
	opm/autodiff/BlackoilModelBase_impl.hpp
 2016-04-20 14:26:13 +02:00
Tor Harald Sandve
18434e54ad Query the compute_well_potential parameter only once 
-- and fix some comments
 2016-04-20 08:32:57 +02:00
Pål Grønås Drange
18f6672df0 Using getInputGrid API from Parser 2016-04-19 17:03:41 +02:00
Tor Harald Sandve
e9b097cbf4 Only compute well potential if needed 
A boolen user parameter is added to controll the computation of well
potential.

This is a temporary fix to assure that no extra computation time is used
on well potential calculation if it is not needed. The long term fix
will require a more thorough revising of the well group implementation.
 2016-04-19 16:24:28 +02:00
Tor Harald Sandve
84972ac21e Fix bhp/thp logic in well potential calculation 
Pick the most restrictive bhp (not the one that gives the largest
potential flow)
 2016-04-19 15:58:05 +02:00
Tor Harald Sandve
4867e14f88 Fixes after rebase 
-- remove some leftovers from merge process
-- start using stdWells()
 2016-04-19 09:41:25 +02:00
Tor Harald Sandve
b216302895 Adapt to usage of stdWells() 2016-04-19 09:21:16 +02:00
Tor Harald Sandve
cc48e8a17e Add support for THP in well potential calculations 2016-04-19 09:21:15 +02:00
Tor Harald Sandve
18246263e9 Move computation of well potentials from simulator class ot model class 
- the computation of well potentials in the model class calculates the
well potentials using computeWellFlux()
- in this way the well potential calculations also handle well where
some perforations are closed by the simulator due to cross-flow.
- the well potentials pr perforation and phase is stored in the well
state.
 2016-04-19 09:21:15 +02:00
Andreas Lauser
4baf0f6acf Merge pull request #654 from andlaus/nested_ad 
Fix build
 2016-04-18 11:01:39 +02:00
dr-robertk
93f48d6ad9 Merge pull request #647 from GitPaean/wells_refactoring_onlytemplate_function 
Moving more well related functions to StandardWells
 2016-04-16 12:37:42 +02:00
Andreas Lauser
0405953a64 adapt code w.r.t. the removal of the tags for Opm::Evaluation 2016-04-15 18:49:29 +02:00
Robert Kloefkorn
da0e725eb8 BackupRestore: remove all specializations for BlackoilState. This is now covered by 
SimulationDataContainer.
 2016-04-15 12:21:47 +02:00
Kai Bao
adb140a788 fixing the running of flow_multisegment 2016-04-14 16:05:19 +02:00
Kai Bao
75b73a893e putting Vector and ADB to be inside StandardWells and wellhelpers 2016-04-14 16:05:19 +02:00
Kai Bao
19734f2103 adding extractWellPerfProperties to StandardWellsSolvent 
to fix the flow_solvent running.
 2016-04-14 16:05:19 +02:00
Kai Bao
5da57973fe adding updateWellState and updateWellControls to StandardWells 2016-04-14 16:05:18 +02:00
Kai Bao
376c940f09 moving updatePerfPhaseRatesAndPressures to StandardWells 2016-04-14 16:05:18 +02:00
Kai Bao
c398a6e424 puting computeWellFlux in StandardWells 2016-04-14 16:05:18 +02:00
Kai Bao
e9e1b9fda8 adding extractWellPerfProperties to StandardWells 
It causes problem for the flow_multisegment. So the version in
BlackoilModelBase is kept for now.

On the other hand, it is few of functions that will be both required by
the standard wells and multisegment wells.

Some decision will be made later on how to put this function.
 2016-04-14 16:05:18 +02:00
Kai Bao
c8b66821d5 adding computeWellConnectionDensitesPressures to StandardWells class. 2016-04-14 16:05:18 +02:00
Kai Bao
5d99fac207 adding StandardWellsSolvent for Solvent model. 2016-04-14 16:05:18 +02:00
Kai Bao
bca23d34c1 making StandardWells non-templated 
we will focus on template functions instead.
 2016-04-14 16:05:18 +02:00
Kai Bao
266f6f2df5 adding computePropertiesForWellConnectionPressures to StandardWells 
tested with flow. Not sure how other flow siblings work.
 2016-04-14 16:05:18 +02:00
Kai Bao
3bcfc905bd makding StandardWells a template based on SolutionState and WellState 
may need to be adjusted later.
 2016-04-14 16:05:18 +02:00
Kai Bao
c120313f09 renaming visc parameters to mu_w for better readability 2016-04-14 15:09:03 +02:00
Kai Bao
104f6053f1 removing blank spaces and replacing the tab with spaces by retab 2016-04-14 14:57:26 +02:00
Kai Bao
30774d8309 correcting buggy visc pointer usage in effective viscosity calculation 2016-04-14 14:52:00 +02:00
Atgeirr Flø Rasmussen
c64593a023 Merge pull request #650 from GitPaean/mixing_parameters_fixing 
using effective polymer viscosity for polymer mobility calculation.
 2016-04-14 14:16:45 +02:00
Kai Bao
666f91505d using effective polymer viscosity for polymer mobility calculation. 2016-04-14 13:45:21 +02:00
Atgeirr Flø Rasmussen
a031c25ced Re-enable output for 2-phase sims. 
This was disabled when the facilities were moved to opm-output.
Now that the simulators are in the opm-simulators module and not
opm-core we can re-enable it.
 2016-04-14 13:08:24 +02:00
Pål Grønås Drange
170a71eef8 Using API get3DProperties. 2016-04-14 11:37:27 +02:00
Atgeirr Flø Rasmussen
be67e0f7a5 Update include file locations. 2016-04-14 11:32:08 +02:00
Pål Grønås Drange
fd9f67ae55 Using API get3DProperties() 2016-04-12 14:47:50 +02:00
Pål Grønås Drange
77fc26475b Using new EclipseState API, made ->s into .s 2016-04-12 14:47:50 +02:00
Arne Morten Kvarving
66333051e7 Import the following files from opm-core 
opm/core/utility/thresholdPressures.hpp
tests/test_thresholdpressure.cpp
opm/core/simulator/SimulatorCompressibleTwophase.hpp
opm/core/simulator/SimulatorCompressibleTwophase.cpp
opm/core/simulator/SimulatorIncompTwophase.hpp
opm/core/simulator/SimulatorIncompTwophase.cpp
examples/sim_2p_comp_reorder.cpp

the files in opm/core has been put in opm/simulators
 2016-04-11 09:59:25 +02:00
Atgeirr Flø Rasmussen
ff549195ab Rename opm-autodiff -> opm-simulators. 2016-04-08 14:58:07 +02:00
Robert Kloefkorn
e80ad5a9fe Merge remote-tracking branch 'upstream/master' into PR/async-output 2016-04-08 13:07:44 +02:00
Robert Kloefkorn
b3a313bfec ThreadHandle: added documentation and use std::unique_ptr to store object pointers. 2016-04-08 11:12:09 +02:00
Kai Bao
23ba5fa398 removing the StandardWells definition inside BlackoilModelBase 
and some other tiny cleaning up.
 2016-04-07 10:45:13 +02:00
Kai Bao
624516ed3c creating separate files for class StandardWells 2016-04-06 16:42:04 +02:00
Atgeirr Flø Rasmussen
cebc393caf Merge pull request #635 from GitPaean/wells_refactoring 
A first step towards Wells refactoring
 2016-04-06 16:08:18 +02:00
Robert Kloefkorn
ec45b5547d cleanup. 2016-04-06 15:39:57 +02:00
Robert Kloefkorn
7e6a6fb20a ThreadHandle: cleanup and docu. 2016-04-06 15:26:47 +02:00
Kai Bao
84cc1ed81d correcting the determination of wells_active_. 2016-04-06 14:36:51 +02:00
Kai Bao
2bd83aae73 making the constructors of WellOps and StandardWells explicit. 2016-04-06 14:10:17 +02:00
Atgeirr Flø Rasmussen
37c4bd16b1 Adapt code to dune-cornerpoint -> opm-grid renaming. 2016-04-06 13:29:47 +02:00
Kai Bao
9972dae32a updating for the comments. 
implement wells(), localWellsActive() and wellsActive() for the
BlackoilModelBase and its derived classed.
 2016-04-06 12:54:01 +02:00
Kai Bao
4ad5d81296 fixing wrong codes from the rebase process and cleanup. 2016-04-06 12:54:01 +02:00
Kai Bao
8a52dd743b making StandardWells a simple class. 2016-04-06 12:54:01 +02:00