OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 18:21:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
989 Commits 24 Branches 102 Tags 84 MiB
424ca49696
Commit Graph

989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arne Morten Kvarving
424ca49696 remove serialization templates from BlackoilBrineModule 2020-03-04 15:42:48 +01:00
Arne Morten Kvarving
8480523c88 rename BlackoilBrineModule::initFromDeck to BlackoilBrineModule::initFromState 
no longer any deck usage
 2020-03-04 15:42:15 +01:00
Arne Morten Kvarving
a991da41a3 get rid of deck usage in BlackoilBrineModule 2020-03-04 15:42:06 +01:00
Arne Morten Kvarving
8d033d3afa Merge pull request #599 from akva2/no_serialization_solvent_module 
Remove deck usage from BlackoilSolventModule
 2020-03-04 12:16:44 +01:00
Arne Morten Kvarving
5e391417b5 remove serialization templates from BlackoilSolventModules 2020-03-04 09:59:12 +01:00
Arne Morten Kvarving
19c2c4f981 rename initFromDeck to initFromState 
no deck usage any longer
 2020-03-04 09:59:12 +01:00
Arne Morten Kvarving
cb2aaa3452 Get rid of deck usage in blackoilsolventmodules 2020-03-04 09:59:12 +01:00
Arne Morten Kvarving
913439ec28 Merge pull request #598 from akva2/use_tlmixpar_from_state 
use TLMIXPAR from state
 2020-03-04 09:58:25 +01:00
Arne Morten Kvarving
5ac9e0a2b9 use TLMIXPAR from state 2020-03-04 09:10:41 +01:00
Bård Skaflestad
c0aab4a26a Merge pull request #597 from akva2/no_serialization_fluidsystem 
changed: pass the Schedule through the SolventModule::initFromDeck method
 2020-03-03 21:34:03 -06:00
Arne Morten Kvarving
75454a81cb changed: pass the Schedule through the SolventModule::initFromDeck method 
required for the SolventPvt setup
 2020-03-03 14:26:48 +01:00
Tor Harald Sandve
32bb94624a Merge pull request #589 from akva2/serialization_brine_module 
add mpi serialization for BlackoilBrineModule
 2020-02-17 14:16:21 +01:00
Atgeirr Flø Rasmussen
75e30f83df Merge pull request #593 from atgeirr/fix-warning 
Silence warning also in debug builds.
 2020-02-13 13:01:22 +01:00
Atgeirr Flø Rasmussen
46d4596390 Silence warning also in debug builds. 2020-02-13 09:38:39 +01:00
Atgeirr Flø Rasmussen
2b3d2b1852 Merge pull request #590 from akva2/bump_dune 
bump required dune version to 2.6
 2020-02-08 13:06:10 +01:00
Arne Morten Kvarving
6784db5e71 bump required dune version to 2.6 
and remove compatibility code
 2020-02-06 16:10:06 +01:00
Arne Morten Kvarving
1df01a3730 add mpi serialization for BlackoilBrineModule 2020-02-05 09:13:18 +01:00
Tor Harald Sandve
6da9c03958 Merge pull request #588 from totto82/fix_plmix 
fix plmax for > 1 regions
 2020-01-30 13:54:25 +01:00
Tor Harald Sandve
d0dcaf4409 fix plmax for > 1 regions 2020-01-30 10:30:48 +01:00
Bård Skaflestad
d2f7f5a672 Merge pull request #586 from atgeirr/gather-exception-messages-initialization 
Add and use gatherStrings() for exception messages.
 2020-01-23 11:52:36 +01:00
Atgeirr Flø Rasmussen
7d3690ee99 Add "--parallel-program=X" option to test runner. 
This is done to run test programs in parallel that are not simulations,
and therefore do not produce the standard (for this module) pattern of
outputs for comparison.
 2020-01-23 09:47:34 +01:00
Atgeirr Flø Rasmussen
4a0effe8cc Add and use gatherStrings() for exception messages. 
Ensures user sees any useful exception messages during
initialization.
 2020-01-21 15:33:31 +01:00
Joakim Hove
98f41467c5 Merge pull request #585 from totto82/trinemykk-smartwater 
Trinemykk smartwater
 2020-01-11 06:50:44 +01:00
Tor Harald Sandve
31a48d9cfd quell some warnings 2020-01-10 10:44:53 +01:00
Tor Harald Sandve
fd023ddb74 adapt one-phase model for brine 2020-01-09 13:16:47 +01:00
Trine S. Mykkeltvedt
587fa71e04 renaming saltwater-->brine and review comments 2020-01-07 09:29:58 +01:00
Trine S. Mykkeltvedt
106c4e3616 added saltwater module 2020-01-07 09:29:58 +01:00
Arne Morten Kvarving
44aeebb7fe Merge pull request #584 from akva2/make_static_data_public 
Add serialization templates
 2020-01-06 12:43:43 +01:00
Arne Morten Kvarving
f9370183f3 changed: add serialization templates to BlackoilFoamModule 2020-01-06 11:06:05 +01:00
Arne Morten Kvarving
69426ba768 changed: add serialization templates to BlackoilPolymerModule 2020-01-06 11:06:05 +01:00
Arne Morten Kvarving
27e7b42ae9 changed: add serialization templates to BlackoilSolventModule 2020-01-06 11:06:05 +01:00
Atgeirr Flø Rasmussen
fcc86d71c8 Merge pull request #581 from joakim-hove/refactor-get-tl-parameters 
Use DeckItem::hasValue() before accessing Todd Langstaff parameters
 2019-11-18 09:15:45 +01:00
