OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,433 Commits 18 Branches 75 Tags
5a342db5a35cf72b0cc0fd675d6dc90f4a81fd22
Commit Graph

14433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul
5a342db5a3 removed an include 2023-08-23 16:16:49 +02:00
Paul
4c1ea1f478 Enable standard network using GRUPNET 2023-08-23 16:16:48 +02:00
Markus Blatt
4ab9de18ed Merge pull request #3649 from GitPaean/fixing_numerical_aquifer 
not considering numerical aquifers cells inside reservoir
 2023-08-23 15:52:19 +02:00
Kai Bao
06a4d3ef51 not considering numerical aquifers cells inside reservoir 
since we forcefully make numerical aquifer cells active. If a connection
cells is neighboring a numerical aquifer cell, we should be able to create
NNC to connection the cell and the nuermical aquifer cell.
 2023-08-23 14:24:12 +02:00
Bård Skaflestad
5c09a1ed62 Merge pull request #3614 from GitPaean/udq_winjclcn 
handle UDQ value for WINJFCNC
 2023-08-23 13:37:18 +02:00
Kai Bao
6a25eadee7 using PPM as the unit for VOL_CONCENTRATION in keyword WINJFCNC 2023-08-23 11:44:13 +02:00
Kai Bao
9a7147bead handle UDQ value for WINJFCNC 
restarting related is missing for now
 2023-08-23 11:44:13 +02:00
Bård Skaflestad
e8502c2d6d Merge pull request #3650 from akva2/init_file_restore_order 
fixed: restore order of 'standard' fields in init file
 2023-08-23 11:29:20 +02:00
Arne Morten Kvarving
0e99224e12 fixed: restore order of 'standard' fields in init file 
we want to match the commercial simulator here
 2023-08-23 10:46:03 +02:00
Markus Blatt
45ec2f9c89 Merge pull request #3645 from blattms/fix_esmry-scale-factors 
Pevent undefined behavior of ESMry scale factors for values <=0.
 2023-08-22 07:21:20 +02:00
Markus Blatt
d9cdfac302 Merge pull request #3639 from bska/multregt-revise-nnc-identification 
Use Existing Cartesian-to-IJK Functionality to Determine NNCs in MULTREGT
 2023-08-22 07:19:16 +02:00
Markus Blatt
6b194d8758 Merge pull request #3644 from bska/multregt-no-pointers 
Switch to Numeric Indices for Record References
 2023-08-22 07:18:13 +02:00
Bård Skaflestad
f32ff86638 Use Existing Cartesian-to-IJK Functionality 
This commit replaces the data members 'nx', 'ny', and 'nz' with a
copy of the GridDims object passed as an argument to the
constructor.  In turn, this enables using GridDims::getIJK() to
compute the cell's IJK tuple from its global Cartesian index instead
of implementing the same calculation locally (and incorrectly).

While here, also include the layer index (K) in determining whether
or not a connection is an NNC, and do this just once instead of once
for each MULTREGT record.  Cells (I,J,K) and (I,J,K+3) might be
connected across pinched-out layers and for the purposes of MULTREGT
that connection should be treated as an NNC.
 2023-08-21 11:41:03 +02:00
Bård Skaflestad
2c74d036d6 Tidy Up MULTREGT Scanner Files 
In particular, ensure that we include all requisite headers, hide
type aliases that are not needed outside the class, consistently use
std::size_t, split a few long lines, and switch to range-for in one
location.
 2023-08-21 11:41:03 +02:00
Bård Skaflestad
2dc650ff72 Switch to Numeric Indices for Record References 
A numeric index serves the same purpose as a pointer in this very
specific instance and also has the benefit of being easily
transferable between processes.  This, in turn, means we can remove
the 'getSearchMap()' and 'constructSearchMap()' member functions.
 2023-08-21 11:40:44 +02:00
Markus Blatt
07d1d5f161 Pevent undefined behavior of ESMry scale factors for values <=0. 
We use log10 of the value to compute the scale factor. This only makes
sense for positive values. For zero it returns -HUGE_VAL and for
negative values it returns nan where supported.

Unfortunately on some platforms (e.g. mips64el) further operations in
nan resulted in values so large that the scale factors were to large
for the columns. This resulted in invalid_argument exceptions in
strtod which were hard to debug. Out of pure luck on many platforms
the scale factors still were zero in this case.

To fix this we now always use a scale factor 0 for values less or
equal to zero. This fixes e.g. Debian packages on mips64el.

In addition we now make sure that printed scale factors have less
characters than the column width. Otherwise parsing the *.RSM file
might fail because of throwing strtod function.
 2023-08-21 07:54:04 +02:00
Bård Skaflestad
99e3608bf3 Merge pull request #3626 from GitPaean/adding_unit_area 
adding unit area
 2023-08-17 15:09:49 +02:00
Kai Bao
13eaf8a271 adding unit area 2023-08-17 13:55:33 +02:00
Bård Skaflestad
ddb94c15a3 Merge pull request #3637 from akva2/mech_props 
Add field properties used for mechanics
 2023-08-17 13:12:15 +02:00
hnil
d157bd627f add THELCOEF field property 
this is the thermal expansion coefficient for each cell in a mechanics model
write this to the .INIT file for relevant models
 2023-08-17 11:54:18 +02:00
hnil
861be6be91 add THERMEXR field property 
this is the thermal expansion ratio for each cell in a mechanics model
write this to the .INIT file for relevant models
 2023-08-17 11:54:18 +02:00
hnil
1948dc5d51 add PRATIO field property 
this is the Poisson's ratio for each cell in a mechanics model
write this to the .INIT file for relevant models
 2023-08-17 11:54:18 +02:00
hnil
27dcd6e246 add POELCOEF field property 
this is the coefficient of elasticity for each cell in a mechanics model
write this to the .INIT file for relevant models
 2023-08-17 11:54:18 +02:00
hnil
191364d2f3 add BIOTCOEF field property 
this is the Biot coefficient for each cell in a mechanics model
write this to the .INIT file for relevant models
 2023-08-17 11:54:18 +02:00
hnil
6ed7370db3 add STRESSEQUILNUM field property 
this is used to set the stress equilibration region for cells in
mechanics models
 2023-08-17 11:54:18 +02:00
hnil
217f8f7b60 add YMODULE field property 
this is the Young's modulus for each cell in a mechanics model
write this to the .INIT file for relevant models
 2023-08-17 08:34:51 +02:00
hnil
3a66f7c9b6 added: Ymodule dimension in UnitSystem 2023-08-17 08:14:09 +02:00
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