Commit Graph

930 Commits

Author SHA1 Message Date
Arne Morten Kvarving
981a5f8a14 clean up some comments
- simulator note was copied from the typetag dependent class (EclWriter)
- opm-output is no longer a separate module
2024-06-25 10:59:57 +02:00
Markus Blatt
363eaaa57b
Merge pull request #5434 from blattms/bugfix/do-not-count-nan-as-errors
[fix] Do not count experiencing nans as error in PRT file.
2024-06-20 16:18:49 +02:00
Tor Harald Sandve
a419390854
Merge pull request #5407 from totto82/fix_drsdt
avoid mass creation with drsdt
2024-06-20 12:14:22 +02:00
Markus Blatt
238b7b2980 [fix] Do not count experiencing nans as error in PRT file.
The simulation will just chop the time step and continue.
Note, that the error count in the PRT file is used by engineers to
decide whether a simulation was successfull. Hence the error count
should not be increased here.
2024-06-20 10:40:37 +02:00
Bård Skaflestad
acb124bbdc
Merge pull request #5426 from totto82/output_every_timestep
fix option for output every timestep
2024-06-19 12:09:34 +02:00
Bård Skaflestad
46523e7cd9
Merge pull request #5430 from atgeirr/fix-damaris-logging-parallel
Add and use DamarisOutput::handleError() helper.
2024-06-19 11:30:08 +02:00
Atgeirr Flø Rasmussen
2c99a84c87 Add and use DamarisOutput::handleError() helper.
This should improve error handling in parallel, and ensure
Damaris problems are logged properly.
2024-06-19 10:30:38 +02:00
Tor Harald Sandve
4f2311d1b2 Output maximum/minimum saturations directly for restart hysteresis 2024-06-18 10:39:19 +02:00
Tor Harald Sandve
366f3a2944 fix option for output every timestep 2024-06-14 15:03:43 +02:00
Tor Harald Sandve
151bba43a7
Merge pull request #5268 from svenn-t/tracer_dis_vap
Partitioning tracers
2024-06-14 09:08:12 +02:00
Svenn Tveit
87362d5037 Accumulate segment rates and minor fixes 2024-06-12 14:18:32 +02:00
David Landa Marban
80e00f4516 Fix to error in Clang: use 'template' keyword to treat 'data' ... 2024-06-11 09:31:48 +02:00
Bård Skaflestad
b0ee6b9c94
Merge pull request #5419 from GitPaean/only_trans_2
trying to release global transmissibility earlier to flatten the peak memory usage in the function finishInit()
2024-06-10 18:13:53 +02:00
Kai Bao
fd5e9d167f addressing reviewing comments OPM/opm-simulators#5419 2024-06-10 16:08:44 +02:00
Kai Bao
062a98b305 restruct so that we can release the global trans earlier
in the funciton finishInit().
2024-06-10 16:08:44 +02:00
Svenn Tveit
84cdef1135 Fix solution tracers and well output.
-Only output or restart solution tracers for gas/oil tracers with DISGAS/VAPOIL enabled (no solution tracers in water phase!).
-Initial tracers (free/solution) will be set to zero initially if TBLK/TVDP is not given.
- Do not calculate mass transfer between free and solution tracers if it is not necessary.
-Calculate well rates using updated tracer concentrations
2024-06-10 14:50:56 +02:00
Markus Blatt
6921db4282 omit unnescessary function parameter for EDINCC 2024-06-10 14:50:55 +02:00
Svenn Tveit
adc36d64a5 Output rates to multisegment wells 2024-06-10 14:50:55 +02:00
Markus Blatt
fc67eaeeda Prevent spurious warnings about NNCs when applying EDITNNC in parallel.
If we use transmissibilities for loadbalancing, then we calculate
transmissibilities twice. First on the global grid before
loadbalancing and then on the local grid after that. This is the
default. In this case all warnings will be shown correctly when
calculating the global transmissibilities.

If the user requests the same weights for all faces (command line
parameter --edge-weights-method=0) then the transmissibilities are only
calculated on the loadbalanced grid. Unfortunately, in this case only
rank 0 will issue warnings for his part including the false positives
mentioned below.

