OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-21 23:02:58 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,271 Commits 24 Branches 102 Tags 90 MiB
dc6141af13
Commit Graph

1271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
8977d64bc6 Whitespace fixes and style consistency. 2019-10-09 14:45:17 +02:00
Atgeirr Flø Rasmussen
544aeea40b Minor modifications requested in review. 2019-10-09 14:45:17 +02:00
Atgeirr Flø Rasmussen
b4bd3d66e4 Add braces where necessary (not just a style change). 2019-10-09 14:45:17 +02:00
hnil
ee482e87a6 change according to comments in pullrequest 2019-10-09 14:45:17 +02:00
hnil
3a56213ed8 Added several checks to ensure timestep>0 2019-10-09 14:45:17 +02:00
hnil
d9b981e059 made onephase water runs possible 2019-10-09 14:45:17 +02:00
hnil
c1640aaf3e avoid setting entalpy in non active phases (assert will else be broken) 2019-10-09 14:45:17 +02:00
hnil
efe3313f85 not adapting any variables in onephase 2019-10-09 14:45:17 +02:00
hnil
8572e1d108 make it possible with only one phase in genneral? 2019-10-09 14:45:16 +02:00
hnil
9c0520aeeb added onephase indices 2019-10-09 14:45:16 +02:00
hnil
17e9a73f81 tried to enable onephase with water as phase 2019-10-09 14:45:16 +02:00
Tor Harald Sandve
8969895d52 Merge pull request #552 from totto82/fix_polymer 
fix bug in PLYROCK
 2019-10-09 11:01:35 +02:00
Tor Harald Sandve
fd10e1343e Merge pull request #551 from akva2/janitoring 
quell some unused parameter warnings
 2019-10-09 11:00:34 +02:00
Tor Harald Sandve
73692f2276 enable rockcomp in flow 2019-10-08 15:50:27 +02:00
Tor Harald Sandve
a245f70283 Adapt to make logging possible from ebos 2019-10-08 14:51:28 +02:00
Tor Harald Sandve
f9bb897f15 fix bug in PLYROCK 2019-10-07 15:17:36 +02:00
Arne Morten Kvarving
277d272f7f quell some unused parameter warnings 2019-09-20 12:44:50 +02:00
Atgeirr Flø Rasmussen
596cb21e20 Merge pull request #550 from akva2/ewoms_to_models 
Move ewoms/* into an opm/models/* structure
 2019-09-19 14:23:42 +02:00