OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-29 20:43:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
955 Commits 24 Branches 101 Tags 75 MiB
1e9a200128
Commit Graph

955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Arne Morten Kvarving
88a5e1db06 changed: ewoms/models/richards -> opm/models/richards 2019-09-19 11:08:59 +02:00
Arne Morten Kvarving
f558f5d98b changed: ewoms/models/pvs -> opm/models/pvs 2019-09-19 11:07:52 +02:00
Arne Morten Kvarving
a5d4b823f5 changed: ewoms/nonlinear -> opm/models/nonlinear 2019-09-19 11:04:36 +02:00
Arne Morten Kvarving
09cdd3aadd changed: ewoms/models/ncp -> opm/models/ncp 2019-09-19 11:03:17 +02:00
Arne Morten Kvarving
d302771e6c changed: ewoms/io -> opm/models/io 2019-09-19 10:59:55 +02:00
Arne Morten Kvarving
9247935c8a changed: ewoms/models/immiscible -> opm/models/immiscible 2019-09-19 10:51:11 +02:00
Arne Morten Kvarving
72b5e42016 changed: ewoms/models/flash -> opm/models/flash 2019-09-19 10:32:32 +02:00
Arne Morten Kvarving
16f4bdcf02 changed: ewoms/models/discretefracture -> opm/models/discretefacture 2019-09-19 10:29:58 +02:00
Arne Morten Kvarving
474ae4ded8 changed: ewoms/disc -> opm/models/discretization 2019-09-19 10:28:26 +02:00
Arne Morten Kvarving
f48ae0f7f1 changed: ewoms/models/blackoil -> opm/models/blackoil 2019-09-19 10:19:54 +02:00
Arne Morten Kvarving
17e8fa6574 changed: rename ewoms/models/common -> opm/models/common 2019-09-19 10:14:44 +02:00
Arne Morten Kvarving
e01f712294 changed: ewoms/common -> opm/models/utils 2019-09-19 10:14:17 +02:00
Atgeirr Flø Rasmussen
e37cbe32d6 Merge pull request #549 from blattms/scalarproduct-dune-2.7 
Adapt to constification of Scalarproduct for 2.7.0 or newer.
 2019-09-19 09:40:07 +02:00
Atgeirr Flø Rasmussen
9f40d6405f Merge pull request #538 from akva2/rename_parallel 
changed: ewoms/parallel -> opm/models/parallel
 2019-09-18 15:40:42 +02:00
Markus Blatt
ce3e5c2dfe Adapt to constification of Scalarproduct for 2.7.0 or newer. 
Scalarproduct::norm and Scalarproduct::dot are const in those
versions and these changes are not backwards compatible.
 2019-09-17 18:04:30 +02:00
Arne Morten Kvarving
d8723dc9ce changed: ewoms/parallel -> opm/models/parallel 2019-09-16 09:48:55 +02:00