Commit Graph
6110 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen a5c14af204 Remove unused program compute_tof. 2018-01-11 12:26:55 +01:00
Atgeirr Flø Rasmussen cf82a41229 Merge pull request #1205 from akva2/remove_transport
remove implicit transport code
2018-01-10 16:07:21 +01:00
Arne Morten Kvarving 529278d2b9 remove implicit transport code
moved to opm-upscaling
2018-01-09 16:09:28 +01:00
Joakim Hove cc20b89e73 Merge pull request #1196 from GitPaean/fixing_history_tests
fixing history mode tests
2018-01-09 14:37:10 +01:00
Kai Bao 0d96749d4d fixing a test related to history mode. 2018-01-08 09:08:05 +01:00
Arne Morten Kvarving c2c35b90b8 Merge pull request #1204 from akva2/package_prereq
package prereqs file
2018-01-05 16:13:41 +01:00
Arne Morten Kvarving 3b89515a8c package prereqs file 2018-01-05 10:42:52 +01:00
Atgeirr Flø Rasmussen 8b34a6e795 Merge pull request #1203 from akva2/remove_build_status
remove travis build status from README.md
2018-01-04 12:58:59 +01:00
Arne Morten Kvarving a77b07ddfd remove travis build status from README.md 2018-01-04 12:09:55 +01:00
Joakim Hove b190a0531d Merge pull request #1202 from joakim-hove/rm-travis
Removed travis integration
2018-01-02 20:29:57 +01:00
Joakim Hove 1f4447df98 Removed travis integration 2017-12-26 12:31:05 +01:00
Arne Morten Kvarving 0f70255b86 Merge pull request #1201 from akva2/self_prereqs
changed: put prereqs in module itself
2017-12-20 15:19:23 +01:00
dr-robertk 761788100d Merge pull request #1200 from andlaus/some_fixes
Some fixes
2017-12-20 13:04:12 +01:00
Arne Morten Kvarving 6264404883 changed: put prereqs in module itself 2017-12-19 12:42:19 +01:00
Andreas Lauser 8d98d76c17 do not conditionally remove the PETSc and UMFPack source files from the list anymore
these files should now compile even if the corresponding libraries
are not available.
2017-12-14 12:17:59 +01:00
Andreas Lauser a1543115aa remove unused travis files
these have not been used for a while. .travis.yml and the files in opm-common/travis/ are in charge
2017-12-11 11:33:52 +01:00
Andreas Lauser 204ef58bb6 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 634a7bef42 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 fbec8c2300 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 9796066199 remove bit-rotten SimulatorState.cpp file
the corresponding header file is MIA.
2017-12-11 11:33:52 +01:00
Atgeirr Flø Rasmussen ec58bfb224 Merge pull request #1192 from andlaus/add_energy_phase
Add energy phase
2017-12-11 11:32:31 +01:00
Andreas Lauser 93a7b2da36 PhaseUsage: handle polymer and solvent the same way as energy 2017-12-11 10:30:14 +01:00
Andreas Lauser c685e86f91 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 d97a5c5734 Merge pull request #1197 from akva2/remove_tutorials
remove tutorials which have been moved to opm-simulators
2017-12-06 12:33:15 +01:00
Arne Morten Kvarving febdc04e80 remove tutorials which have been moved to opm-simulators 2017-12-06 12:07:33 +01:00
Bård Skaflestad efc2915b74 Merge pull request #1195 from akva2/quell_unhandled_warning
fixed: add ENERGY to switch to quell unhandled enum value warning
2017-12-05 19:51:17 +01:00
Arne Morten Kvarving 0c1ed25eb1 fixed: add ENERGY to switch to quell unhandled enum value warning 2017-12-05 17:13:08 +01:00
Atgeirr Flø Rasmussen c9c4c81661 Merge pull request #1188 from totto82/handleWEFAC
Handle WEFAC
2017-12-05 08:37:44 +01:00
Atgeirr Flø Rasmussen 55348d6441 Merge pull request #1193 from akva2/move_utils_to_simulators
Move utils to simulators
2017-12-05 08:36:54 +01:00
Atgeirr Flø Rasmussen 54b5910921 Merge pull request #1194 from akva2/move_average_to_upscaling
remove Average.hpp (from build system)
2017-12-05 08:36:13 +01:00
Arne Morten Kvarving 0a4cc569aa remove Average.hpp (from build system)
moved to opm-upscaling
2017-12-04 16:48:18 +01:00
Arne Morten Kvarving 860e3d5831 remove some unused files 2017-12-04 16:32:14 +01:00
Arne Morten Kvarving 97098ac190 remove files moved to opm-simulators from build system 2017-12-04 16:25:27 +01:00
Tor Harald Sandve bcd83025ec Add efficiencyFactor to GuideRate 2017-12-01 11:32:35 +01:00
Tor Harald Sandve 1b13f44e12 Handle WEFAC
Added test combining WEFAC and GEFAC
2017-11-30 13:45:05 +01:00
Atgeirr Flø Rasmussen 1d1347d2b3 Merge pull request #1190 from totto82/BUGFIX_equil
Fix pvtIndex map for cases with non-active eqlnum regions.
2017-11-28 07:31:04 +01:00
Tor Harald Sandve 19796e2ddc Fix pvtIndex map for cases with non-active eqlnum regions. 2017-11-27 13:40:09 +01:00
Atgeirr Flø Rasmussen 2a88805822 Merge pull request #1187 from totto82/removeBlackOilPropsFromInit
Remove black oil props from init
2017-11-27 07:26:45 +01:00
Atgeirr Flø Rasmussen 37421c62da Merge pull request #1189 from andlaus/remove_configure
remove the configure wrapper script
2017-11-24 13:12:14 +01:00
Tor Harald Sandve 729d6cf30e Adress PR review issues 2 2017-11-24 10:52:57 +01:00
Andreas Lauser f786d4749e remove the configure wrapper script
this used to provide autotools compatibility, but it has not been working for a while. Thus it is IMO better to remove it in order not to mislead people.
2017-11-24 10:36:46 +01:00
Tor Harald Sandve d1a654f414 Fix 2p bug 2017-11-22 09:24:52 +01:00
Tor Harald Sandve bce19d87dc Adress PR review issues 2017-11-22 08:31:57 +01:00
Tor Harald Sandve 833b019413 Remove the usage of partition_unif_idx() from opm-core 2017-11-21 15:01:52 +01:00
Tor Harald Sandve 3486e98ae3 Cleaning the initialization code
-remove whitespaces
-fix documentation
2017-11-21 12:52:07 +01:00
Tor Harald Sandve e613f2b8c5 Use &ref not shared_pointer to MaterialLawManager 2017-11-21 12:08:10 +01:00
Tor Harald Sandve 12108d57ab Remove blackoilPhases and phaseUsage from the initialization code
Note 1: The initialization code now always consider 3 phases.
For 2-phase cases a trivial (0) state is returned.
Note 2: The initialization code does not compute a BlackoilStats,
but instead pass the initialization object with the initial state.
2017-11-21 12:08:10 +01:00
Tor Harald Sandve 8def11ff93 Remove BlackoilProps from equil initalization code
Use FluidSystem and materialLaw from opm-material
directly not via the BlackoilProps in opm-core
2017-11-21 12:08:10 +01:00
Atgeirr Flø Rasmussen d049125205 Merge pull request #1186 from akva2/remove_param_group
remove ParameterGroup code
2017-11-18 09:14:11 +01:00
Arne Morten Kvarving acc631f504 remove ParameterGroup code
moved to opm-common
2017-11-17 13:55:07 +01:00