Commit Graph

16314 Commits

Author SHA1 Message Date
Kai Bao
eb08e2e863 cleaning up implementation related to filter cake 2023-07-05 13:25:03 +02:00
Kai Bao
7e5f1a1642 slightly different way to calculate the skin factor
for the radial model of the filter cake.

not tested yet.
2023-07-05 13:25:03 +02:00
Kai Bao
4cb3574e0f incoporate keyword WINJCLN
still in draft state.
2023-07-05 13:25:03 +02:00
Kai Bao
43196800b6 a draft version for for RADIAL model for WINJDAM 2023-07-05 13:25:03 +02:00
Kai Bao
aa5062683d a draft version for the linear geomery WINJDAM 2023-07-05 13:25:03 +02:00
Kai Bao
5e4cb8aeed WIP in using the filter cake to generate the skin factor 2023-07-05 13:25:03 +02:00
Kai Bao
49774186ab calculating the accumulative water injection volume
for each connection
2023-07-05 13:25:03 +02:00
Bård Skaflestad
ac9c5fb13c
Merge pull request #4744 from bska/smry-phase-densities
Calculate Segment Phase and Mixture Densities for Summary Output
2023-07-05 13:05:57 +02:00
Bård Skaflestad
77fe28979e Calculate Segment Phase and Mixture Densities for Summary Output
This commit adds logic and backing storage in the SegmentState to
provide the segment level summary vectors

  - SDENx -- Phase density of phase 'x' (O, G, W)
  - SDENM -- Mixture density without flowing fraction exponents
  - SMDEN -- Mixture density with flowing fraction exponents

We defer the calculation of SDENM and, especially, SMDEN, to the
MultisegmentWellSegments class since this class maintains the
current flowing fractions.
2023-07-05 11:05:26 +02:00
Arne Morten Kvarving
241c1d3279 BlackoilModelEbos: use value in localAccumulatedReports
cheap to copy and aids refactoring
2023-07-05 10:26:14 +02:00
Arne Morten Kvarving
184c6128cd BlackoilModelEbos: add acccessor for component names 2023-07-05 10:26:14 +02:00
Arne Morten Kvarving
0c8446eed3 BlackoilModelEbos: add acccessor for model parameters 2023-07-05 10:26:14 +02:00
Arne Morten Kvarving
6f726049ce BlackoilModelEbos: add accessor to linear solve setup time
to allow for external usage
2023-07-05 09:38:08 +02:00
Arne Morten Kvarving
cee8dc4c6e BlackoilModelEbos: make getMaxCoeff public
to make it possible to call externally
2023-07-05 09:38:08 +02:00
Arne Morten Kvarving
8fc2b83948 BlackoilModelEbos: make initialLinearization public
to make it possible to call externally
2023-07-05 09:38:08 +02:00
Bård Skaflestad
4ac439475b Support Block-Level Phase Density Summary Vectors
In particular, add support for the

    BxDEN and BDENx

