Atgeirr Flø Rasmussen
|
ae6caaac61
|
Move parallel overload into HAVE_MPI block.
|
2015-06-19 14:06:27 +02:00 |
|
Atgeirr Flø Rasmussen
|
bb626b1d9c
|
Merge pull request #404 from atgeirr/fix-include-name
Fix case in include statement.
|
2015-06-19 13:36:29 +02:00 |
|
Atgeirr Flø Rasmussen
|
f3623270cc
|
Fix case in include statement.
|
2015-06-19 13:35:36 +02:00 |
|
Atgeirr Flø Rasmussen
|
a3f7d80ce6
|
Merge pull request #402 from atgeirr/interleaved-matrix
Move forming interleaved matrix to own function
|
2015-06-19 11:34:59 +02:00 |
|
Atgeirr Flø Rasmussen
|
700ce9e13d
|
Move forming interleaved matrix to own function/
|
2015-06-19 11:33:30 +02:00 |
|
Atgeirr Flø Rasmussen
|
d6d0bde1ab
|
Merge pull request #397 from atgeirr/interleaved-matrix
Add new linear solver approach: block-structured matrix.
|
2015-06-19 11:32:45 +02:00 |
|
Atgeirr Flø Rasmussen
|
5002fe1e37
|
Add use_interleaved option to flow_cp.
|
2015-06-19 10:53:33 +02:00 |
|
Atgeirr Flø Rasmussen
|
5e513642d7
|
Add paralell preconditioner, enable parallel case.
|
2015-06-19 10:53:33 +02:00 |
|
Atgeirr Flø Rasmussen
|
a3d115ff22
|
Add (disabled) parallel version.
Disabled because the constructPreconditionerAndSolve() method does
not have a way currently to construct a parallel preconditioner.
|
2015-06-19 10:53:33 +02:00 |
|
Atgeirr Flø Rasmussen
|
5476b7a6ac
|
Clean up headers, copyright.
|
2015-06-19 10:53:33 +02:00 |
|
Atgeirr Flø Rasmussen
|
ca74b18784
|
Add missing include.
|
2015-06-19 10:53:33 +02:00 |
|
Atgeirr Flø Rasmussen
|
4eb77bebb4
|
Further cleanup: includes, copyright, whitespace.
|
2015-06-19 10:53:33 +02:00 |
|
Atgeirr Flø Rasmussen
|
9e28857933
|
Remove functions that were moved to NewtonIterationUtilities.
|
2015-06-19 10:53:33 +02:00 |
|
Atgeirr Flø Rasmussen
|
c8cae85ea2
|
Move functions needed by several NewtonIteration-classes to separate file.
|
2015-06-19 10:53:33 +02:00 |
|
Atgeirr Flø Rasmussen
|
d86de7bb79
|
Only use pressure jacobian to form sparsity pattern.
Also clean up by eliminating commented-out debugging code.
|
2015-06-19 10:53:33 +02:00 |
|
Atgeirr Flø Rasmussen
|
8cbce1bfdf
|
Working interleaved solver implemented.
|
2015-06-19 10:53:32 +02:00 |
|
Atgeirr Flø Rasmussen
|
8af1ea1e42
|
Add (disabled) experimental part, not changing the A matrix.
This seems to cause a significant increase in iterations and failures,
which is why it is disabled for now.
|
2015-06-19 10:53:32 +02:00 |
|
Atgeirr Flø Rasmussen
|
63285bf6f9
|
Remove usage of CPRPreconditioner.
|
2015-06-19 10:53:32 +02:00 |
|
Atgeirr Flø Rasmussen
|
5d0f654443
|
Add class NewtonIterationBlackoilInterleaved.
Initially it is just a copy of the NewtonIterationBlackoilCPR class.
Also, add use_interleaved parameter to use the class.
|
2015-06-19 10:53:32 +02:00 |
|
Atgeirr Flø Rasmussen
|
7d3ea6b38e
|
Merge pull request #400 from atgeirr/change-model-for-downstream-users
Add more parameters to addWellContributionToMassBalanceEq.
|
2015-06-18 15:02:39 +02:00 |
|
Atgeirr Flø Rasmussen
|
dd945a5d5e
|
Add more parameters to addWellContributionToMassBalanceEq.
Also: - call using asImpl(),
- remove extraAddWellEq().
|
2015-06-18 14:25:53 +02:00 |
|
Atgeirr Flø Rasmussen
|
21accccc01
|
Merge pull request #398 from GitPaean/totto82-solveWellEq_updatedcomments
Solve well equation initially_continuing from PR OPM/opm-autodiff#396
|
2015-06-17 11:12:15 +02:00 |
|
Kai Bao
|
0366037fca
|
cleaning up to remove 'unused' warnings
|
2015-06-17 09:49:11 +02:00 |
|
Kai Bao
|
20746f65dc
|
assert the number of the well equations.
|
2015-06-16 17:03:53 +02:00 |
|
Kai Bao
|
f2089f5a1b
|
avoiding creating dx_V unnecessarily
by using dx.array() in function solveWellEq().
|
2015-06-16 17:03:53 +02:00 |
|
Kai Bao
|
919286d700
|
removing repeated code by using do_while
in function solveWellEq().
|
2015-06-16 17:03:53 +02:00 |
|
Kai Bao
|
f8e35535fc
|
using lower case for solve_wellEq_initially_
|
2015-06-16 17:03:53 +02:00 |
|
Kai Bao
|
0f123a8890
|
correcting typo in 'to large'
|
2015-06-16 17:03:53 +02:00 |
|
Kai Bao
|
6f388f5b6d
|
correcting the indentation in updateWellState()
|
2015-06-16 17:03:53 +02:00 |
|
Kai Bao
|
7e9014f155
|
changing dx to dwells in defination of updateWellState
|
2015-06-16 17:03:53 +02:00 |
|
Kai Bao
|
285d777937
|
removing the unused dqs and dbhp
in function updateState
|
2015-06-16 17:03:53 +02:00 |
|
Kai Bao
|
043d542e29
|
check wellsActive() before handling well equations in assemble()
|
2015-06-16 17:03:53 +02:00 |
|
Kai Bao
|
079c3a467f
|
adding a space after comma between function agruments
|
2015-06-16 17:03:53 +02:00 |
|
Kai Bao
|
ce7ca517cd
|
5 blank lines between functions in BlackoilModelBase_impl
|
2015-06-16 17:03:52 +02:00 |
|
Kai Bao
|
df5bd78d0c
|
change the '2' to 'To' in addWellContribution2MassBalanceEqi
|
2015-06-16 17:03:52 +02:00 |
|
Kai Bao
|
14dbc9e7be
|
removing s from the name of function variableWellStateIndices()
|
2015-06-16 17:03:52 +02:00 |
|
Tor Harald Sandve
|
8a166ebbd6
|
Add option for solving the wellEq seperatly
The well equations is solved seperatly in order to provide more accurate
initinal values to the reservoir model.
|
2015-06-16 17:03:52 +02:00 |
|
Tor Harald Sandve
|
86922e45e6
|
Seperate wells stuff from the reservoir stuff
The seperation is done in order to better accommodate solving the well
equation seperatly.
|
2015-06-16 17:03:52 +02:00 |
|
Joakim Hove
|
304cf22a5b
|
Merge pull request #395 from chflo/OPM-212
OPM-212: Added parameter override of IOConfig Restart write setting
|
2015-06-15 17:30:13 +02:00 |
|
chflo
|
08a079b4ff
|
OPM-212: Added optional cmd parameter override of IOCOnfig Restart setting
|
2015-06-15 15:36:57 +02:00 |
|
Bård Skaflestad
|
f41bab749a
|
Merge pull request #393 from atgeirr/create-params-once
Create solver and model parameters only once.
|
2015-06-10 15:01:17 +02:00 |
|
Atgeirr Flø Rasmussen
|
512d18a669
|
Create solver and model parameters only once.
|
2015-06-01 13:07:45 +02:00 |
|
Bård Skaflestad
|
f1a20b6b3b
|
Merge pull request #391 from bska/fix-install
Record New and Renamed Files
|
2015-05-29 17:06:19 +02:00 |
|
Bård Skaflestad
|
35162df431
|
Record New and Renamed Files
This fixes 'make install'.
|
2015-05-29 16:18:56 +02:00 |
|
Atgeirr Flø Rasmussen
|
af9a5992a3
|
Merge pull request #389 from andlaus/simplify_simulator
Simplify simulator
|
2015-05-29 15:46:38 +02:00 |
|
Andreas Lauser
|
659f9e76e4
|
Merge pull request #3 from atgeirr/andlaus-simplify_simulator
Suggested changes to PR
|
2015-05-29 15:44:55 +02:00 |
|
Atgeirr Flø Rasmussen
|
91b6cacf65
|
Merge pull request #390 from atgeirr/fix-warning
Fix unsigned/signed comparison warning.
|
2015-05-29 15:40:08 +02:00 |
|
Atgeirr Flø Rasmussen
|
9b30e2e0d7
|
Use unique_ptr instead of shared and raw pointers.
|
2015-05-29 14:57:49 +02:00 |
|
Atgeirr Flø Rasmussen
|
2bec485184
|
Fix a few warnings.
|
2015-05-29 14:57:30 +02:00 |
|
Andreas Lauser
|
496c32d2a6
|
do not use std::shared_ptr where it is deemed inappropriate by the maintainers
note that I don't agree with this change and will assume no
responsibility if something goes down the gutter.
|
2015-05-29 14:34:47 +02:00 |
|