Commit Graph
100 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen cf9b7c39b9 Adapt to moved opm-grid headers. 2018-02-10 08:33:33 +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
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
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
Atgeirr Flø Rasmussen 3c5510c879 Merge pull request #1386 from akva2/import_opm_core
Import opm core
2018-01-17 21:13:39 +01:00
Atgeirr Flø Rasmussen ea074831a9 Remove unneeded includes from compute_tof_from_files.cpp 2018-01-11 12:27:24 +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
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
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
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
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
Atgeirr Flø Rasmussen 8a5712a5d5 Merge pull request #1361 from totto82/add_gasoil_test
Add SPE1CASE2_OILGAS test case
2017-12-05 20:22:32 +01:00
Atgeirr Flø Rasmussen 7ba38de135 Merge pull request #1364 from akva2/quell_warnings
Quell warnings
2017-12-05 20:18:06 +01:00
Atgeirr Flø Rasmussen 03a0baf447 Merge pull request #1343 from GitPaean/single_phase_resv
making the single phase RESV injection work.
2017-12-05 14:06:44 +01:00
Atgeirr Flø Rasmussen 8f1adadeae Merge pull request #1355 from totto82/removeInitDupl
Only compute the initial solution once.
2017-12-05 08:44:11 +01:00
Atgeirr Flø Rasmussen 4c8f1c2ce4 Merge pull request #1359 from akva2/import_utils_from_core
Import some utils from opm-core
2017-12-05 08:37:00 +01:00
Atgeirr Flø Rasmussen a767e166ae Make DataMap.hpp properly include its dependencies. 2017-12-04 16:24:14 +01:00
Atgeirr Flø Rasmussen 65034250d1 Merge pull request #1356 from dr-robertk/PR/fix-minor-issue-gridview
[bugfix] make code compile when GridView is not Grid::LeafGridView.
2017-12-04 09:25:43 +01:00
Atgeirr Flø Rasmussen 95c8a0e673 Merge pull request #1358 from GitPaean/cleaningup_well_models
Cleaningup well models
2017-12-01 10:51:30 +01:00
Atgeirr Flø Rasmussen 7c3893016e Merge pull request #1357 from totto82/changeMaxIterTest
Increase max_iter for ctests SPE5 and 2D_THREEPHASE_POLY_HETER
2017-11-30 13:01:16 +01:00
Atgeirr Flø Rasmussen 277a7809ac Merge pull request #1354 from akva2/remove_polymer_int
remove polymer integration test
2017-11-29 20:50:10 +01:00
Atgeirr Flø Rasmussen eef7b8ea94 Merge pull request #1348 from totto82/refactorBlackoilModelEbos
Put the ebosSimulator start and end methods where it belongs
2017-11-29 20:49:18 +01:00
Atgeirr Flø Rasmussen 29370f7962 Merge pull request #1353 from akva2/missing_msw_3d
fixed: missing msw_3d in commit message for the opm-data PR
2017-11-29 10:59:32 +01:00
Atgeirr Flø Rasmussen 2bf880fadd Merge pull request #1351 from totto82/changeDefaultTimeStep
Use 1 day as default initial time step
2017-11-29 10:01:15 +01:00
Atgeirr Flø Rasmussen 9cffa946f6 Merge pull request #1350 from totto82/onlyReadTuningParamOnce
Only read use_TUNING param once.
2017-11-28 20:43:35 +01:00
Atgeirr Flø Rasmussen 3d698cabcf Merge pull request #1347 from totto82/fixLargeTime
Fix date for long simulation times
2017-11-28 16:54:48 +01:00
Atgeirr Flø Rasmussen 14cedcf434 Merge pull request #1349 from akva2/polymer_fix
fixed: run polymer integration test with flow, not recently removed flow_polymer
2017-11-28 12:42:40 +01:00
Atgeirr Flø Rasmussen 9db16ad9dc Merge pull request #1342 from GitPaean/fixing_polymer
fixing a polymer running with both shear and non-fully mixed polymer.
2017-11-27 13:33:38 +01:00
Atgeirr Flø Rasmussen 46e958af43 Merge pull request #1337 from totto82/removeBlackOilPropsFromInit
Adapt to the refactoring of the Equil initialization code
2017-11-27 07:26:22 +01:00
Atgeirr Flø Rasmussen f62275cb06 Merge pull request #1339 from blattms/write-ranks-without-nonactive
Disregard non-active cells when writing MPI_RANK in writeInitial.
2017-11-27 07:22:34 +01:00
Atgeirr Flø Rasmussen 401aa28c08 Merge pull request #1340 from totto82/solventAndResv
Make it possible to combine solvent and RESV
2017-11-27 07:20:24 +01:00
Atgeirr Flø Rasmussen 369e9f5a06 Merge pull request #1344 from atgeirr/remove-legacy-polymer
Remove legacy fully implicit polymer simulator.
2017-11-27 07:19:01 +01:00
Atgeirr Flø Rasmussen 3fd27d9bd6 Merge pull request #1346 from GitPaean/removing_more_multisegment_legacy
removing more legacy Multisegment Wells related.
2017-11-24 15:30:39 +01:00
Atgeirr Flø Rasmussen aab41f3df2 Merge pull request #1341 from totto82/fixTUNING
Only update TUNING after event
2017-11-24 13:15:40 +01:00
Atgeirr Flø Rasmussen 47df8417f1 Merge pull request #1345 from andlaus/remove_configure
remove the configure wrapper script
2017-11-24 13:12:21 +01:00
Atgeirr Flø Rasmussen eabd06389c Stop updating reference data for legacy flow_polymer regression test. 2017-11-24 12:38:55 +01:00
Atgeirr Flø Rasmussen 32c7d822ec Remove legacy fully implicit polymer simulator.
It has been replaced with the faster local-ad-based code, that is now
part of the integrated flow.cpp application.

