Commit Graph

16580 Commits

Author SHA1 Message Date
Kai Bao
e38e557bbc cleaning up to preapre for pull request 2023-09-29 10:55:19 +02:00
Stein Krogstad
035d216641 adding function iterateWellEqWithSwitching
when we do the local solve for well equations, control/status will be
updated during the iteration process, such that the converged well gets
correct control/status regarding to the current reservoir state.

various change in the other parts of the code were made to make the
function work as intended.
2023-09-29 10:51:04 +02:00
Markus Blatt
c657cfecc8
Merge pull request #4868 from bska/support-truncated-region-names
Match Region Sets by Unique Prefix
2023-09-28 21:04:06 +02:00
Bård Skaflestad
85bb525067 Match Region Sets by Unique Prefix
This commit switches the region set tag matching algorithm to using
unique prefixes.  This enables the simulator to recognise that the
region set name

    FIPUNI

should match up with the user defined region set 'FIPUNIT'.  In the
current master sources, the above summary vector would produce a
diagnostic message saying that the region set 'FIPUNI' (without the
final 'T') does not exist.

To this end, we instruct the ParallelEclipseState to always pass the
six character substring beginning with 'FIP' for FIP-like region
arrays and defer to the rank-0 EclipseState/FieldProps mechanism to
match this prefix with its canonical region set.
2023-09-28 17:54:27 +02:00
Markus Blatt
326d63cb8e
Merge pull request #4898 from aritorto/centroidRankZero
Supporting centroids lookup for rank 0 and LGRs
2023-09-28 17:49:07 +02:00
Bård Skaflestad
1e8441e8a9
Merge pull request #4528 from svenn-t/h2store
Enable WSF/GSF for H2STORE
2023-09-28 16:59:49 +02:00
Bård Skaflestad
09626f2e3a
Merge pull request #4525 from goncalvesmachadoc/co2store
keywords co2store + gaswat
2023-09-28 16:56:25 +02:00
Antonella Ritorto
92a1d3caab Separating LGRs in rank 0 cellCentroids_ 2023-09-28 16:03:08 +02:00
Atgeirr Flø Rasmussen
ffa7bc23ed
Merge pull request #4885 from hnil/safer_fluid_evaluation
Safer fluid evaluation
2023-09-26 14:59:05 +02:00
Markus Blatt
2f0e167d2c
Merge pull request #4894 from akva2/janitoring
fixed: quell unused variable warning without OpenCL
2023-09-26 14:25:46 +02:00
Arne Morten Kvarving
eedfafe423 fixed: quell unused variable warning without OpenCL 2023-09-26 09:11:48 +02:00
Atgeirr Flø Rasmussen
8705cd16ad
Merge pull request #4884 from atgeirr/fix-typo-in-macro
Fix typo in macro usage.
2023-09-25 12:38:50 +02:00
Bård Skaflestad
77f1da2b61
Merge pull request #4876 from bska/report-hcpv-smry
Calculate Hydrocarbon Pore-Volumes if Requested
2023-09-25 11:20:07 +02:00
Atgeirr Flø Rasmussen
18883e7f83 Use the non-accelerated linear solver for some tests.
This is just for the type tag.
2023-09-25 10:44:06 +02:00
Bård Skaflestad
0f78d3935c Calculate Hydrocarbon Pore-Volumes if Requested
This commit separates the computation of hydrocarbon pore-volumes
out from the context of average pressure values.  These pore-volumes
go into the xHPV summary vectors and are, therefore, useful in their
own right-not just as a means to computing average pressure values.
2023-09-25 10:32:56 +02:00
Tor Harald Sandve
ae1e5f56f6
Merge pull request #4874 from bska/refactor-fip-update
Refactor Fluid-In-Place Calculations For Maintainability
2023-09-25 10:25:52 +02:00
Atgeirr Flø Rasmussen
e4e32defc4 Fix various errors and clean up the ISTLSolvers.
Much of this went undiscovered because the ISTLSolverEbosBda class
was not really used before due to the typo disabling it.
2023-09-25 09:03:59 +02:00
goncalvesmachadoc
7b6f813aae rebase 2023-09-21 16:50:41 +02:00
hnil
c73b049497 added mpi checking of throw in property evaluation 2023-09-21 13:34:01 +02:00
Atgeirr Flø Rasmussen
2ffc7f8e6d Workaround to compile issue with two tests.
Two tests include ebos.hh, but probably should not: test_glift1 and test_RestartSerialization.
This change restores the build for those tests. Removing ebos.hh from their inclusion list
should be done, but currently exposes that some other headers are not properly standalone,
so it is a bit more work to do.
2023-09-21 12:41:27 +02:00
Atgeirr Flø Rasmussen
ad35b2a72f Adapt to changes made to ISTLSolverEbos. 2023-09-21 12:41:03 +02:00
Bård Skaflestad
e6f0aae124 Refacto Fluid-In-Place Calculations For Maintainability
This commit splits updateFluidInPlace_() into several smaller helper
functions, each with a narrow purpose.  They're all just called from
the original call site--the body of updateFluidInPlace_()--but this
new version is, in my opinion, easier to reason about and there is
less shared state.

In anticipation of adding support for summary vectors FHPV and RHPV
(field and region levels of hydrocarbon pore-volumes), we also split
the pore-volume updates out to a branch separate from that needed
for average pressure calculations.
2023-09-21 11:54:47 +02:00
Atgeirr Flø Rasmussen
7aa33058c4 Fix typo in macro usage. 2023-09-21 11:39:14 +02:00
Bård Skaflestad
cfd502c0f2
Merge pull request #4871 from svenn-t/cskin
Activate CSKIN and regression test
2023-09-21 11:24:19 +02:00
Atgeirr Flø Rasmussen
18f0d8fd27
Merge pull request #4859 from jcbowden/damariswriter-for-sim-fields-v4
Damaris - Moving Damaris functionality to it's own class
2023-09-20 09:06:48 +02:00
josh bowden
1e2d9360d7 Move Damaris functionality to it's own class.
Step one for moving Damaris calls out of EclWriter class and into its own DamarisWriter class;
EclProblem now calls both writeOutput methods and passes in the data::Solution object;

