Bård Skaflestad
e22b0944dd
Merge pull request #3632 from vkip/correct_rft_depths_and_pressures
...
Make DEPTH and PRESSURE contain the cell values
2023-08-16 17:50:32 +02:00
Bård Skaflestad
58ff8944c4
Merge pull request #3636 from akva2/mech_bc
...
Add support for MECH boundary conditions
2023-08-16 16:52:21 +02:00
Bård Skaflestad
0c037db51c
Merge pull request #3635 from akva2/add_strequil
...
Add STREQUIL keyword and internalization
2023-08-16 16:12:19 +02:00
Bård Skaflestad
6e4c37d05f
Merge pull request #3634 from akva2/mech_runspec
...
-- added MECH to runspec
2023-08-16 16:11:38 +02:00
hnil
614d71666d
add mech boundary conditions
2023-08-16 15:56:45 +02:00
hnil
a0ba0be7cc
-- added stress equilibrium data for initconfig
2023-08-16 15:13:38 +02:00
Arne Morten Kvarving
111aa44936
changed: refactorize Equil class into a container template over a record type
...
make Equil a type alias for EquilContainer<EquilRecord>
2023-08-16 15:13:38 +02:00
Arne Morten Kvarving
df6345e15d
EquilRecord: add in-class initializers
...
then we can default the default constructor
2023-08-16 15:13:38 +02:00
Arne Morten Kvarving
a93e285552
changed: add EquilRecord::serializationTestObject
...
and use this in Equil::serializationTestObject()
2023-08-16 15:13:38 +02:00
Arne Morten Kvarving
89f59e0050
changed: add a DeckRecord constructor for EquilRecord and use this in Equil
2023-08-16 15:13:38 +02:00
Bård Skaflestad
3fd1815078
Merge pull request #3633 from akva2/bcconfig_tests
...
added: basic tests for BCCON / BCPROP
2023-08-16 15:06:52 +02:00
Vegard Kippe
12c20f4188
Removing unused parameter
2023-08-16 14:44:16 +02:00
hnil
980a160651
-- added MECH to runspec
2023-08-16 14:15:23 +02:00
Arne Morten Kvarving
bd3328b15c
added: basic tests for BCCON / BCPROP
2023-08-16 13:58:39 +02:00
Vegard Kippe
c97ef332f0
Removing duplicate lines..
2023-08-16 13:22:32 +02:00
Vegard Kippe
25cf268b56
Removing unnecessary changes to PLT record (only renaming to conn_depth_ and conn_pressure_ for clarity, as suggested)
2023-08-16 13:20:53 +02:00
Markus Blatt
d23d2288c7
Merge pull request #3629 from bska/reclassify-PCx-keywords
...
Properly Classify Capillary Pressure Keywords
2023-08-16 10:18:21 +02:00
Vegard Kippe
8031eaf9d0
Make DEPTH and PRESSURE contain the cell values, not the connection values (which are reported in CONDEPTH/CONPRES when PLTs are requested)
2023-08-16 09:41:28 +02:00
Bård Skaflestad
f68fe9b484
Properly Classify Capillary Pressure Keywords
...
These are not directionally dependent, and they have a unit string
of 'Pressure'. This didn't use to matter, but upcoming changes
will depend on the unit string being correct.
2023-08-15 17:27:47 +02:00
Bård Skaflestad
5495eca413
Properly Remove 'satfunc' Macro
...
The macro should not escape the FieldProps.hpp header.
2023-08-15 17:27:47 +02:00
Bård Skaflestad
cda61b46c0
Remove sogcr_shit Helper Array
...
This array became unused in commit 146be0aa2
and should have been
removed at that time.
2023-08-15 17:27:47 +02:00
Bård Skaflestad
4f3d22f655
Merge pull request #3631 from akva2/tracy_macro_definitions
...
TimingMacros: add definitions for using tracy
2023-08-15 17:18:42 +02:00
Arne Morten Kvarving
89deeea9d5
TimingMacros: add definitions for using tracy
2023-08-15 15:55:03 +02:00
Atgeirr Flø Rasmussen
ed8489ada6
Merge pull request #3630 from svenn-t/h2store_new_visc
...
Improved gas viscosity model for hydrogen
2023-08-15 08:31:01 +02:00
Svenn Tveit
c6cd71df08
Improved viscosity model for hydrogen.
...
Model from Muzney et al., J. Chem. Eng. Data 2013, 58, 4, 969–979 implemented. Same as NIST and Coolprop.
2023-08-14 12:31:01 +02:00
Bård Skaflestad
f95cbea921
Merge pull request #3625 from GitPaean/adding_unit_ppm
...
adding unit PPM
2023-08-10 16:29:34 +02:00
Kai Bao
22de6c1480
adding unit PPM
...
Parts per million (ppm). We are not distinguishing PPM volume or PPM
mass, or other forms. Will update when it comes to be necessary.
2023-08-10 15:23:14 +02:00
Bård Skaflestad
0895983ac1
Merge pull request #3619 from bska/field-props-janitor
...
Preventive Maintenance of FieldProps Class
2023-08-09 17:06:08 +02:00
Bård Skaflestad
3caf79a99a
Disambiguate Potentially Dependent Names
...
It's probably not strictly necessary, but better safe than sorry.
2023-08-09 14:37:57 +02:00
Bård Skaflestad
027c15800a
Preventive Maintenance of FieldProps Class
...
In particular:
- Order include statements
- Simplify logic
- Adjust whitespace
This is in preparation of making FIP* array names unique only up to
the first six characters (i.e., "FIP" + at most three others).
2023-08-09 14:37:57 +02:00
Kai Bao
144faaf645
Merge pull request #3623 from atgeirr/allow-default-network-nodes
...
Allow implicit creation of production network nodes.
2023-08-09 14:31:50 +02:00
Atgeirr Flø Rasmussen
67c7f858a4
Rename add_node() -> update_node().
2023-08-09 13:28:24 +02:00
Bård Skaflestad
aab5d1125b
Merge pull request #3584 from svenn-t/unittests
...
Component unit tests and some minor updates
2023-08-08 18:14:37 +02:00
Bård Skaflestad
40d806987c
Merge pull request #3624 from blattms/move-lambda-prevent-warn
...
[janitor] Move lambda to prevent warning.
2023-08-08 17:22:19 +02:00
Markus Blatt
ee30e6f42d
[janitor] Move lambda to prevent warning.
...
Fixes the warning introduced by #3605
2023-08-08 16:13:40 +02:00
Atgeirr Flø Rasmussen
508ed49388
Add test for defaulted network nodes.
2023-08-08 16:00:21 +02:00
Atgeirr Flø Rasmussen
f3d1eea2dc
Allow implicit creation of nodes.
...
Nodes with default properties do not need any
NODEPROP entries and can be implicitly created
by being referred to in BRANPROP.
2023-08-08 15:46:57 +02:00
Atgeirr Flø Rasmussen
fb37377324
Merge pull request #3605 from blattms/fatal-section-topology-errors
...
Register errors concerning section topology in ErrorGuard.
2023-08-08 11:30:02 +02:00
Markus Blatt
395d85fb55
Merge pull request #3618 from bska/ordered-map-string-view
...
Implement OrderedMap in Terms of String_View
2023-08-08 11:14:45 +02:00
Bård Skaflestad
7533eadb2e
Implement OrderedMap in Terms of String_View
...
We don't need std::string in the hashing operations, so lift those
restrictions.
2023-08-07 17:04:13 +02:00
Atgeirr Flø Rasmussen
e51c5cb4dd
Merge pull request #3616 from GitPaean/removing_duplicated_clang_key
...
removing duplicated key in .clang-format
2023-08-07 10:09:20 +02:00
Kai Bao
2551050974
removing duplicated key in .clang-format
2023-08-04 15:00:56 +02:00
Bård Skaflestad
f0c5ed5f83
Merge pull request #3613 from akva2/grouptests_raw
...
GroupTests: use raw string literals
2023-08-01 23:33:31 +02:00
Arne Morten Kvarving
bd59b6caab
GroupTests: remove leading whitespace in decks
2023-08-01 14:38:54 +02:00
Arne Morten Kvarving
2ba0caab7f
GroupTests: use raw string literals
2023-08-01 14:38:54 +02:00
Atgeirr Flø Rasmussen
9b22346255
Merge pull request #3612 from akva2/janitoring
...
quell unused parameter warnings
2023-07-31 12:50:02 +02:00
Arne Morten Kvarving
b1cf35168a
quell unused parameter warnings
2023-07-31 08:37:58 +02:00
Atgeirr Flø Rasmussen
a50513c971
Merge pull request #3585 from hnil/twophaseFixes
...
Fixes for two-phase relperm
2023-07-26 15:31:02 +02:00
hnil
6de987eaec
fixed after review
2023-07-26 14:09:15 +02:00
Markus Blatt
3eddcb8936
Merge pull request #3607 from blattms/rename-time-step-breakdown
...
Rename LinearTimeSteppingBreakdown to TimeSteppingBreakdown
2023-07-26 09:49:15 +02:00