Due to load balancing many NNCs might be stored on another process,
but we still use all EDITNNC entries when computing transmissibilties
locally. Hence when applying EDITNNC on the loadbalanced grid we
will issue warnings for cases where there are no problems (e.g. NNC
between two overlap cells.

With this PR we will only warn when computing the transmissibilities
for the first time. For the default settings this will remove spurious
and duplicate warnings.

Not that for --edge-weights-method=0 nothing changes and we will still
see only warnings for the first rank including spurious one.
2024-06-10 14:50:55 +02:00
Svenn Tveit
db970d58d2 Changed to Scalar type.
Following commit 61bfea46c7.
2024-06-10 14:48:49 +02:00
Svenn Tveit
1645559342 Fix mass exchange term.
Additionally, store separate well terms for free and solution tracers
2024-06-10 14:48:45 +02:00
Svenn Tveit
050ce2de3b Fixes after rebase 2024-06-10 14:41:21 +02:00
Svenn Tveit
b00cc2c1a5 Extend tracer model to solution tracers.
Solve an extended linear system with free and solution tracers with mass transfer coupling term.
2024-06-10 14:41:21 +02:00
Bård Skaflestad
58edb5b9aa
Merge pull request #5417 from blattms/feature-correct-comment-parallel
Update wrong comment about storage of transmissibilities
2024-06-07 16:50:38 +02:00
Atgeirr Flø Rasmussen
fc906842ad
Merge pull request #5352 from jcbowden/damaris-limit-variables-v1
Add ability to pass multiple variables to Damaris using DamarisWriter class.
2024-06-07 15:54:59 +02:00
Markus Blatt
d80b8411b7 Fixed spelling of comments. 2024-06-07 14:58:47 +02:00
Markus Blatt
2f3c1b7310 Update wrong comment about storage of transmissibilities
This is a follow up of the fix in #5414.

The comment said that the ordering of the compressed index of cells is
coherent with the cartesian index. THis is not the case in parallel
where cells in the overlap/ghost region might be ordered last (default).
2024-06-07 06:46:18 +02:00
Markus Blatt
302503e172
Merge pull request #5414 from totto82/fix_mpi_edit_trans
Fix modifications of TRANX/Y/Z in parallel (e.g. MULTIPLY of TRANX in EDIT)
2024-06-07 06:28:35 +02:00
Bård Skaflestad
e3bf48541f
Merge pull request #5406 from GitPaean/only_trans
only allocate trans_ for globalTrans_
2024-06-06 21:50:11 +02:00
Kai Bao
8f67881809 using enum class to replace boolean onlyTrans for
Transmissibility::update() for better readability, which is suggested by the reviewer.
2024-06-06 20:09:44 +02:00
Atgeirr Flø Rasmussen
ab4d9cb36e Initialize double member for serialization test. 2024-06-06 15:24:20 +02:00
Tor Harald Sandve
42702e1d50 Fix mpi for MULTIPLY TRANX in EDIT 2024-06-06 12:59:41 +02:00
Atgeirr Flø Rasmussen
f06c238753 Add damping treatment to subdomain Newton iterations. 2024-06-06 12:59:22 +02:00
josh bowden
6fcec07bab cast to remove: comparison of integer expressions of different signedness warning. 2024-06-06 10:36:25 +02:00
Kai Bao
303a677a81 only allocate trans_ for globalTrans_
others are not needed for globalTrans_ for now. It will help to flatten
the peak memory usage for rank 0 during a parallel running.
2024-06-05 21:35:46 +02:00
josh bowden
7fc6cc0430 Other small additions from github comments and removal of compile time logic that checks for ParaView and Python - makes code more readable and alows use of Damaris libraries with differing compiled in backends to be swapped without need for recompiling opm-simulators 2024-06-05 17:26:34 +02:00
Bård Skaflestad
4cf8a50b26
Merge pull request #5398 from atgeirr/minor-oscillation-handling-fix
Detect oscillation in just one phase.
2024-06-05 13:56:35 +02:00
Atgeirr Flø Rasmussen
558d888d90 Allow oscillation detection with less that two phases.
We should not require two phases to have oscillating residuals to
start handling it.
2024-06-05 11:50:01 +02:00
Tor Harald Sandve
8b5fced909 avoid mass creation with drsdt 2024-06-04 15:10:11 +02:00
Vegard Kippe
78cc10f620 Fix typo 2024-06-03 15:26:16 +02:00
Bård Skaflestad
a3a2b7a978 Make SummaryState Objects Aware of Undefined UDQ Value
This PR switches to calling the SummaryState constructor which is
aware of the value of undefined UDQs (OPM/opm-common#4052) directly.

While here, also sort headers, split some long lines, and prefer
initialisation lists to constructor body assignments.
2024-05-29 09:16:56 +02:00
Bård Skaflestad
6e8da2309b Delay UDQ Assignments Until After Summary Output
Commit 0aaa69c6e (PR #5330) was a little too eager in its effort to
handle UDQ ASSIGN operations after action processing[%].  In
particular, the assignments, which alter the internal structures of
the SummaryState and UDQState objects, would happen prior to writing
summary files.  In turn, this would make it appear as if the
assignment happened too early.  This commit defers UDQ assignments
triggered by action processing until FlowProblem<>::endEpisode() for
two reasons

  1. The problem originally addressed in 0aaa69c6e only presented
     when the assignment was triggered on the final time step of an
     episode (report step), so handling this situation here is a
     more targeted approach.

  2. Member function FlowProblem<>::endEpisode() is called after we
     write the summary file output so any alterations to the
     internal structures of the SummaryState will not be visible in
     the summary output until the next time step.  This is the
     expected behaviour.

[%] Insufficient testing by: [at]bska.
2024-05-28 18:16:30 +02:00
Atgeirr Flø Rasmussen
6a7e1e08c0 Avoid memory leak from the *unique_ptr<X>.release() antipattern. 2024-05-28 16:49:08 +02:00
Bård Skaflestad
9841c5d21c
Merge pull request #5377 from akva2/equil_template_scalar
InitStateEquil: template Scalar type
2024-05-23 10:48:04 +02:00
Arne Morten Kvarving
4bef925974 InitStateEquil: use Scalar type from FluidSystem 2024-05-23 09:39:49 +02:00
Arne Morten Kvarving
4cfb7a8566 EquilibrationHelpers: template Scalar type 2024-05-23 09:38:27 +02:00
Arne Morten Kvarving
600e7ea2f7 Transmissibility: consistently use Scalar type 2024-05-23 08:42:51 +02:00
Arne Morten Kvarving
27ca3ab5f7 OutputBlackoilModule: consistently use Scalar type 2024-05-23 08:34:09 +02:00
Arne Morten Kvarving
39554ab7dd NonLinearSolver: use Scalar type 2024-05-23 08:25:37 +02:00
Arne Morten Kvarving
cdf227bcbd BlackoilModelParameters: consistently use Scalar
parameters are registered as Scalar not double
2024-05-23 08:17:45 +02:00
Arne Morten Kvarving
2205c68f0d BlackoilModel: use Scalar type 2024-05-23 08:09:53 +02:00
Arne Morten Kvarving
aa4758ff07 BlackoilModelNldd: use Scalar type 2024-05-22 15:52:13 +02:00
Arne Morten Kvarving
61bfea46c7 GenericTracerModel: use Scalar type 2024-05-22 15:46:50 +02:00
Bård Skaflestad
0aaa69c6e0 Rerun UDQ Assignments After Action Processing
If an action block happens to run a UDQ ASSIGN operation and,
furthermore, happens to run at the last time step of an episode then
the "clear pending assignments" behaviour of the ScheduleState copy
constructor leads to not performing the UDQ assignment at all.  This
commit works around this problem by invoking the action handler's
UDQ assignment function after processing all active action blocks.

The underlying problem has been present since at least Pull Request
OPM/opm-common#3587 which introduced the "clear pending assignments"
behaviour of ScheduleState's copy constructor.
2024-05-21 13:51:06 +02:00
Bård Skaflestad
9731a84cad Adjust Whitespace in FlowProblem File
In particular, be consistent about four-space indent levels and add
braces to a number of single-statement control blocks.  Add a few
blank lines for readability.

While here, also mark a number of objects as 'const'.
2024-05-21 13:51:06 +02:00
Bård Skaflestad
8a4e78e7c4
Merge pull request #5354 from akva2/various_well_helpers_template_scalar
Various well helpers: template Scalar type
2024-05-21 13:14:50 +02:00
josh bowden
2744614f9c update after pull request comments; addition of OUTPUTDIR variable to Damaris XML configuration 2024-05-17 17:36:18 +02:00
Arne Morten Kvarving
b74b170d5b fixed: build with dune-fem 2.9 2024-05-16 10:58:08 +02:00
Tor Harald Sandve
2ea6cea895
Merge pull request #5292 from gdfldm/patch-1
Update GMDS and GMGP definitions in GenericOutputBlackoilModule.cpp
2024-05-15 15:00:10 +02:00
Arne Morten Kvarving
ee1c531431 InitStateEquil: remove template parameter from Comm and use Parallel::Communication directly
in the process this quells a deprecation warning for
Dune::CollectiveCommunication usage
2024-05-15 11:20:29 +02:00
josh bowden
3630177e3e added ability to pass through multiple variables to Damaris, with full list still defined in initDamarisXmlFile.cpp ; Also adds ability to limit the variables to be passed through using --damaris-limit-variables=<CSV list> coammand line option 2024-05-14 21:08:47 +02:00
Arne Morten Kvarving
f70c7f15f8 ActionHandler: template Scalar type 2024-05-14 16:21:55 +02:00
Bård Skaflestad
2e7a7a0c44
Merge pull request #5347 from akva2/janitoring_gcc14
add missing include
2024-05-13 21:27:26 +02:00
Arne Morten Kvarving
5d54d36dc4 add missing include
in particular fixes build with gcc14
2024-05-13 15:05:47 +02:00
Bård Skaflestad
0f67799e9c
Merge pull request #5344 from totto82/GMST
Add GMST and modify GMTR output the maximum trapped CO2 in the gas phase
2024-05-13 13:56:49 +02:00
Tor Harald Sandve
b42a8cbcc3 Add output of GMST/GMUS
Rename GMTR to GMMO as ending with TR are used for tracers
[FR]GMTR output maximum trapped CO2 in the gas phase
2024-05-13 11:24:08 +02:00
Kai Bao
5fda72d24f removing unused releaseGlobalTransmissibility()
from AluGridVanguard and CpGridVanguard.
they exist is becaluse of typo in the function name. There is another
releaseGlobalTransmissibilities() function actually gets used.
2024-05-10 16:45:00 +02:00
Bård Skaflestad
a417968464
Merge pull request #5333 from GitPaean/remove_unused_updateImbnum_
removing unused updateImbnum_ function
2024-05-08 10:59:41 +02:00
Kai Bao
b225ec240f removing updateKrnum_
which does not have effects, which was suggested by Håkon Hægland.

And also removing the following member variables from
FlowGenericProblem because they are not in use anymore.

    krnumx_, krnumy_, krnumz_;
    imbnumx_, imbnumy_, imbnumz_;
2024-05-08 09:41:46 +02:00
Kai Bao
79236c4927 removing unused updateImbnum_ function 2024-05-08 09:33:00 +02:00
Bård Skaflestad
cc28bbe989 Enforce Relaxed Tolerances Not Stricter Than Strict
Relaxed tolerances being more strict than the strict tolerances does
not make sense in our use case.
2024-05-07 15:03:18 +02:00
Bård Skaflestad
027eed16e9 Report CNV Violation Pore-Volume Fraction to INFOITER
This commit includes the fraction of pore-volume whose CNV targets
are violated as a new per-iteration quantity in the INFOITER file
(--output-extra-convergence-info=iteration), with the column header
"CnvErrPvFrac".  We collect the values which are already calculated
in

    BlackoilModel<>::getReservoirConvergence()

and store these as a pair of numerator and denominator in the
ConvergenceReport class.  Note that we need both the numerator and
the denominator in order to aggregate contributions from multiple
ranks.

While here, also make a few more objects 'const' and calculate
column widths directly instead of the maximum number of characters
in writeConvergenceHeader().
2024-05-06 11:31:47 +02:00
Bård Skaflestad
f01635dcf2
Merge pull request #5331 from totto82/fix_restart_co2
Bugfix: initialize the input temperature in restart run without temperature in the restart file
2024-05-06 11:19:18 +02:00
Bård Skaflestad
26c59ce5cb
Merge pull request #5329 from vkip/input_skip_mode
Add parameter InputSkipMode to parameterise SKIP100 and SKIP300
2024-05-06 10:56:38 +02:00
Tor Harald Sandve
c6c447dc94 initialize the input temperature in restart run without temperature in the restart file 2024-05-06 10:21:42 +02:00
Bård Skaflestad
1e9943bfe6 Accumulate CNV Pore-Volume Sum for Interior Cells Only
The 'interiorBorder' category is *probably* equivalent to the
'interior' category for codimension zero elements, but it's better
to be safe than sorry.  We don't want to accumulate pore-volume
contributions twice.
2024-05-03 14:19:00 +02:00
Bård Skaflestad
226e90f8e1
Merge pull request #5324 from daavid00/fixMass
Bug fix massGas in place
2024-05-03 09:41:14 +02:00
Vegard Kippe
b68a55a9b9 Add parameter InputSkipMode to parameterise the behvaviour of the SKIP100 and SKIP300 keywords 2024-05-03 09:28:14 +02:00
Atgeirr Flø Rasmussen
f0855f4f48
Merge pull request #5293 from totto82/fixInitGW
Fix gas-water initialization with transision zone
2024-05-02 15:57:13 +02:00
Håkon Hægland
a1b7d4b5dd Allow Python bindings to setup MPI
Allows the Python bindings to control whether MPI_Init() and
MPI_Finalize() will be called when creating an OPM::Main object.
2024-05-02 11:14:07 +02:00
David Landa Marban
955cdbf02f Bug fix massGas in place 2024-04-30 11:51:16 +02:00
Atgeirr Flø Rasmussen
e767b6145f Avoid getting parameters in hot path. 2024-04-26 16:46:27 +02:00
Arne Morten Kvarving
f0e7f8842b BlackoilWellModelGeneric: template Scalar type 2024-04-23 11:33:33 +02:00
Bård Skaflestad
450bfd04fb
Merge pull request #5297 from akva2/fix_rstconv_mpich
fixed: do not send and recv from same buffer
2024-04-19 23:30:37 +02:00
Arne Morten Kvarving
70c9e5345d fixed: do not send and recv from same buffer
even though it's perfectly fine to do so in this case, mpich
will error out with an error if send and recv buffer is
the same
2024-04-19 20:10:47 +02:00
Tor Harald Sandve
af2e08d5aa Also fix gas-oil initialization with transision zone 2024-04-19 10:12:14 +02:00
Tor Harald Sandve
575bc813dd Fix gas-water initialization with transision zone 2024-04-19 08:39:24 +02:00
Matthew Goodfield
6ed2d95929
Update GMDS and GMGP definitions in GenericOutputBlackoilModule.cpp
Should GMDS be CO2 dissolved in water phase and GMGP be CO2 in gas phase (rather than the other way around)?
2024-04-17 12:31:10 +01:00
Arne Morten Kvarving
be57843296 WellState: template Scalar type 2024-04-17 11:12:40 +02:00
Arne Morten Kvarving
0aacefeeec adjust to Parameters::isSet change 2024-04-15 08:12:05 +02:00
David Landa Marban
9671792106 summary for immobile free-phase at saturations for which the nonwetting relative permeability equals zero 2024-04-12 15:31:22 +02:00
Bård Skaflestad
ac9d6eaa34 Prepare for Including Region Level Quantities in Field Level UDQs
Meet the new UDQConfig::eval() API requirement by adding a matcher
factory for region-level summary vectors.
2024-04-08 09:04:22 +02:00
Bård Skaflestad
10d2f52cd2 Add Procedure for Calculating Basic FIP Region Statistics
This commit implements the parallel version of

    EclipseState::computeFipRegionStatistics()

which computes a FIPRegionStatistics object for the current run's
fluid-in-place regions.  The object construction uses an MPI-aware
reduction process to compute the maximum region IDs across all MPI
ranks.

While here, also unconditionally form the statistics object as part
of the EclWriter's constructor to ensure that all ranks participate
in the process.  The initial approach of constructing the object on
first use is not robust in parallel.  We may however wish to compute
these statistics only when needed.  If so, that will be the subject
of follow-up work.
2024-04-05 17:06:13 +02:00
Arne Morten Kvarving
0161d69660 adjust to removal of EWOMS_GET_PARAM 2024-04-05 14:02:28 +02:00
Arne Morten Kvarving
b8284fea9c adjust to Parameters::hideParam change 2024-04-05 12:56:38 +02:00
Arne Morten Kvarving
6fba1a95c9 adjust to removal of EWOMS_REGISTER_PARAM 2024-04-05 12:24:48 +02:00
Arne Morten Kvarving
fdab87d336
Merge pull request #5255 from BigDataAccelerate/fix_dep_rocm_ocl
Bug fix: remove dependencies for rocm & cuda on opencl to run block Jacobi ILU
2024-04-05 12:02:30 +02:00
Arne Morten Kvarving
21bc4c7f0d adjust to EWOMS_HIDE_PARAM macro removal 2024-04-04 08:18:19 +02:00
Bård Skaflestad
3334726871
Merge pull request #5270 from akva2/adjust_ewoms_param_is_set
adjust to EWOMS_PARAM_IS_SET macro removal
2024-04-03 21:47:52 +02:00
Arne Morten Kvarving
46c3402eba adjust to EWOMS_PARAM_IS_SET macro removal 2024-04-03 19:54:45 +02:00