Add fix for first writeOutput() call not having PRESSURE data available;

data::Solution is now passed by rvalue ref into eclWriter::writeOutput();

guard added to prevent inclusion of damariswriter.hh
2023-09-19 21:20:08 +02:00
Bård Skaflestad
40927cb173
Merge pull request #4877 from GitPaean/bhp_lower_limit_below_1bar
reducing the bhp lower limit slightly to handle 1 bar bhp limit
2023-09-19 18:44:37 +02:00
Bård Skaflestad
b806231c94
Merge pull request #4880 from GitPaean/making_two_tests_less_prone_to_timestepping
setting 10-day maximum time step for two regressiong tests
2023-09-19 18:20:19 +02:00
Kai Bao
8bc88ec80b setting 10-day maximum time step for two regressiong tests
3_MULTFLT_MODEL2 and 4_MINPVV_MODEL2.

Hopefully the tests will be more stable and serve better as regression
tests.
2023-09-19 17:02:13 +02:00
Bård Skaflestad
7708b98d6c
Merge pull request #4879 from GitPaean/only_rank_0_network_info
only outputting some network info to the rank 0 process
2023-09-19 16:58:57 +02:00
Kai Bao
9d642fd7ce only outputting some network info to the rank 0 process 2023-09-19 16:17:19 +02:00
Kai Bao
f4a420d2f9 reducing the bhp lower limit slightly to handle 1 bar bhp limit
it turns out that 1bar is the default bhp constraint for some keywords,
   and some cases are depending on it.
2023-09-19 15:30:42 +02:00
Bård Skaflestad
50fb7b38cf
Merge pull request #4866 from vkip/gecon_prt
Adding .PRT output when GECON is activated
2023-09-18 13:47:38 +02:00
Vegard Kippe
cc39e04180 Addresing review comments 2023-09-18 13:05:12 +02:00
Atgeirr Flø Rasmussen
a59920cee2
Merge pull request #4870 from blattms/print-missing-restart-file
Include name of missing OPM restart file in error.
2023-09-15 15:29:50 +02:00
Markus Blatt
f6d0a3961c
Merge pull request #4822 from bska/multregt-item-5
Apply Regional Multipliers to Initial Transmissibilities
2023-09-15 12:22:32 +02:00
Bård Skaflestad
ddcafa8a91 Apply Regional Multipliers to Initial Transmissibilities
This commit adds a new member function,

    EclTransmissibility<>::applyNncMultreg_()

which applies regional transmissibility multipliers such as those
entered in the MULTREGT keyword to the explicit input NNCs.  We make
the application conditional on a new parameter, default value
'false', and pass 'true' as the argument from 'finishInit()'.

Along with TransMult::getRegionMultiplierNNC(), this implements all
known connection behaviours for inter-region connections.
Multipliers internal to a region in MULTREGT are not yet supported.
2023-09-15 10:55:23 +02:00
Markus Blatt
b209f6af77
Merge pull request #4778 from aritorto/cellCentroid
Refactor element centroids lookup
2023-09-15 10:02:15 +02:00
Markus Blatt
81c9594f5d Include name of missing OPM restart file in error.
Otherwise it is hard to tell for the (newbie?) user what went wrong.
2023-09-14 16:10:42 +02:00
Svenn Tveit
20ebf4d70f Add H2STORE regression tests 2023-09-14 13:43:51 +02:00
Svenn Tveit
7217201f18 Enable WSF/GSF for H2STORE 2023-09-14 12:42:47 +02:00
Svenn Tveit
967182005a Include CSKIN test cases in regression tests 2023-09-14 10:17:41 +02:00
Bård Skaflestad
dee75d0b3f
Merge pull request #4869 from alfbr/emit-warning
PARAOPTS and SOLVDIRS should only give warning
2023-09-14 10:00:01 +02:00
Alf Birger Rustad
91a670d796 PARAOPTS and SOLVDIRS should only give warning 2023-09-14 09:22:36 +02:00
Tor Harald Sandve
b55270defe
Merge pull request #4854 from vkip/gecon_closure_reason_group
Set GECON closure reason to GROUP, to not open with WTEST option 'E'.
2023-09-14 08:58:32 +02:00
Svenn Tveit
913ba450a7 Activate CSKIN 2023-09-14 08:52:05 +02:00
Bård Skaflestad
6f27ffa68d
Merge pull request #4862 from vkip/avoid_negative_relaxation_factor_fraction
Avoid fraction relaxation factors outside [0,1] (standard wells)
2023-09-13 16:45:11 +02:00
Bård Skaflestad
69e9bf624a
Merge pull request #4860 from GitPaean/not_relaxing_rate_update
removing rate relaxation during updateNewton for StandardWellPrimaryVariables
2023-09-13 15:31:44 +02:00
Bård Skaflestad
ee042501bf
Merge pull request #4867 from vkip/bflowijk
Adding support for the BFLOW[I|J|K] summary vectors.
2023-09-13 13:31:22 +02:00
Atgeirr Flø Rasmussen
9206e8b3db
Merge pull request #4863 from bska/interior-cell-grid-view
Implement Interior Cell Counts for Grid Views
2023-09-13 12:24:00 +02:00