We do not remove the old sequential implicit polymer simulators.
2017-11-24 11:41:34 +01:00
Atgeirr Flø Rasmussen 796f6cd13c Merge pull request #1338 from totto82/scheduleTUNING
Support TUNING in schedule section.
2017-11-22 14:03:58 +01:00
Atgeirr Flø Rasmussen 6e8adbbd7d Remove old "backup-restore" functionality.
Was no longer working and would require some maintenance to work again.
2017-11-20 14:31:13 +01:00
Atgeirr Flø Rasmussen 353f4a6265 Move creating local fipnum array to constructor. 2017-11-17 15:42:16 +01:00
Atgeirr Flø Rasmussen 33833eebe3 Align PRT message header. 2017-11-17 15:41:46 +01:00
Atgeirr Flø Rasmussen ed263ba030 Remove unused function argument. 2017-11-17 15:41:23 +01:00
Atgeirr Flø Rasmussen 8bd441f431 Remove obsolete time and convergence output. 2017-11-17 15:28:52 +01:00
Atgeirr Flø Rasmussen f2a51d29e7 Merge pull request #1304 from alfbr/master
LOG and PRT file clean-up
2017-11-17 10:03:24 +01:00
Atgeirr Flø Rasmussen 68dab29aec Merge pull request #1333 from GitPaean/avoid_use_BlackoilPhases
replacing BlackoilPhases:: with Oil Water Gas in well model
2017-11-16 21:49:30 +01:00
Atgeirr Flø Rasmussen abc5300f91 Merge pull request #1334 from atgeirr/update-docs
Update README, add CHANGELOG.
2017-11-16 15:10:14 +01:00
Atgeirr Flø Rasmussen 3b8688403a Update README, add CHANGELOG. 2017-11-16 15:08:59 +01:00
Atgeirr Flø Rasmussen 98cab97960 Merge pull request #1332 from atgeirr/refactor-simulator-run
Refactor FIP in run() method
2017-11-16 14:44:12 +01:00
Atgeirr Flø Rasmussen d8ad13c4b5 Move fip computation and unit conversion to separate method. 2017-11-15 16:31:06 +01:00
Atgeirr Flø Rasmussen 4256af6754 Move (local) fipnum creation to separate method. 2017-11-15 16:13:28 +01:00
Atgeirr Flø Rasmussen 0f210dcb6c Move FIP output to separate method. 2017-11-15 15:55:58 +01:00
Atgeirr Flø Rasmussen 91ac16b7e3 Merge pull request #1184 from akva2/remove_unused_sources
remove unused code
2017-11-15 14:09:31 +01:00
Atgeirr Flø Rasmussen f29f1b49d1 Merge pull request #1122 from atgeirr/fix-type-bug-in-equil
Fix type bug in equil
2017-11-14 14:40:47 +01:00
Atgeirr Flø Rasmussen 3d0c6da513 Merge pull request #1320 from joakim-hove/missing-features
Missing features
2017-11-14 11:19:13 +01:00
Atgeirr Flø Rasmussen 60ee67804b Merge pull request #1330 from akva2/remove_simulators
Remove duplicate EBOS based simulators and legacy simulators that has been replaced
2017-11-13 15:56:33 +01:00
Atgeirr Flø Rasmussen 098e229d2e Merge pull request #1328 from totto82/fixShearVel
Fix size of perf radius and length vectors.
2017-11-13 14:00:07 +01:00
Atgeirr Flø Rasmussen 802c3734bf Merge pull request #1329 from akva2/move_postcommit_to_flow
move post-commit builder to flow+norne
2017-11-13 13:54:18 +01:00
Atgeirr Flø Rasmussen bbdeedc512 Merge pull request #1327 from akva2/add_and_move_tests
Add and move tests
2017-11-13 13:22:06 +01:00
Atgeirr Flø Rasmussen 0ebe3a2c15 Coarsen tolerances for newly added tests. 2017-11-13 11:26:55 +01:00
Atgeirr Flø Rasmussen 29277489e1 Make calling wsolvent() and wpolymer() always ok.
With the existing code, it was a bug to call wsolvent() when the well
was not a gas injector (and similar for wpolymer and water injectors).
Since such calls could happen, this minor fix removes the assertation
failure in those cases.
2017-11-13 10:40:09 +01:00
Atgeirr Flø Rasmussen 7fbf4cf3af Merge pull request #1326 from akva2/remove_duplicate_tests
remove unwanted/duplicate tests
2017-11-10 14:28:10 +01:00
Atgeirr Flø Rasmussen 6591ca89f6 Merge pull request #1324 from totto82/moveApplyWellToRes
Apply the well residuals to cell residuals in SolveJacobianSystem
2017-11-10 09:57:42 +01:00
Atgeirr Flø Rasmussen e7a6e8f2c5 Merge pull request #1322 from totto82/fixResetSolution
BUGFIX Update the solution variable in ebos
2017-11-09 10:35:38 +01:00
Atgeirr Flø Rasmussen a2a0d32e49 Merge pull request #1323 from totto82/refactWell_minimum
Minimized PR: Make the wellModel self-contained
2017-11-08 20:52:37 +01:00
Atgeirr Flø Rasmussen c79dab27d5 Merge pull request #1319 from GitPaean/throw_when_no_umfpack
removing more HAVE_UMFAPACK related in MultisegmentWell_impl
2017-11-07 14:41:52 +01:00
Atgeirr Flø Rasmussen f886a3f0ff Merge pull request #1311 from blattms/use-MatrixBlock-dune-2.5.0
Use MatrixBlock instead of FieldMatrix for DUNE 2.5.0
2017-11-07 13:28:24 +01:00
Atgeirr Flø Rasmussen dde9db92a6 Merge pull request #1316 from andlaus/fix_openmp
flow_ebos: fix the OpenMP functionality
2017-11-03 17:43:49 +01:00
Atgeirr Flø Rasmussen 1d0282c6fe Merge pull request #1317 from GitPaean/throw_when_no_umfpack
giving more information when umfpack is not available.
2017-11-03 14:43:18 +01:00
Atgeirr Flø Rasmussen 63415ebd96 Merge pull request #1314 from andlaus/generic_maintainance
Generic maintainance
2017-11-03 09:38:19 +01:00
Atgeirr Flø Rasmussen 017ce16f5d Merge pull request #1310 from akva2/update_rh_packaging
update redhat packaging
2017-10-25 13:06:54 +02:00
Atgeirr Flø Rasmussen 21dff75bbd Merge pull request #1307 from OPM/revert-1306-pr-1286-reverted
Revert "Revert "Communicate the ebos solution at the beginning of the run method"
2017-10-23 12:45:18 +02:00
Atgeirr Flø Rasmussen 32251461e5 Revert "Revert "Communicate the ebos solution at the beginning of the run method" 2017-10-23 12:40:29 +02:00
Atgeirr Flø Rasmussen f66a270b7d Merge pull request #1305 from GitPaean/checking_use_multisegment
checking use_multisegment_well_ first in BlackoilModelParameters
2017-10-17 21:20:07 +02:00
Atgeirr Flø Rasmussen 0cdd65f3bc Merge pull request #1306 from OPM/pr-1286-reverted
Revert "Communicate the ebos solution at the beginning of the run method
2017-10-17 21:19:43 +02:00
Atgeirr Flø Rasmussen 1858b56b07 Merge pull request #1279 from GitPaean/multisegment_well_refactoring_update
Support for multi-segment wells
2017-10-16 22:46:21 +02:00
Atgeirr Flø Rasmussen 9021571c05 Update swatinit tests to account for bugfix. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen 8779937d3d Update equil regression reference after bugfix.
Also reduce some very coarse tolerances to more reasonable levels.
2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen 3bfe295d62 Bugfix: type for target capillary pressure. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen bbfd5b6413 Merge pull request #1180 from blattms/cleanup-version-ifs
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
2017-10-12 13:28:50 +02:00
Atgeirr Flø Rasmussen f30b95e0e7 Merge pull request #1298 from blattms/cleanup-version-ifs
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
2017-10-12 13:28:45 +02:00
Atgeirr Flø Rasmussen 91cac266b4 Merge pull request #1299 from andlaus/remove_SimulationParameter
do not set the SimulationParameter property anymore
2017-10-12 10:47:03 +02:00
Atgeirr Flø Rasmussen 9206909f75 Merge pull request #1297 from GitPaean/ratio_economic_well
handling WELL workover over ratio economic limit.
2017-10-12 06:52:33 +02:00
Atgeirr Flø Rasmussen aba0b14907 Merge pull request #1301 from andlaus/update_banner2
update flow startup message
2017-10-12 06:49:06 +02:00
Atgeirr Flø Rasmussen df59dbbabf Merge pull request #1177 from alfbr/master
Removing redundant checks from Nexus
2017-10-11 21:57:36 +02:00
Atgeirr Flø Rasmussen d770e16abf Merge pull request #1289 from totto82/removeWellStateFullyImplicitBlackoilDense.hpp
Remove WellStateFullyImplicitBlackoilDense
2017-10-11 18:59:53 +02:00
Atgeirr Flø Rasmussen 67401d7d63 Merge pull request #1287 from andlaus/improve_polymorphic_flow
Improve polymorphic flow
2017-10-11 15:44:54 +02:00
Atgeirr Flø Rasmussen 0264a1f609 Merge pull request #1294 from akva2/there_there_mr_ocd
quell signed/unsigned mismatch warning
2017-10-11 14:07:03 +02:00
Atgeirr Flø Rasmussen 6b00176966 Merge pull request #1296 from GitPaean/removing_GEFAC_missing_features
removing GEFAC from MissingFeatures.cpp
2017-10-11 10:15:36 +02:00
Atgeirr Flø Rasmussen de1be6b5ef Merge pull request #1273 from GitPaean/different_oscillation
avoiding the oscillation treatment applied to well solution
2017-10-10 14:29:04 +02:00
Atgeirr Flø Rasmussen 63b38cfe20 Merge pull request #1281 from totto82/fixRESV
Use pore volume weighted averaged hydrocarbon state in rateConverted.
2017-10-09 13:42:43 +02:00
Atgeirr Flø Rasmussen 8a31121522 Merge pull request #1293 from akva2/include_flow_in_data_update
add flow simulators to the data update script
2017-10-09 12:14:16 +02:00
Atgeirr Flø Rasmussen 1dd86cfc61 Merge pull request #1285 from akva2/quell_warnings
Quell warnings
2017-10-06 15:28:06 +02:00
Atgeirr Flø Rasmussen 26aa03e7ae Merge pull request #1291 from akva2/workaround_eigen_operator_issue
workaround eigen 3.3.2 issue
2017-10-06 14:27:34 +02:00