summary vectors (x = {O, G, W}).  The latter are alternative
spellings of the former keywords.
2023-07-04 18:32:59 +02:00
Bård Skaflestad
6868382cde Undo Unwanted Whitespace Adjustments
Added in commit ec2983df4.
2023-07-04 18:28:29 +02:00
Bård Skaflestad
8139b3f679
Merge pull request #4742 from akva2/janitoring
ISTLSolverEbos: add missing include
2023-07-04 16:23:07 +02:00
Bård Skaflestad
9ced9b9931
Merge pull request #4740 from akva2/isnumerical_aquifer_cell_separate_struct
isNumericalAquiferCell: put in separate struct for easier reuse
2023-07-04 15:37:23 +02:00
Arne Morten Kvarving
db41bfb55c ISTLSolverEbos: add missing include 2023-07-04 15:25:47 +02:00
Bård Skaflestad
10229a1781
Merge pull request #4741 from alfbr/improve-message
Improve message when shutting well due to convergence issues
2023-07-04 14:57:53 +02:00
Arne Morten Kvarving
4d35ec26de isNumericalAquiferCell: put in separate struct for easier reuse 2023-07-04 14:56:10 +02:00
Alf Birger Rustad
93a0bb0de3 improve message when shutting well due to convergence issues 2023-07-04 14:15:53 +02:00
Arne Morten Kvarving
e89c43e54d
Merge pull request #4736 from akva2/simplify_tuning_tests
simplify cmake code for tuning tests
2023-07-04 11:28:05 +02:00
Bård Skaflestad
4498d14a78
Merge pull request #4739 from akva2/blackoilmodelebos_nldd_solver_approach
BlackoilModelEbos: improve nldd solver approach
2023-07-03 17:40:45 +02:00
Arne Morten Kvarving
c6cd74270b BlackoilModelEbos: enumerate solver approach for NLDD
adds command line validation and allows us to remove an assert on
user provided data
2023-07-03 15:51:07 +02:00
Arne Morten Kvarving
8eb5e173c3 BlackoilModelEbos: put Gauss-Seidel NLDD solve in separate method
increases readability of nonlinearIterationNldd
2023-07-03 14:53:12 +02:00
Arne Morten Kvarving
faa4bb25d7 BlackoilModelEbos: put jacobi NLDD solve in separate method
increases readability of nonlinearIterationNldd
2023-07-03 14:53:12 +02:00
Bård Skaflestad
cc0b994eca
Merge pull request #4738 from akva2/blackoilmodelebos_domain_ordering
BlackoilModelEbos: improve domain ordering
2023-07-03 14:52:12 +02:00
Arne Morten Kvarving
cf6697b630 BlackoilModelEbos: make domain ordering measure configurable 2023-07-03 12:24:41 +02:00
Arne Morten Kvarving
e17b696a7e BlackoilModelEbos: put selection of domain order in separate method
to increase readability of nonlinearIterationNldd code
2023-07-03 12:24:41 +02:00
Bård Skaflestad
0a34e9bd60
Merge pull request #4737 from akva2/blackoilmodelebos_reduce_duplication
BlackoilModeEbos: Reduce some code duplication
2023-07-03 11:42:01 +02:00
Arne Morten Kvarving
c7f9d2d357 put initial linearization in separate method
to share code between newton and nldd
2023-07-03 10:51:10 +02:00
Arne Morten Kvarving
3656196684 put calculation of max coefficient in separate method
to reduce code duplication
2023-07-03 10:51:10 +02:00
Arne Morten Kvarving
c3847e8325 simplify cmake code for tuning tests
add a post command to the runSimulator script and use this to
execute the unit test at the end of the run
2023-07-03 09:05:45 +02:00
Arne Morten Kvarving
fae3859c5a
Merge pull request #4702 from goncalvesmachadoc/regressionSalt
add gas condensate case to regression test
2023-06-30 19:24:08 +02:00
Bård Skaflestad
6617607378
Merge pull request #4735 from blattms/improve-no-active-cells-error
Improve error message for input grid without any active cells.
2023-06-30 18:02:16 +02:00
Markus Blatt
ff6a54ce7c Improve error message for input grid without any active cells.
We now give a different (more explanatory) error if the input grid has
no active cells at all. Often this points to a user error and having a
more precise error message might help here.
2023-06-30 17:32:58 +02:00
Bård Skaflestad
e36992cb90
Merge pull request #4733 from akva2/fix_superbuild_generated_header
fixed: parallel super builds
2023-06-30 17:25:58 +02:00
goncalvesmachadoc
7ccd7263a4 rename case 2023-06-30 15:47:28 +02:00
Arne Morten Kvarving
ab3f6474aa fixed: parallel super builds
commit e5e7ff7287 introduced a dependency on a generated header in a
header file. this is problematic with super-builds as there is no
explicit dependency for the simulator objects to these generated
headers.

with the ninja-generator it is smart enough to figure out this across
the subdirectories, but the make generator is not. hence we explicitly
add a dependency on the opmcommon target in this case. ideally we would
only depend on the generated header to allow compiling opmcommon and
simulator objects in parallel. however there is as far as i know no way to
depend on OUTPUT targets across subdirectories.
2023-06-30 14:58:31 +02:00
Bård Skaflestad
8c6a92356f
Merge pull request #4621 from vkip/use_mb_from_tuning
Use mass balance limit (XXXMBE) from TUNING with --enable-tuning=true
2023-06-30 13:04:49 +02:00
Arne Morten Kvarving
64ce4a206e
Merge pull request #4729 from akva2/partitioncells_reorg
PartitionCells: move all related code to compile unit
2023-06-30 13:02:20 +02:00
Arne Morten Kvarving
3e58d191e8
Merge pull request #4731 from akva2/componentnames_separate
ComponentName: put in separate file
2023-06-30 13:01:22 +02:00
Bård Skaflestad
b39f2f20ee
Merge pull request #4718 from vkip/num_pressure_points_equil
Adding --num-pressure-points-equil as a developer parameter
2023-06-30 12:45:39 +02:00
Vegard Kippe
7fc9a2eef3 Addressing review comments. 2023-06-30 12:21:25 +02:00
Arne Morten Kvarving
b95b342517 partitionCells: drop indent for namespace 2023-06-30 12:14:47 +02:00
Arne Morten Kvarving
e8f04eec68 changed: move all partitionCells code to partitionCells.cpp 2023-06-30 12:14:11 +02:00
Arne Morten Kvarving
c746986dc7 ComponentName: add compile unit 2023-06-30 11:51:08 +02:00
Arne Morten Kvarving
35bb329022 put BlackoilModelEbos::ComponentName in separate header
more tidy and potentially easier to reuse
2023-06-30 11:18:27 +02:00