Commit Graph

7815 Commits

Author SHA1 Message Date
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
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
Arne Morten Kvarving
5b86d8b13b add files imported from opm-core to build system 2018-01-17 18:27:19 +01:00
Arne Morten Kvarving
83d4dae117 changed: do not ifdef the entire implementation
better to handle this in build system
2018-01-17 18:16:26 +01:00
Arne Morten Kvarving
c30e3088b5 remove opm-core from upstream and prerequisite lists
debian/redhat packaging updated as well
2018-01-17 18:16:26 +01:00
Arne Morten Kvarving
20ccd53fb3
Merge pull request #1385 from akva2/fix_serial_build
fixed: do not add parallel regression test if MPI is not enabled
2018-01-17 17:39:23 +01:00
Arne Morten Kvarving
957f6c0974 fixed: do not add parallel regression test if MPI is not enabled 2018-01-17 16:26:30 +01:00
Arne Morten Kvarving
e674fd2b16 not going to execute these 2018-01-17 15:19:34 +01:00
Arne Morten Kvarving
c03a980199 Import the remaining code from opm-core 2018-01-17 15:18:56 +01:00
Steinar Foss
8788924608 test_relpermdiagnostics: ParseContext set to default for all enum fields. 2018-01-17 11:27:16 +01:00
Steinar Foss
b26c7cdbe0 test_relpermdiagnostics makes no reference to PARSE_EXTRA_RECORDS. 2018-01-17 10:34:01 +01:00
Steinar Foss
792b0e7f9d test_RelpermDiagnostics: .DATA file correct, test throws exception for parser errors. 2018-01-17 09:50:21 +01:00
Steinar Foss
57d36b5e51 test_RelpermDiagnostics made to use PARSE_EXTRA_RECORDS. 2018-01-16 17:59:05 +01:00
Atgeirr Flø Rasmussen
ea074831a9 Remove unneeded includes from compute_tof_from_files.cpp 2018-01-11 12:27:24 +01:00
Andreas Lauser
f34cfafc22
Merge pull request #1377 from totto82/useEbosEclOutput
Start using ecl output from Ebos
2018-01-10 15:01:27 +01:00
Atgeirr Flø Rasmussen
dfe478a38e
Merge pull request #1380 from atgeirr/cleanup-2psims
Cleanup old incompressible twophase sims
2018-01-09 09:01:34 +01:00
Atgeirr Flø Rasmussen
6c8b0d68ca Remove use of old implicit imcomp 2p transport. 2018-01-08 17:23:43 +01:00
Atgeirr Flø Rasmussen
8ad9c979f8 Remove old 2p simulator. 2018-01-08 17:22:50 +01:00
Atgeirr Flø Rasmussen
6481e32caa Make the differences between the incomp sims smaller.
For easier comparison and subsequent removal.
2018-01-08 17:19:17 +01:00
Atgeirr Flø Rasmussen
aca95895c9 Fix: set precision of the correct stream. 2018-01-08 17:18:47 +01:00
Atgeirr Flø Rasmussen
d6f28e625b
Merge pull request #1379 from atgeirr/sims-do-logging
Add setupSimpleDefaultLogging() to old two-phase sims.
2018-01-08 15:54:38 +01:00
Atgeirr Flø Rasmussen
378a60699d Add setupSimpleDefaultLogging() to old two-phase sims.
Without this, the log output from some subsystems (such as
the parameters) will be lost as there is no log picking it up.
2018-01-08 15:10:06 +01:00
Kai Bao
efeccd8e74 fixing a test related to history mode. 2018-01-08 09:08:05 +01:00
Arne Morten Kvarving
bb4803bec9
Merge pull request #1378 from akva2/package_prereq
Package prereq file and fix quadmath for ewoms
2018-01-05 16:13:52 +01:00
Tor Harald Sandve
c583e3d2eb start using parallelRestartTest 2018-01-05 14:54:07 +01:00
Tor Harald Sandve
73563db6a6
Merge pull request #5 from akva2/useEbosEclOutput
add support for parallel restart tests
2018-01-05 14:52:53 +01:00
Arne Morten Kvarving
5dbff677d5 fixed: disable quadmath for ewoms in packaging 2018-01-05 13:31:38 +01:00
Arne Morten Kvarving
9619c7245d package prereqs file 2018-01-05 10:44:51 +01:00
Arne Morten Kvarving
6704ae0bb8 add support for parallel restart tests 2018-01-04 13:48:43 +01:00
Atgeirr Flø Rasmussen
a3f3bddff6
Merge pull request #1376 from akva2/remove_build_status
remove travis build status from README.md
2018-01-04 12:59:31 +01:00
Arne Morten Kvarving
cc31f36853 remove travis build status from README.md 2018-01-04 12:11:34 +01:00
Tor Harald Sandve
0e6fe26a61 Start using ecl output from Ebos
The wells, FIP and initial output of NNCs is still handled
by code in opm-simulators. The plan is to move more of the
functionality to ebos.

All tests pass and MPI restart works
2018-01-04 09:29:58 +01:00
Atgeirr Flø Rasmussen
bd8a31a5c0
Merge pull request #1368 from totto82/usePhaseAndCompInfoFromFluidSystem
Use phase and comp info from fluid system
2018-01-03 11:21:08 +01:00
Tor Harald Sandve
969d8f238d Use phase and comp info from FluidSystem
TODO: The output, fip and restart still uses a mixture of old and
new phase indices. This needs to be adressed in future PRs
2018-01-03 08:44:37 +01:00