OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 18:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,847 Commits 24 Branches 101 Tags 97 MiB
1b33769922
Commit Graph

7847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
1b33769922
Merge pull request #1399 from totto82/MoveWell 
Some more cleaning in the output code in opm-output, ewoms and opm-simulator
 2018-02-19 15:05:20 +01:00
Atgeirr Flø Rasmussen
e3e4f3acac
Merge pull request #1408 from atgeirr/add-nowells-test 
Add integration test with no wells.
 2018-02-15 13:33:58 +01:00
Atgeirr Flø Rasmussen
5f8124bfbf Add integration test with no wells. 2018-02-15 10:07:58 +01:00
Arne Morten Kvarving
8ff91c83e7
Merge pull request #1406 from akva2/dyn_boost_test_bs 
changed: let the build system handle the dynamic boost test defines
 2018-02-15 08:14:46 +01:00
Arne Morten Kvarving
adee0a1649 changed: let the build system handle the dynamic boost test defines 2018-02-14 16:04:48 +01:00
Atgeirr Flø Rasmussen
8e9b13584d
Merge pull request #1403 from lars-petter-hauge/empty_wells_init 
Allow Wells struct initialization without wells
 2018-02-14 10:31:52 +01:00
Atgeirr Flø Rasmussen
17a524e42c
Merge pull request #1404 from atgeirr/fix-no-wells 
Ensure we do not dereference nullptr.
 2018-02-14 09:56:43 +01:00
Lars Petter Øren Hauge
011143829d Allow Wells struct initialization without wells 
Calling wells()->number_of_wells on nullptr causes segmentation fault. This
occurs when running a deck without wells. Allowing WellsManager::init to
continue for decks without wells enables the well struct to be set.

Authored by Sveinung Rundhovde & Lars Petter Hauge
 2018-02-13 16:43:10 +01:00
Atgeirr Flø Rasmussen
4f414b78ed Ensure we do not dereference nullptr. 2018-02-13 16:22:11 +01:00
Atgeirr Flø Rasmussen
dd93a67086
Merge pull request #1402 from atgeirr/fix-binary-path 
Use PROJECT_BINARY_DIR instead of CMAKE_BINARY_DIR.
 2018-02-13 15:51:22 +01:00
Atgeirr Flø Rasmussen
cf51303697
Merge pull request #1387 from akva2/buildsystem_conditionals 
changed: only add conditionally built files if they are to be built
 2018-02-13 15:51:04 +01:00
Atgeirr Flø Rasmussen
7b1d377e82 Use PROJECT_BINARY_DIR instead of CMAKE_BINARY_DIR. 2018-02-13 13:04:54 +01:00
Arne Morten Kvarving
371ae786ca changed: only add conditionally built files if they are to be built 
instead of unconditionally adding, and then conditionally removing
again.
 2018-02-13 12:35:39 +01:00
Arne Morten Kvarving
5ac22e9f42
Merge pull request #1401 from atgeirr/moved-opm-grid-headers 
Adapt to moved opm-grid headers.
 2018-02-12 16:32:06 +01:00
Tor Harald Sandve
a89a6af854 Some more cleaning in the output code in opm-output, ewoms and opm- 
simulator

1) Don't depend on legacy code for communicating the data::wells
2) Bugfix. Store globalIdx instead localIdx in data::wells::complitions
3) Move ThreadHandle to ebos
 2018-02-12 08:44:43 +01:00
Atgeirr Flø Rasmussen
cf9b7c39b9 Adapt to moved opm-grid headers. 2018-02-10 08:33:33 +01:00
Andreas Lauser
024344600e
Merge pull request #1400 from andlaus/gridManager_to_vanguard 
adapt to the gridManager() -> vanguard() change in ewoms
 2018-02-08 17:54:03 +01:00
Andreas Lauser
3d0fca2f08 adapt to the gridManager() -> vanguard() change in ewoms 2018-02-08 16:27:42 +01:00
Andreas Lauser
996dc3382e
Merge pull request #1398 from andlaus/separate_opm-common_concerns 
adapt to the move of infrastructure from opm-common to opm-material
 2018-02-08 16:25:29 +01:00
Andreas Lauser
7f3a9f1f43 catch NumericalIssue instead of NumericalProblem 
the underlying problem is that the OPM build system does not define a
HAVE_OPM_COMMON macro in config.h.
 2018-02-08 12:02:25 +01:00
Andreas Lauser
58a1b7df1f adapt to the move of infrastructure from opm-common to opm-material 2018-02-07 13:32:52 +01:00
Atgeirr Flø Rasmussen
532403c5fb
Merge pull request #1391 from totto82/RFIP 
Use FIP, EGRID and INIT output code in ebos.
 2018-02-06 12:54:01 +01:00
