Commit Graph

14756 Commits

Author SHA1 Message Date
Kai Bao
b2eb44423a adding some OPM-specific Well and Connection Summary keywords
for the development of the filtration modeling during the water
injection.
2023-08-29 09:08:45 +02:00
Håkon Hægland
bec10dbfbe Implement GECON keyword
Implements support for the GECON keyword.
2023-08-29 01:10:21 +02:00
Bård Skaflestad
a0e72a62c4
Merge pull request #3528 from vkip/tuning_max_next_tstep
TUNING/NEXT[STEP]: Facilitate using max time step only when specified
2023-08-28 15:03:31 +02:00
Vegard Kippe
b47324e42f Actually check the TSINIT value in TuningTests.cpp 2023-08-28 11:21:34 +02:00
Vegard Kippe
98adf5a536 Workaround to avoid failing tests, also fixed some tab indenting. 2023-08-28 11:21:34 +02:00
Vegard Kippe
128ba83810 Facilitate using max time step from TUNING/NEXT[STEP] only when specified. Also corrects the persistent behaviour of NEXTSTEP. 2023-08-28 11:21:33 +02:00
Kai Bao
325ee7bbb3
Merge pull request #3652 from GitPaean/remvoing_vfp_group
removing the vfp_table member from Group class
2023-08-25 23:18:36 +02:00
Kai Bao
0c64a142c1 removing the vfp_table member from Group class
after GRUPNET is processed, vfp_table is not useful for GROUP class
anymore.
2023-08-25 00:21:45 +02:00
Kai Bao
b4c30cf93b
Merge pull request #3643 from vkip/avoid_zero_conndepth
Avoid connection depth = 0 when segment is specified without depth in COMPSEGS
2023-08-23 23:53:19 +02:00
Kai Bao
d9278cf053
Merge pull request #3609 from plgbrts/std-network
Enable standard network using GRUPNET
2023-08-23 23:03:12 +02:00
Paul
a90d899bc0 removed repeated line 2023-08-23 16:16:53 +02:00
Paul
7d2083b948 restructuring 2023-08-23 16:16:52 +02:00
Paul
83157a01dd added unit standard network test in NMetworkTests and removed test in GroupTests 2023-08-23 16:16:52 +02:00
Paul
feb9c9c948 added two throws 2023-08-23 16:16:52 +02:00
Paul
1d1bd74cf8 add const for group 2023-08-23 16:16:51 +02:00
Paul
262c325960 Adressing review comments 2023-08-23 16:16:51 +02:00
Paul
dbeb7405ba add_node -> update_node 2023-08-23 16:16:51 +02:00
Paul
7fa0d94e7b code fixes based on review comments 2023-08-23 16:16:50 +02:00
Paul
88b654fb57 allow for wildcards 2023-08-23 16:16:50 +02:00
Paul
f70a0e50e0 Rebasing 2023-08-23 16:16:49 +02:00
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
Tor Harald Sandve
e08a4efe65 avoid negative C factor 2023-08-22 12:23:38 +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
Vegard Kippe
570666afea Removed commented-out lines 2023-08-18 16:51:09 +02:00
Vegard Kippe
624ff6f771 Perform the connection-depth-from-segments calculations even if the segment number is specified. 2023-08-18 16:47:43 +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