Commit Graph
100 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen ffd1f76c7c Merge pull request #1474 from akva2/data_to_tests
data -> tests
2018-05-14 07:36:33 +02:00
Atgeirr Flø Rasmussen f9c1fbcbe6 Make sure we (re-)throw MatrixBlockError also in the serial case. 2018-04-24 14:32:43 +02:00
Atgeirr Flø Rasmussen 950148d66e Merge pull request #1463 from akva2/update_banners
bring banners into the new ssl enabled world
2018-04-20 12:33:57 +02:00
Atgeirr Flø Rasmussen d9b215ec70 Merge pull request #1459 from atgeirr/update-changelog
Updated to reflect changes from the last few months.
2018-04-13 14:57:29 +02:00
Atgeirr Flø Rasmussen 07cdb7d4be Updated to reflect changes from the last few months. 2018-04-13 14:33:11 +02:00
Atgeirr Flø Rasmussen 6f72e325f1 Merge pull request #1457 from joakim-hove/vfp-no-init
Use VFPProdTable constructor
2018-04-13 11:31:58 +02:00
Atgeirr Flø Rasmussen 63dabb4777 Merge pull request #1450 from GitPaean/update_VFP_related
adapting to the change related to VFP from the parser.
2018-04-12 11:20:21 +02:00
Atgeirr Flø Rasmussen d211c1927f Merge pull request #1393 from andlaus/minimal_changes_for_blackoil_energy
Minimal changes for blackoil energy
2018-04-06 16:11:57 +02:00
Atgeirr Flø Rasmussen a32a5b24eb Merge pull request #1448 from bska/missing-include
Include <sstream> for Class "ostringstream"
2018-04-04 19:41:17 +02:00
Atgeirr Flø Rasmussen 9897ae361e Merge pull request #1428 from totto82/relax_convergence
Add option for relaxed CNV tolerance
2018-04-04 16:38:47 +02:00
Atgeirr Flø Rasmussen ce308455ab Merge pull request #1433 from totto82/fix_reportStep
Add reportStep method in SimulatorReport and use it
2018-04-04 15:23:01 +02:00
Atgeirr Flø Rasmussen 4f39cdc9c9 Merge pull request #1439 from GitPaean/silencing_warning_extra_
silencing warning related to extra ; from BlackoilAmg
2018-04-04 14:32:18 +02:00
Atgeirr Flø Rasmussen 482c63e274 Merge pull request #1446 from GitPaean/removing_flowmainpolymer
Removing flowmainpolymer
2018-04-04 14:30:37 +02:00
Atgeirr Flø Rasmussen b9c5d26cdc Merge pull request #1447 from akva2/fix_tests_data
setup-opm-data -> setup-opm-tests
2018-04-03 13:16:42 +02:00
Atgeirr Flø Rasmussen b9d7b69bd6 Merge pull request #1444 from akva2/missing_data_to_tests
fixed: missing opm-data -> opm-tests references
2018-04-03 12:31:47 +02:00
Atgeirr Flø Rasmussen 6f18f7115f Merge pull request #1438 from GitPaean/fixing_testtest_multmatrixtransposed
fixing test_multmatrixtransposed
2018-03-13 13:32:17 +01:00
Atgeirr Flø Rasmussen 79bc265de8 Merge pull request #1431 from GitPaean/silencing_warning_from_opm_common_pr_348
adding POLYMW to the injectorType determination
2018-03-10 13:19:37 +01:00
Atgeirr Flø Rasmussen 14645fb1b8 Merge pull request #1429 from akva2/remove_repo_update_data
changed: remove repos from regression data update script
2018-03-09 14:15:24 +01:00
Atgeirr Flø Rasmussen 1380564256 Merge pull request #1425 from totto82/fix_enable_storage_term_false
Bugfix. enableStorageCache=false
2018-03-09 14:13:10 +01:00
Atgeirr Flø Rasmussen cef255b212 Merge pull request #1430 from atgeirr/fix-boost-dyn-link
Leave BOOST_TEST_DYN_LINK setting to the build system.
2018-03-09 14:12:09 +01:00
Atgeirr Flø Rasmussen 42c41efa4e Leave BOOST_TEST_DYN_LINK setting to the build system. 2018-03-09 12:56:51 +01:00
Atgeirr Flø Rasmussen 8070e9d229 Merge pull request #1397 from blattms/system-amg-rebased
Add support for CPR (and variants) for flow_ebos
2018-03-09 12:46:27 +01:00
Atgeirr Flø Rasmussen d4096f43f7 Merge pull request #1427 from GitPaean/fixing_trans_pvto_test
fixing test_transmissibilitymultipliers
2018-03-08 08:48:38 +01:00
Atgeirr Flø Rasmussen 717a9180e5 Merge pull request #1422 from blattms/resort-to-split-operator
If requested use matrix with well contributions only for the preconditioner.
2018-03-07 14:33:09 +01:00
Atgeirr Flø Rasmussen 13b7a4a426 Merge pull request #1423 from andlaus/fix_icc
Fix icc
2018-03-05 09:20:46 +01:00
Atgeirr Flø Rasmussen b276aaa16b Changes made to test variations of matrix vs matrixless(ish) operator. 2018-03-02 14:22:59 +01:00
Atgeirr Flø Rasmussen 0db0e83843 Merge pull request #1414 from GitPaean/hack_to_fix_weird_well_rate_situation
trying to fix a problematic situation when updateWellState
2018-02-28 16:00:42 +01:00
Atgeirr Flø Rasmussen 320ae1b229 Merge pull request #1416 from GitPaean/support_oil_water_polymer
trying to add the functionality to handle oil/water polymer
2018-02-28 12:30:37 +01:00
Atgeirr Flø Rasmussen 10887ddaca Merge pull request #1183 from blattms/matrix-with-well-connections
Add possibility to use matrix with well connections for preconditioner.
2018-02-27 16:25:06 +01:00
Atgeirr Flø Rasmussen f0b8e586a6 Merge pull request #1405 from GitPaean/populating_reservoir_rated_output
[WIP] Populating reservoir rate related output
2018-02-21 17:11:40 +01:00
Atgeirr Flø Rasmussen d4ca28ec61 Merge pull request #1409 from totto82/fix_default_output_dir
Fix default output dir
2018-02-19 17:04:35 +01:00
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
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
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
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