Commit Graph

1546 Commits

Author SHA1 Message Date
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
Robert K
9c4161bbdb add cmake module for ZOLTAN
also, link it to alugrid if it has been detected.
2015-04-10 15:09:19 +02:00
Robert K
fbb78323e8 fix metis check for gentoo installed METIS version. 2015-04-10 15:09:18 +02:00
Andreas Lauser
50ec899a3d eWoms: silence an annoying bogous deprecation warning on Dune 2.4 2015-04-10 15:09:17 +02:00
Andreas Lauser
fa04799855 remove the obsolete 'm4' subdirectory
as far as I can see, it provided M4 macros for autotools based
projects which wanted to use OPM. I have severe doubts that this was
used by anyone because it most likely does not even work. (e.g. the M4
macros does not seem to specify the ERT and opm-parser prerequisites.)

Note that I'm not 100% sure of the above, so if I'm wrong, state so
loudly and I'll close the PR...
2015-04-10 15:09:16 +02:00
Jørgen Kvalsvik
5630710986 Simplifcations in FindPetsc logic
Removes a lot of the conditionals in the makefile. As reflected in the
comments, find_* won't run if the target variable is already set, and appending
empty list elements changes nothing. In order to make reading the file easier
these conditionals have mostly been removed.
2015-04-10 15:09:15 +02:00
Jørgen Kvalsvik
4a2adec53a PETSC_ROOT now sets NO_DEFAULT_PATH
Allows a specific PETSC_ROOT to override and replace default search paths. Now,
if PETSC_ROOT is passed and the find_library calls cannot find the libraries,
the makefile will only search in user provided directories.
2015-04-10 15:09:15 +02:00
Jørgen Kvalsvik
a76363a7f7 FindPetsc uses system-provided MPI if available
When building with USE_MPI=ON the FindPetsc now uses the system provided
MPI if available. Falls back to looking for the PETSc provided unimpi for
sequential builds.
2015-04-10 15:09:14 +02:00
Jørgen Kvalsvk
92af07ae85 FindPets searches default paths w/ general namings
Removed the NO_DEFAULT_PATH flag as this really isn't working for most systems
(where PETSc will be installed from a repository and in /usr or /). Path suffix
parameters extended to accept more version-less configs too, to be compatible
with a default PETSc (debian style) install.
2015-04-10 15:09:13 +02:00
Jørgen Kvalsvk
33914bcceb Removes broken conditional check.
The FindPetsc module would check for a PETSC_ROOT and not attempt to look for
mpi and the petsc header if this was not set, which it in most cases won't be.
If the variable is set then the conditional include is redundant, as it will
search the explicitly passed paths first anyways.
2015-04-10 15:09:13 +02:00
Jørgen Kvalsvk
2de1568a33 Fixes status message when PETSc couldn't be found. 2015-04-10 15:09:12 +02:00
Liu Ming
975d161359 add HAVE_PETSC for config.h 2015-04-10 15:09:11 +02:00
Liu Ming
a8387f67dc Fix duplication errors. 2015-04-10 15:09:10 +02:00