Joakim Hove
0f9a19b5af
Merge pull request #336 from joakim-hove/external-cmake
...
External cmake
2015-05-15 14:38:20 +02:00
Joakim Hove
d3741ab9af
Added support for building with duncontrol
2015-05-15 14:34:17 +02:00
Joakim Hove
605397beae
Removed cmake/ directory
2015-05-15 14:30:52 +02:00
Joakim Hove
8150bd3075
Changed logic for finding cmake modules
2015-05-15 14:30:51 +02:00
Atgeirr Flø Rasmussen
9c6a8a942b
Merge pull request #379 from blattms/remove-dead-residualNorm
...
Removes unused residualNorm method.
2015-05-12 20:27:32 +02:00
Markus Blatt
c37cf08ee0
Removes unused residualNorm method.
...
This method seems to be some leftover from refactoring.
In flow we now use computeResidualNorms() instead and
residualNorm() is not used anywhere. Therefore this commit
removes it to prevent confusion.
2015-05-12 17:30:27 +02:00
Atgeirr Flø Rasmussen
db06fa48f5
Merge pull request #374 from babrodtk/throw_causes_core_dumped
...
Changed throw in main() to return EXIT_FAILURE
2015-05-06 12:41:39 +02:00
Atgeirr Flø Rasmussen
3cc02b4a3c
Merge pull request #375 from totto82/tol_welleq
...
Check scaled well residuals for convergence
2015-05-06 12:40:50 +02:00
Tor Harald Sandve
d7c67f10de
Change default tolerance for well residuals
2015-05-06 08:55:49 +02:00
Tor Harald Sandve
43b8f9851e
Change to maximum norm for the well residuals
2015-05-06 08:55:49 +02:00
Tor Harald Sandve
b4369cade8
Check well_flow tolerance pr phase
...
The phase rate residuals are scaled by the average volume factor to
avoid too large weight on the gas phase rates.
This also makes the well convergence criteria more consistent with the
mass-balance residuals for the cells.
2015-05-06 08:55:49 +02:00
babrodtk
aab8d2a008
Added missing include
2015-05-06 08:38:49 +02:00
babrodtk
fb99528673
Changed OPM_THROW to return EXIT_FAILURE in flow_cp.cpp
2015-05-06 08:38:18 +02:00
Atgeirr Flø Rasmussen
abba4bbc21
Merge pull request #373 from babrodtk/80_column_flow_header
...
Reformated flow header to fit 80 columns
2015-05-05 17:32:21 +02:00
babrodtk
9edbf38439
Changed throw in main() to return EXIT_FAILURE
2015-05-05 15:48:58 +02:00
babrodtk
9f23ce7dbc
Reformated flow header to fit 80 columns
2015-05-05 15:25:55 +02:00
Atgeirr Flø Rasmussen
862abf6ac7
Merge pull request #371 from totto82/modify_welleq
...
Modify welleq
2015-05-05 11:54:15 +02:00
Tor Harald Sandve
f1d7e0c7ea
Only add contribution from positive phase rates to the wellbore mixture
...
Instead of adding contribution from all wells with positive total rates,
each phase in each well are checked seperatly.
2015-05-04 10:22:43 +02:00
Atgeirr Flø Rasmussen
208b227ea8
Merge pull request #370 from blattms/fixes-comparison-warning
...
Prevent unsigned vs. signed int comparison warning
2015-04-30 16:54:19 +02:00
Atgeirr Flø Rasmussen
1ea9ca4453
Merge pull request #369 from blattms/pass-parallel-info-to-amg
...
[bugfix] Pass parallel information to AMG preconditioner within CPR.
2015-04-30 16:53:17 +02:00
Markus Blatt
0329b0138d
Prevent unsigned vs. signed int comparison warning
2015-04-30 15:47:09 +02:00
Atgeirr Flø Rasmussen
8e95bf9996
Merge pull request #368 from blattms/fix-distribution-parallel-cpr
...
[bugfix] Use full set of processes to determine whether to redistribute ...
2015-04-30 14:23:28 +02:00
Markus Blatt
80056b8ef2
[bugfix] Pass parallel information to AMG preconditioner within CPR.
...
Previously only passed the parallel information to the ILU preconditioner,
but of course needs this information to set up the communication, too.
With this commit we pass the parallel information object to AMG's constructor.
2015-04-30 14:09:24 +02:00
Markus Blatt
c57a10ff76
[bugfix] Use full set of processes to determine whether to redistribute or not.
...
Previously we used the size of the communicator within the CpGrid to check
whether we are running in parallel and need to redistribute the grid.
Unfortunately, this is MPI_COMM_SELF until we actually loadbalance and redistribute.
Therefore we now use the size of the MPI_Helper (i.e. MPI_COMM_WORLD) which
gives us the number of all available processes.
Note that the wrong behaviour was provoked with 656e5de331
. Before that we
redistributed in any case which luckily included runs with more than 1 process.
2015-04-30 14:02:13 +02:00
Tor Harald Sandve
a860361217
Cleaning addWellEq
...
1) Comments are added
2) Variable names are made more descriptive
3) Unecessary usage of subset are removed by extracting needed
quantities for the perforation cells once in advance
2015-04-29 09:22:23 +02:00
Tor Harald Sandve
1cec10ce05
Clean updateWellControls
...
The function is simplified by removing the update of the primal
variables (the ADBs). As a consequence updateWellControls must be
called prior to the creation of the primal variables.
2015-04-29 09:22:23 +02:00
Tor Harald Sandve
302bc71d2c
Use target values as initial conditions for BHP and SURFACE_RATE
...
BHP and SURFACE_RATE values are updated every step and not only when the
well controll has switched.
2015-04-29 09:22:23 +02:00
Tor Harald Sandve
b3f9997f6a
BUGFIX Wellbore mixture calculations for multiphase injectors
...
Add phase rates and not total rates when calculating the wellbore rates.
2015-04-29 09:22:23 +02:00
Joakim Hove
ec7d0f9472
Merge pull request #350 from edbru/OPM-186
...
Implemented NOSIM keyword.
2015-04-28 11:55:18 +02:00
Edvin Brudevoll
58367e20fd
Now also flow_cp.cpp takes the NOSIM keyword into account.
2015-04-28 10:22:36 +02:00
Edvin Brudevoll
7aa8d91f2d
New commit, NOSIM keyword
2015-04-28 10:17:44 +02:00
Edvin Brudevoll
0d1cce2f26
Support for the NOSIM keyword.
2015-04-28 10:17:44 +02:00
Atgeirr Flø Rasmussen
39cfc3058f
Merge pull request #364 from dr-robertk/PR/backup-restore-fix
...
BlackoilOutputWriter: fix restore when last step is selected.
2015-04-27 09:56:40 +02:00
Bård Skaflestad
1b7b786cba
Merge pull request #365 from akva2/update_redhat_packaging
...
update redhat packaging
2015-04-24 17:34:22 +02:00
Arne Morten Kvarving
26ea0ab459
update redhat packaging
2015-04-24 15:23:26 +02:00
Robert Kloefkorn
c846418446
BlackoilOutputWriter: fix restore when last step is selected.
2015-04-24 10:53:23 +02:00
Atgeirr Flø Rasmussen
4b7440ad78
Merge pull request #363 from dr-robertk/PR/max_residual_allowed
...
FullyImplicitBlockOil: increase max_allowed_residual to 1e7.
2015-04-23 15:17:33 +02:00
Robert Kloefkorn
654c847b72
FullyImplicitBlockOil: increase max_allowed_residual to 1e7 to make SPE3 run through without adaptive time stepping.
2015-04-23 15:13:18 +02:00
dr-robertk
ee7b5c7251
Merge pull request #362 from atgeirr/new-default-parameters
...
Modify default solver parameters. Please rerun Norne.
2015-04-22 14:38:14 +02:00
Atgeirr Flø Rasmussen
f007bf561c
Modify default solver parameters.
...
These should work well for both Norne and the SPE cases.
2015-04-21 12:40:21 +02:00
Bård Skaflestad
78be86a9ed
Merge pull request #361 from atgeirr/minor-output-fix
...
Use more appropriate end-of-sim timing output.
2015-04-21 12:33:22 +02:00
Atgeirr Flø Rasmussen
2eb06d6d6c
Use more appropriate end-of-sim timing output.
2015-04-21 10:42:40 +02:00
Atgeirr Flø Rasmussen
b088caba03
Merge pull request #359 from dr-robertk/PR/throw-linearsolverproblem
...
std::runtime_error --> LinearSolverProblem.
2015-04-17 09:07:15 +02:00
Atgeirr Flø Rasmussen
572feeb7e7
Merge pull request #360 from akva2/update_debian_packaging
...
update debian packaging
2015-04-17 08:53:35 +02:00
Arne Morten Kvarving
be3b8b88b5
update debian packaging
2015-04-16 17:32:33 +02:00
Robert Kloefkorn
2badc765a6
std::runtime_error --> LinearSolverProblem when linear solver was not converged.
...
Since LinearSolverProblem is derived from std::runtime_error everything should work as
before.
2015-04-16 11:41:28 +02:00
Bård Skaflestad
e13ed48e4e
Merge pull request #356 from atgeirr/accept-deck-as-argument
...
Accept single deck filename as command line argument.
2015-04-14 18:11:12 +02:00
Atgeirr Flø Rasmussen
e44ef09212
Accept single deck filename as command line argument.
...
Any argument that is not handled by the parameter parser will
be assumed to be a deck filename. Only one is accepted, and if
given, it will override any deck_filename=<something> on the
command line or in parameter files.
FYI:
The parameter parser handles arguments of the following types:
key=value (note no space around = or in strings)
parameterfile.xml
parameterfile.param
2015-04-14 13:37:25 +02:00
Bård Skaflestad
f688c7e87a
Merge pull request #355 from atgeirr/new-startup-message
...
Provide nicer startup message that includes opm-project URL.
2015-04-14 13:35:18 +02:00
Atgeirr Flø Rasmussen
c4655d7c00
Modify startup message, include version number.
2015-04-14 13:31:39 +02:00