Joakim Hove
8b6f695a9d Use DeckItem::hasValue() before accessing Todd Langstaff parameters 2019-11-17 17:04:59 +01:00
Arne Morten Kvarving
bf3bcf1259 Merge pull request #577 from blattms/fix-one-phase-namespace 
Move BlackOilOnePhaseIndices to Opm namespace
 2019-10-30 09:28:55 +01:00
Markus Blatt
1e9a200128 Change Ewoms to Opm in namespace end comments 2019-10-30 08:49:28 +01:00
Markus Blatt
784afe5e70 Move BlackOilOnePhaseIndices to Opm namespace 
to make it consistent with the rest. #530 development
must have been started before the renaming in #532
and somehow the old namespace survived.
 2019-10-29 15:53:00 +01:00
Markus Blatt
e4fb8f5994 Merge pull request #570 from blattms/fix-alugrid-master 
Fixes g++-8's problems with return type deduction (ALUGrid master).
 2019-10-24 19:23:42 +02:00
Markus Blatt
f9c4f870c3 Fixes g++-8's problems with return type deduction (ALUGrid master). 
Fixes the following compile error in the tests for ALUGrid master.
Tested with DUNE 2.4-2.7
```
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc: In function ‘void testTetrahedron()’:
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:191:32: error: unable to deduce ‘auto*’ from ‘Dune::ALU3dGridFactory< <template-parameter-1-1> >::createGrid() [with ALUGrid = Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)0, (Dune::ALUGridRefinementType)1>; Dune::ALU3dGridFactory< <template-parameter-1-1> >::GridPtrType = Dune::ToUniquePtr<Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)0, (Dune::ALUGridRefinementType)1> >]()’
     auto *grid = gf.createGrid();
                                ^
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:191:32: note:   mismatched types ‘auto*’ and ‘Dune::ToUniquePtr<Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)0, (Dune::ALUGridRefinementType)1> >’
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:196:12: error: type ‘<type error>’ argument given to ‘delete’, expected pointer
     delete grid;
            ^~~~
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc: In function ‘void testCube()’:
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:286:32: error: unable to deduce ‘auto*’ from ‘Dune::ALU3dGridFactory< <template-parameter-1-1> >::createGrid() [with ALUGrid = Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)1, (Dune::ALUGridRefinementType)1>; Dune::ALU3dGridFactory< <template-parameter-1-1> >::GridPtrType = Dune::ToUniquePtr<Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)1, (Dune::ALUGridRefinementType)1> >]()’
     auto *grid = gf.createGrid();
                                ^
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:286:32: note:   mismatched types ‘auto*’ and ‘Dune::ToUniquePtr<Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)1, (Dune::ALUGridRefinementType)1> >’
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:291:12: error: type ‘<type error>’ argument given to ‘delete’, expected pointer
     delete grid;
            ^~~~
```
 2019-10-24 15:54:18 +02:00
Markus Blatt
44a1bf3463 Merge pull request #569 from blattms/update-remaining-ewoms-header-locs-master 
Fixed missing conversion ewoms->opm-models in header includes,
 2019-10-24 15:21:29 +02:00
Markus Blatt
431d5718e2 Fixed missing conversion ewoms->opm-models in header includes, 2019-10-24 14:19:54 +02:00
Atgeirr Flø Rasmussen
e50de81eba Merge pull request #561 from akva2/janitoring 
quell unused parameter warning
 2019-10-18 09:26:43 +02:00
dr-robertk
a56e2294d1 Merge pull request #554 from totto82/enableRockcompFlow 
enable rockcomp in flow
 2019-10-17 14:12:11 +02:00
Arne Morten Kvarving
34bfa10f99 quell unused parameter warning 2019-10-17 10:16:38 +02:00
dr-robertk
20b2c57829 Merge pull request #553 from totto82/sync_logging 
Adapt to make logging possible from ebos
 2019-10-15 14:14:25 +02:00
Atgeirr Flø Rasmussen
42e60438f8 Merge pull request #555 from akva2/fix_assert_timestep 
fixed: do not assert for positive timestep when simulation is finished
 2019-10-14 10:24:35 +02:00
Arne Morten Kvarving
29ced177c4 fixed: do not assert for positive timestep when simulation is finished 2019-10-14 09:20:47 +02:00
Atgeirr Flø Rasmussen
2c8d0a95fc Merge pull request #530 from atgeirr/enable-onephase-revised 
Enable onephase revised
 2019-10-11 21:02:41 +02:00
Atgeirr Flø Rasmussen
b9509cdf78 Add or fix foam-related indices for one- and two-phase cases. 2019-10-10 16:08:04 +02:00
Atgeirr Flø Rasmussen
bc0eaca943 Remove buggy call to setEnthalpy(). 2019-10-10 15:55:04 +02:00
Atgeirr Flø Rasmussen
7fe1ad5c69 Fixed error message and reinstated dummy enthalpy update. 2019-10-10 09:54:43 +02:00