Arne Morten Kvarving
a2419e285f
Merge pull request #1396 from akva2/remove_err_brace 
fixed: remove erroneous brace
 2018-02-05 12:10:39 +01:00
Arne Morten Kvarving
05593c975d fixed: remove erroneous brace 2018-02-05 11:38:15 +01:00
Arne Morten Kvarving
9617cf012e
Merge pull request #1395 from andlaus/flow_first 
move the flow_ebos_*.cpp files to the beginning of the source list
 2018-02-05 10:56:14 +01:00
Andreas Lauser
bb788a976b add comment to CMakeLists_files.cmake why the flow_ebos*.cpp files are on top 2018-02-05 10:53:40 +01:00
Andreas Lauser
9693e0b33d move the flow_ebos_*.cpp files to the beginning of the source list 
these files take the longest to compile. moving them to the beginning
speeds things up forn parallel builds because the remaining compile
can be compiled while dealing with the flow_ebos files while the build
stalls if these files are at the bottom of the list because they are
required for the library.
 2018-02-05 10:14:51 +01:00
Atgeirr Flø Rasmussen
516d0237d5
Merge pull request #1394 from akva2/relocate_files_in_common 
Relocate files in common
 2018-01-31 13:18:12 +01:00
Arne Morten Kvarving
2da361414e changed: relocate the remaining files in opm/core/utility 
move to opm/common/utility/numeric
 2018-01-30 16:33:46 +01:00
Arne Morten Kvarving
141186ad1d changed: opm/[core -> common]/utility/parameters 2018-01-30 16:33:45 +01:00
Arne Morten Kvarving
e9e5c15e99 changed: opm/[core/linalg -> common/utility/numeric]/blas_lapack.h 2018-01-30 12:47:10 +01:00
Arne Morten Kvarving
e9404486bb changed: opm/common/[->utility]/ResetLocale.hpp 2018-01-30 12:34:04 +01:00
Arne Morten Kvarving
742d2d2158 changed: opm/common/[util->utility]/numeric/cmp.hpp 2018-01-30 12:13:30 +01:00
Atgeirr Flø Rasmussen
90be27116f
Merge pull request #1390 from akva2/super_build 
Some changes to facilitate building using a super project
 2018-01-29 16:28:33 +01:00
Tor Harald Sandve
cdeefc3a34 Fix command line argument for double precision restart output 2018-01-29 08:56:55 +01:00
Tor Harald Sandve
84a8b8eca6 Pass empty regionSummaryData and blockSummaryData to output 2018-01-29 08:56:55 +01:00
Tor Harald Sandve
b38430ea2e Output TCPU for every substep. 2018-01-29 08:56:55 +01:00
Tor Harald Sandve
f980c39e6c Change directory of parallel restart test 2018-01-29 08:56:55 +01:00
Tor Harald Sandve
6d0c716d76 Clean-up FIP 2018-01-29 08:56:55 +01:00
Tor Harald Sandve
36f6b7ad00 Remove writInit() 
The EGRID and INIT files are written using ebos
 2018-01-29 08:56:55 +01:00
Andreas Lauser
386ade39f4 flow: let core ebos handle the output directory for the result files 
this adds a new parameter --ecl-output-dir=$FOO to the "virtual"
command line arguments of the ebos simulator.
 2018-01-29 08:54:30 +01:00
Tor Harald Sandve
137ff53ae7 Remove output of FIP 2018-01-29 08:54:30 +01:00
Atgeirr Flø Rasmussen
1e5e3f7ddf
Merge pull request #1392 from akva2/build_dune26 
Fix build with dune 2.6
 2018-01-26 12:24:17 +01:00
Arne Morten Kvarving
4945c9b2ed changed: pass the mcmg element layout as a parameter for dune 2.6 
the template parameter is deprecated
 2018-01-22 17:25:14 +01:00
Arne Morten Kvarving
2aa0043550 changed: use Dune::createScalarProduct for dune 2.6 
ScalarProductChooser is no more
 2018-01-22 17:24:58 +01:00
Arne Morten Kvarving
4315665b64 changed: expose category as member for dune 2.6 
the enum can only be used with a define, and that would
just be a temporary solution in any case
 2018-01-22 17:23:22 +01:00
Arne Morten Kvarving
093d8bb134 rename tutorialx.cpp sim_tutorialx.cpp 2018-01-19 14:50:43 +01:00
Arne Morten Kvarving
0aca27ab52 changed: rename test_equil test_equil_legacy 2018-01-19 14:48:40 +01:00
Arne Morten Kvarving
1fb7a94e34 changed: use PROJECT_BINARY_DIR instead of CMAKE_BINARY_DIR 
to aid the use of a super project for opm
 2018-01-19 14:47:38 +01:00
Atgeirr Flø Rasmussen
3c5510c879
Merge pull request #1386 from akva2/import_opm_core 
Import opm core
 2018-01-17 21:13:39 +01:00