OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 08:54:53 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,799 Commits 31 Branches 117 Tags
1fb7a94e34d40ba34342b2c167b32777b6bda8c7
Commit Graph
7799 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joakim Hove c98b361e37 Merge pull request #1375 from joakim-hove/rm-travis 
Removed travis integration
 2018-01-02 20:30:11 +01:00
Joakim Hove e9c1bddb72 Removed travis integration 2017-12-26 12:24:05 +01:00
Atgeirr Flø Rasmussen 9f14b63b82 Merge pull request #1370 from totto82/changeDpMaxDefault 
Change dp_max_rel default from 1.0 to 0.3
 2017-12-20 16:59:43 +01:00
Arne Morten Kvarving 7100c1ee90 Merge pull request #1374 from akva2/self_prereqs 
changed: put prereqs in module itself
 2017-12-20 15:19:38 +01:00
Arne Morten Kvarving 2ed67f8bf2 changed: put prereqs in module itself 2017-12-19 12:44:41 +01:00
Andreas Lauser 025bbd3da2 Merge pull request #1373 from totto82/useBlackoilFluidState 
Adapt to changed initial FluidState type in ebos
 2017-12-18 13:02:33 +01:00
Tor Harald Sandve 7567748f2d Adapt to changed initial FluidState type in ebos 2017-12-15 08:19:01 +01:00
Tor Harald Sandve 4097a07572 Change dp_max_rel default from 1.0 to 0.3 2017-12-14 11:16:16 +01:00
Andreas Lauser 5bf53148c0 replace #if HAVE_CONFIG_H by #ifdef HAVE_CONFIG_H 
it seems like most build systems pass a -DHAVE_CONFIG_H flag to the
compiler which still causes `#if HAVE_CONFIG_H` to be false while it
clearly is supposed to be triggered.

That said, I do not really see a good reason why the inclusion of the
`config.h` file should be guarded in the first place: the file is
guaranteed to always available by proper build systems, and if it was
not included the build either breaks at the linking stage or -- at the
very least -- the runtime behavior of the resulting libraries will be
very awkward.
 2017-12-11 11:33:52 +01:00
Andreas Lauser db1f257184 make call_umfpack.c compile even if UMFPACK is not available 
That said, don't try to call any of its functions or you'll regret it
at runtime!
 2017-12-11 11:33:52 +01:00
Andreas Lauser 503c7d1ca8 make the PETSc code compile even if PETSc is not available 
if PETSc is not available, the .cpp file will compile fine because it
will be reduced to be empty, but trying to include
LinearSolverPetsc.hpp in this case will result in an error.
 2017-12-11 11:33:52 +01:00
Andreas Lauser 244871829d PhaseUsage: handle polymer and solvent the same way as energy 2017-12-11 10:30:14 +01:00
Andreas Lauser 4571a8f841 add an energy "phase" 
This is quite a hack: Even though energy is not a "phase" and it is
also not considered in MaxNumPhases and pu.num_phases because this
would break a lot of assumptions in old code, it is nevertheless
assigned an "canonical index" that can be translated "active index"
via PhaseUsage::phase_pos[]. This awkwardness is needed because much
of the legacy OPM code conflates the concepts of "fluid phase" and
"conserved quantity" and fixing that issue would basically mean an
almost complete rewrite of much of the legacy code. That said, the
same statement applies to polymer and solvent, but these are currently
handled as even more second-class citizens because they are not even
given a canonical index and also cannot be translated into an active
one.
 2017-12-11 10:30:14 +01:00
Atgeirr Flø Rasmussen 0b6ac6c87b Merge pull request #1365 from akva2/import_tutorials 
Import tutorials from opm-core
 2017-12-06 12:33:10 +01:00
Arne Morten Kvarving efce6ef3da add imported tutorials to build system 2017-12-06 12:06:49 +01:00
Arne Morten Kvarving b5b6a8ad97 adjust separate build system for tutorials 2017-12-06 12:01:48 +01:00