OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-28 20:13:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,558 Commits 24 Branches 101 Tags 75 MiB
abba4bbc21
Commit Graph

1558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Atgeirr Flø Rasmussen
22391ad144 Provide nicer startup message that includes opm-project URL. 2015-04-14 12:53:34 +02:00
Atgeirr Flø Rasmussen
2d50f4850f Merge pull request #354 from akva2/fix_i386 
fixed: use size_t and not unsigned long
 2015-04-14 12:29:10 +02:00
Arne Morten Kvarving
39e1d29176 fixed: use size_t and not unsigned long 
fixes builds on i386
 2015-04-14 10:25:21 +02:00
Atgeirr Flø Rasmussen
6589b8d7a1 Merge pull request #352 from atgeirr/bugfix-after-PR335 
Use generic function instead of UnstructuredGrid interface.
 2015-04-13 10:38:42 +02:00
Atgeirr Flø Rasmussen
f82df94d2e Use generic function instead of UnstructuredGrid interface. 2015-04-13 10:37:23 +02:00
Atgeirr Flø Rasmussen
e2a920b1fe Merge pull request #335 from totto82/minpv-fill 
Use average NTG values for merged cells due to MINPV algorithm
 2015-04-13 10:20:36 +02:00
Bård Skaflestad
69ac687eb2 Merge pull request #351 from atgeirr/cmake_01 
Sync build system
 2015-04-10 17:35:34 +02:00
Atgeirr Flø Rasmussen
88d72be556 Update Eigen requirements. 
Manually imported from opm-autodiff.
 2015-04-10 15:25:34 +02:00
Andreas Lauser
a9d0306fe8 reduce the default optimization level from -O3 to -O2 
-O3 is sometimes declared "unsafe"
(cf. https://wiki.gentoo.org/wiki/GCC_optimization ) and it seems like
it bit us in https://github.com/OPM/opm-material/issues/23 if GCC 4.8
was used. so let's play safe and use -O2 for now...
 2015-04-10 15:09:23 +02:00
Jørgen Kvalsvik
28c2c463cb Cleans up PETSc detection 
Now building will no longer fail if PETSc isn't available, and it correctly
degrades if it cannot find an available MPI. It should now behave similarly as
other optionals, such as SuperLU.
 2015-04-10 15:09:22 +02:00
Andreas Lauser
e2180effce FindCXX11Features.cmake: check for the c++-2011 "final" specifier 2015-04-10 15:09:21 +02:00
Andreas Lauser
e0dd62a226 only generate debugging symbols for the build types "Debug" and "RelWithDebInfo" 2015-04-10 15:09:21 +02:00
Andreas Lauser
89129aaaf6 build system: do not separate the debugging symbols by default 
the reason is that the tools for profiling and for coverage analysis
(i.e., gprof and gcov) have trouble with this and crash. if you want
this to be enabled for whatever reason, use the cmake flag
-DSTRIP_DEBUGGING_SYMBOLS=ON or pass configure the
--enable-strip-debug option.
 2015-04-10 15:09:20 +02:00
Andreas Lauser
2bb5159a97 FindAlugrid.cmake: do not try to include the whole grid 
first this makes the test very slow, second (and more importantly) it
makes the test fail on dune master as the header relies on the
presence of the DUNE_GRID_VERSION* macros which are not present at the
configure stage of the build...
 2015-04-10 15:09:19 +02:00