Bård Skaflestad
9bf9f65f63
Merge pull request #3466 from blattms/fix-compiler-warnings
...
Fix compiler warnings
2023-04-12 14:03:20 +02:00
Bård Skaflestad
b9c1b39a61
Merge pull request #3468 from GitPaean/reverting_aquct_commit
...
Revert "only using the AQUCT and AQUFETP in SOLUTION section"
2023-04-12 13:24:34 +02:00
Kai Bao
0eea937f3f
Revert "only using the AQUCT and AQUFETP in SOLUTION section"
...
This reverts commit a89136f1f2
.
2023-04-12 12:39:24 +02:00
Arne Morten Kvarving
dcd5ecf0d1
Merge pull request #3414 from akva2/require_dune_2.7
...
minimum dune version required is now 2.7
2023-04-12 09:19:14 +02:00
Markus Blatt
888f3644f7
Fixed warning about muliline comment.
2023-04-11 17:42:17 +02:00
Markus Blatt
adc11caf99
Fixes warning about set but unused variable.
2023-04-11 17:42:17 +02:00
Markus Blatt
db1c823cbb
Fixes warnings about initialization order.
2023-04-11 17:42:17 +02:00
Markus Blatt
580bb30f8e
Fixes shadowed variable warning.
2023-04-11 17:35:13 +02:00
Markus Blatt
24d25f7be7
Merge pull request #3384 from plgbrts/well-traj
...
Grid independent well specification
2023-04-10 07:40:08 +02:00
Paul Egberts
694bb016a7
Two more small fixes
2023-04-05 15:58:17 +02:00
Paul Egberts
e781a99ce4
update of license to only gplv3
2023-04-04 22:02:18 +02:00
Paul Egberts
a6d39275c7
code improvements following suggestions of Markus
2023-04-04 21:49:03 +02:00
Markus Blatt
df4c92a8d7
Merge pull request #3461 from blattms/MINPVFIL
...
Minpvfi
2023-04-03 17:45:46 +02:00
Markus Blatt
9d995a40e3
Fix ConstructorMINPV.
...
Exception is now already thrown in createMinpvDefaultCPDeck.
2023-04-03 17:41:22 +02:00
OPMUSER
699f7ad695
Update ConstructorMINPV Test
...
Update ConstructorMINPV Test for MINPV/MINPORV
2023-04-03 16:37:33 +02:00
OPMUSER
f99e7dbc29
Update keyword_list.cmake
...
Remove MINPVFIL from keyword_list.cmake.
2023-04-03 16:37:33 +02:00
OPMUSER
1fac541b6e
Remove MINPVFIL - WIP
...
MINPVFIL is an OPM Flow specific keyword that is not used by the simulator, and thus it should be deleted.
Previously, we moved the checks that only allow either the MINPV or MINPORV keywords to be used in the input deck to the JSON keyword files. This was done to avoid confusion over which global limits are being applied.
Note that if the MINPVV keyword is also in the input deck then these limits are applied post processing the global limits defined by the MINPV/MINPORV keywords. This behavior is unchanged by this PR.
The PR is marked as WIP to give developers time to object for the removal of MINPVFIL keyword.
2023-04-03 16:37:33 +02:00
Bård Skaflestad
00089a888b
Merge pull request #3460 from GitPaean/const_waterReferceDensity
...
add const for WaterPvtMultiplexer::waterReferenceDensity(unsigned)
2023-04-03 16:00:45 +02:00
Kai Bao
548881395e
add const for WaterPvtMultiplexer::waterReferenceDensity(unsigned)
2023-04-03 12:59:43 +02:00
Paul Egberts
7c05ccc553
Merge branch 'well-traj' of https://github.com/blattms/opm-common into well-traj-markus
...
Use Markus' rebased version
2023-04-03 12:11:47 +02:00
Bård Skaflestad
200b6a2cbc
Merge pull request #3456 from blattms/support-pinch-maxgap
...
EclipseGrid: make option 3 (MAX_EMPTY_GAP) of PINCH available
2023-03-30 15:18:01 +02:00
Markus Blatt
3706aae429
Fixed default initialization of EclipseGrid.
2023-03-30 14:03:01 +02:00
Paul Egberts
22a7a81597
Removal of unused files
2023-03-29 17:24:13 +02:00
Paul Egberts
7b0156f6cc
Placed ResInsight code in separate namespace called external
2023-03-29 17:24:13 +02:00
Paul Egberts
b9012d85a3
removal of unused files
2023-03-29 17:24:13 +02:00
Paul Egberts
367ffb1aa2
added missing *.inl files to make file
2023-03-29 17:24:13 +02:00
Paul Egberts
d0fc099d75
explicit listing of header files, removed globbing
2023-03-29 17:24:11 +02:00
Paul Egberts
1d07b6ad9f
attempt to fix build error
2023-03-29 17:23:21 +02:00
Paul Egberts
e7e1411146
added resinsight include files in cmake file part 2
2023-03-29 17:23:21 +02:00
Paul Egberts
7ebfb0b86f
added resinsight include files in cmake file
2023-03-29 17:23:21 +02:00
Paul Egberts
98f41e2e2e
cmake file fix
2023-03-29 17:23:21 +02:00
Paul Egberts
160c5bee10
added #include <string>
2023-03-29 17:23:21 +02:00
Paul Egberts
8091ea73ae
repairing cmake file
2023-03-29 17:23:14 +02:00
Paul Egberts
e7ae500032
added test for calculation of CFs and IJK coordinates of intersected cells
2023-03-29 17:20:57 +02:00
Paul Egberts
3ba31d4304
finalizing and cleaning up
2023-03-29 17:20:54 +02:00
Paul Egberts
46f412e60a
Processing WELTRAJ/COMPTRAJ; Calculation of intersected cells and CFs
2023-03-29 17:05:39 +02:00
Paul Egberts
88e58ba5d2
finalizing keywords COMPTRAJ and WELTRAJ
2023-03-29 17:05:39 +02:00
Paul Egberts
067e645e22
This is a combination of 5 commits.
...
Reorganizing and renaming files
2023-03-29 17:05:39 +02:00
Paul Egberts
5c9a59644f
well trajectory calculation (re)using resinsight code
2023-03-29 17:05:37 +02:00
Paul Egberts
532b626e56
try out code
2023-03-29 17:03:56 +02:00
Paul Egberts
65eff452e3
reading new tables for grid independent well specification
2023-03-29 17:03:56 +02:00
Bård Skaflestad
0be5bee7c4
Merge pull request #3457 from totto82/addThermalBC
...
add THERMAL option to BC
2023-03-29 14:07:45 +02:00
Bård Skaflestad
cbb808b579
Merge pull request #3455 from totto82/diffc_co2store
...
Support DIFFCGAS and DIFFCWAT for the CO2STORE module
2023-03-29 13:41:40 +02:00
Tor Harald Sandve
b8ee8d8652
Merge pull request #3451 from totto82/gaswater_hyst
...
Enable hysteresis in water gas 2p model
2023-03-28 15:48:59 +02:00
Markus Blatt
ea64c29001
Added missing forward declaration to make TransMult.hpp usable standalone.
2023-03-28 15:40:21 +02:00
Tor Harald Sandve
8c8851039c
Add hysteresis in water gas 2p model
2023-03-28 12:39:01 +02:00
Tor Harald Sandve
3cd2539b7a
add THERMAL option to BC
2023-03-28 12:04:24 +02:00
Markus Blatt
055547c709
EclipseGrid: make option 3 (MAX_EMPTY_GAP) of PINCH available
...
This is needed to prevent creation of NNCs if the the empty gap created
by pinched out cells is larger than this threshold.
2023-03-28 11:55:14 +02:00
Tor Harald Sandve
4ca0daf4bb
add files
2023-03-27 15:01:55 +02:00
Tor Harald Sandve
bf7cef4ebd
Support DIFFCGAS and DIFFCWAT for the CO2STORE module
2023-03-27 10:15:54 +02:00