OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cb75a7ad6f
opm-common/tests/test_eclmateriallawmanager.cpp

465 lines
16 KiB
C++
Raw Normal View History

various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
clean up the licensing preable of source files this patch removes the in-file lists in favor of a global list of in the COPYING file. this is done because (a) maintaining a list of authors at the beginning of each source file is a major pain in the a**, (b) for this reason, the list of authors was not accurate in about 85% of all cases where more than one person was involved and (c) this list is not legally binding in any way (the copyright is at the person who authored a given change; if these lists had any legal relevance, one could "aquire" the copyright of the module by forking it and replacing the lists...)
2016-03-14 08:11:22 -05:00
Consult the COPYING file in the top-level source directory of this
module for the precise wording of the license and the list of
copyright holders.
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
*/
/*!
* \file
*
* \brief This is the unit test for the class which manages the parameters for the ECL
* saturation functions.
*
* This test requires the presence of opm-parser.
*/
#include "config.h"
#if !HAVE_OPM_PARSER
#error "The test for EclMaterialLawManager requires the opm-parser module"
#endif
#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
#include <opm/material/fluidstates/SimpleModularFluidState.hpp>
rename ParserMode as ParseContext.
2016-03-16 19:49:02 -05:00
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
Add missing opm-parser headers opm-parser pull #695 https://github.com/OPM/opm-parser/pull/695
2016-02-26 04:38:53 -06:00
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
initialize MPI for all unit tests This started to cause crashes for me. I don't really have an idea why, but it is not too bad of a thing to do anyway...
2016-04-17 04:28:06 -05:00
#include <opm/common/utility/platform_dependent/disable_warnings.h>
#include <dune/common/parallel/mpihelper.hh>
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
// values of strings taken from the SPE1 test case1 of opm-data
static const char* fam1DeckString =
"RUNSPEC\n"
"\n"
"DIMENS\n"
" 10 10 3 /\n"
"\n"
"TABDIMS\n"
"/\n"
"\n"
"OIL\n"
"GAS\n"
"WATER\n"
"\n"
"DISGAS\n"
"\n"
"FIELD\n"
"\n"
"GRID\n"
"\n"
"DX\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
" 300*1000 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"DY\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
" 300*1000 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"DZ\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
" 100*20 100*30 100*50 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"\n"
"TOPS\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
" 100*8325 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"\n"
"\n"
"PROPS\n"
"\n"
"SWOF\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
"0.12 0 1 0\n"
"0.18 4.64876033057851E-008 1 0\n"
"0.24 0.000000186 0.997 0\n"
"0.3 4.18388429752066E-007 0.98 0\n"
"0.36 7.43801652892562E-007 0.7 0\n"
"0.42 1.16219008264463E-006 0.35 0\n"
"0.48 1.67355371900826E-006 0.2 0\n"
"0.54 2.27789256198347E-006 0.09 0\n"
"0.6 2.97520661157025E-006 0.021 0\n"
"0.66 3.7654958677686E-006 0.01 0\n"
"0.72 4.64876033057851E-006 0.001 0\n"
"0.78 0.000005625 0.0001 0\n"
"0.84 6.69421487603306E-006 0 0\n"
"0.91 8.05914256198347E-006 0 0\n"
"1 0.984 0 0 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"\n"
"\n"
"SGOF\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
"0 0 1 0\n"
"0.001 0 1 0\n"
"0.02 0 0.997 0\n"
"0.05 0.005 0.980 0\n"
"0.12 0.025 0.700 0\n"
"0.2 0.075 0.350 0\n"
"0.25 0.125 0.200 0\n"
"0.3 0.190 0.090 0\n"
"0.4 0.410 0.021 0\n"
"0.45 0.60 0.010 0\n"
"0.5 0.72 0.001 0\n"
"0.6 0.87 0.0001 0\n"
"0.7 0.94 0.000 0\n"
"0.85 0.98 0.000 0\n"
"0.88 0.984 0.000 0 /\n";
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
static const char* fam2DeckString =
"RUNSPEC\n"
"\n"
"DIMENS\n"
" 10 10 3 /\n"
"\n"
"TABDIMS\n"
"/\n"
"\n"
"OIL\n"
"GAS\n"
"WATER\n"
"\n"
"DISGAS\n"
"\n"
"FIELD\n"
"\n"
"GRID\n"
"\n"
"DX\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
" 300*1000 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"DY\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
" 300*1000 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"DZ\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
" 100*20 100*30 100*50 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"\n"
"TOPS\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
" 100*8325 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"\n"
"\n"
"PROPS\n"
"\n"
"PVTW\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
" 4017.55 1.038 3.22E-6 0.318 0.0 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"\n"
"\n"
"SWFN\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
"0.12 0 0\n"
"0.18 4.64876033057851E-008 0\n"
"0.24 0.000000186 0\n"
"0.3 4.18388429752066E-007 0\n"
"0.36 7.43801652892562E-007 0\n"
"0.42 1.16219008264463E-006 0\n"
"0.48 1.67355371900826E-006 0\n"
"0.54 2.27789256198347E-006 0\n"
"0.6 2.97520661157025E-006 0\n"
"0.66 3.7654958677686E-006 0\n"
"0.72 4.64876033057851E-006 0\n"
"0.78 0.000005625 0\n"
"0.84 6.69421487603306E-006 0\n"
"0.91 8.05914256198347E-006 0\n"
"1 0.984 0 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"\n"
"\n"
"SGFN\n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
"0 0 0\n"
"0.001 0 0\n"
"0.02 0 0\n"
"0.05 0.005 0\n"
"0.12 0.025 0\n"
"0.2 0.075 0\n"
"0.25 0.125 0\n"
"0.3 0.190 0\n"
"0.4 0.410 0\n"
"0.45 0.60 0\n"
"0.5 0.72 0\n"
"0.6 0.87 0\n"
"0.7 0.94 0\n"
"0.85 0.98 0\n"
"0.88 0.984 0 /\n"
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
"\n"
"SOF3\n"
Fix the SOF3 input to make the KROW input similar as in SWOF.
2015-10-12 07:26:19 -05:00
" 0 0 0 \n"
" 0.03 0 0 \n"
" 0.09 0 0 \n"
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
" 0.16 0 0 \n"
Fix the SOF3 input to make the KROW input similar as in SWOF.
2015-10-12 07:26:19 -05:00
" 0.18 1* 0 \n"
" 0.22 0.0001 1* \n"
" 0.28 0.001 0.0001 \n"
" 0.34 0.01 1* \n"
" 0.38 1* 0.001 \n"
" 0.40 0.021 1* \n"
" 0.43 1* 0.01 \n"
" 0.46 0.09 1* \n"
" 0.48 1* 0.021 \n"
" 0.52 0.2 1* \n"
" 0.58 0.35 0.09 \n"
" 0.63 1* 0.2 \n"
" 0.64 0.7 1* \n"
" 0.68 1* 0.35 \n"
" 0.70 0.98 1* \n"
" 0.76 0.997 0.7 \n"
" 0.83 1 0.98 \n"
" 0.86 1 0.997 \n"
" 0.879 1 1 \n"
" 0.88 1 1 / \n"
"\n";
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
//Taken as a mix of the SPE1 cases above, and Norne to enable hysteresis
static const char* hysterDeckString =
"RUNSPEC\n"
"\n"
"DIMENS\n"
" 10 10 3 /\n"
"\n"
"TABDIMS\n"
"/\n"
"\n"
"OIL\n"
"GAS\n"
"WATER\n"
"\n"
"DISGAS\n"
"\n"
"FIELD\n"
"\n"
"GRID\n"
"\n"
"DX\n"
" 300*1000 /\n"
"DY\n"
" 300*1000 /\n"
"DZ\n"
" 100*20 100*30 100*50 /\n"
"\n"
"TOPS\n"
" 100*8325 /\n"
"\n"
"\n"
"EHYSTR\n"
"0.1 0 0.1 1* KR /\n"
"\n"
"SATOPTS\n"
"HYSTER /\n"
"\n"
"PROPS\n"
"\n"
"SWOF\n"
"0.12 0 1 0\n"
"0.18 4.64876033057851E-008 1 0\n"
"0.24 0.000000186 0.997 0\n"
"0.3 4.18388429752066E-007 0.98 0\n"
"0.36 7.43801652892562E-007 0.7 0\n"
"0.42 1.16219008264463E-006 0.35 0\n"
"0.48 1.67355371900826E-006 0.2 0\n"
"0.54 2.27789256198347E-006 0.09 0\n"
"0.6 2.97520661157025E-006 0.021 0\n"
"0.66 3.7654958677686E-006 0.01 0\n"
"0.72 4.64876033057851E-006 0.001 0\n"
"0.78 0.000005625 0.0001 0\n"
"0.84 6.69421487603306E-006 0 0\n"
"0.91 8.05914256198347E-006 0 0\n"
"1 0.984 0 0 /\n"
"\n"
"\n"
"SGOF\n"
"0 0 1 0\n"
"0.001 0 1 0\n"
"0.02 0 0.997 0\n"
"0.05 0.005 0.980 0\n"
"0.12 0.025 0.700 0\n"
"0.2 0.075 0.350 0\n"
"0.25 0.125 0.200 0\n"
"0.3 0.190 0.090 0\n"
"0.4 0.410 0.021 0\n"
"0.45 0.60 0.010 0\n"
"0.5 0.72 0.001 0\n"
"0.6 0.87 0.0001 0\n"
"0.7 0.94 0.000 0\n"
"0.85 0.98 0.000 0\n"
"0.88 0.984 0.000 0 /\n";
tests: added checks with Scalar=float. All tests compile with Scalar=float, but only some work.
2016-01-14 18:28:07 -06:00
template <class Scalar>
inline void testAll()
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
{
enum { numPhases = 3 };
enum { waterPhaseIdx = 0 };
enum { oilPhaseIdx = 1 };
enum { gasPhaseIdx = 2 };
typedef Opm::ThreePhaseMaterialTraits<Scalar,
/*wettingPhaseIdx=*/waterPhaseIdx,
/*nonWettingPhaseIdx=*/oilPhaseIdx,
/*gasPhaseIdx=*/gasPhaseIdx> MaterialTraits;
typedef Opm::SimpleModularFluidState<Scalar,
/*numPhases=*/3,
/*numComponents=*/3,
void,
/*storePressure=*/false,
/*storeTemperature=*/false,
/*storeComposition=*/false,
/*storeFugacity=*/false,
/*storeSaturation=*/true,
/*storeDensity=*/false,
/*storeViscosity=*/false,
/*storeEnthalpy=*/false> FluidState;
Opm::Parser parser;
rename ParserMode as ParseContext.
2016-03-16 19:49:02 -05:00
Opm::ParseContext parseContext;
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
{
typedef Opm::EclMaterialLawManager<MaterialTraits> MaterialLawManager;
tests: added checks with Scalar=float. All tests compile with Scalar=float, but only some work.
2016-01-14 18:28:07 -06:00
typedef typename MaterialLawManager::MaterialLaw MaterialLaw;
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
rename ParserMode as ParseContext.
2016-03-16 19:49:02 -05:00
const auto deck = parser.parseString(fam1DeckString, parseContext);
Update to shared_ptr-less parser interface.
2016-10-13 07:49:48 -05:00
const Opm::EclipseState eclState(deck, parseContext);
const auto& eclGrid = eclState.getInputGrid();
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
Update to shared_ptr-less parser interface.
2016-10-13 07:49:48 -05:00
size_t n = eclGrid.getCartesianSize();
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
std::vector<int> compressedToCartesianIdx(n);
for (size_t i = 0; i < n; ++ i)
compressedToCartesianIdx[i] = static_cast<int>(i);
MaterialLawManager materialLawManager;
materialLawManager.initFromDeck(deck, eclState, compressedToCartesianIdx);
if (materialLawManager.enableEndPointScaling())
OPM_THROW(std::logic_error,
"Discrepancy between the deck and the EclMaterialLawManager");
if (materialLawManager.enableHysteresis())
OPM_THROW(std::logic_error,
"Discrepancy between the deck and the EclMaterialLawManager");
rename ParserMode as ParseContext.
2016-03-16 19:49:02 -05:00
const auto fam2Deck = parser.parseString(fam2DeckString, parseContext);
Update to shared_ptr-less parser interface.
2016-10-13 07:49:48 -05:00
const Opm::EclipseState fam2EclState(fam2Deck, parseContext);
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
Opm::EclMaterialLawManager<MaterialTraits> fam2MaterialLawManager;
fam2MaterialLawManager.initFromDeck(fam2Deck, fam2EclState, compressedToCartesianIdx);
if (fam2MaterialLawManager.enableEndPointScaling())
OPM_THROW(std::logic_error,
"Discrepancy between the deck and the EclMaterialLawManager");
if (fam2MaterialLawManager.enableHysteresis())
OPM_THROW(std::logic_error,
"Discrepancy between the deck and the EclMaterialLawManager");
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
const auto hysterDeck = parser.parseString(hysterDeckString, parseContext);
const Opm::EclipseState hysterEclState(hysterDeck, parseContext);
Opm::EclMaterialLawManager<MaterialTraits> hysterMaterialLawManager;
hysterMaterialLawManager.initFromDeck(hysterDeck, hysterEclState, compressedToCartesianIdx);
if (hysterMaterialLawManager.enableEndPointScaling())
OPM_THROW(std::logic_error,
"Discrepancy between the deck and the EclMaterialLawManager");
if (hysterMaterialLawManager.enableHysteresis() != true)
OPM_THROW(std::logic_error,
"Discrepancy between the deck and the EclMaterialLawManager");
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
// make sure that the saturation functions for both keyword families are
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
// identical, and that setting and getting the hysteresis parameters works
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
for (unsigned elemIdx = 0; elemIdx < n; ++ elemIdx) {
for (int i = -10; i < 120; ++ i) {
Scalar Sw = Scalar(i)/100;
for (int j = i; j < 120; ++ j) {
Scalar So = Scalar(j)/100;
Scalar Sg = 1 - Sw - So;
FluidState fs;
fs.setSaturation(waterPhaseIdx, Sw);
fs.setSaturation(oilPhaseIdx, So);
fs.setSaturation(gasPhaseIdx, Sg);
DenseAD: make less fuzz about it this patch converts to code to use the convenience functions instead of the math toolboxes whereever possible. the main advantage is that Opm::foo(x) will work regardless of the type of `x`, but it also reduces visual clutter. also, constant Evaluations are now directly created by assigning Scalars, which removes further visual noise. while I hope it improves the readability of the code, functionality-wise this patch should not change anything.
2017-06-12 09:36:14 -05:00
Scalar pcFam1[numPhases] = { 0.0, 0.0 };
Scalar pcFam2[numPhases] = { 0.0, 0.0 };
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
MaterialLaw::capillaryPressures(pcFam1,
materialLawManager.materialLawParams(elemIdx),
fs);
MaterialLaw::capillaryPressures(pcFam2,
fam2MaterialLawManager.materialLawParams(elemIdx),
fs);
DenseAD: make less fuzz about it this patch converts to code to use the convenience functions instead of the math toolboxes whereever possible. the main advantage is that Opm::foo(x) will work regardless of the type of `x`, but it also reduces visual clutter. also, constant Evaluations are now directly created by assigning Scalars, which removes further visual noise. while I hope it improves the readability of the code, functionality-wise this patch should not change anything.
2017-06-12 09:36:14 -05:00
Scalar krFam1[numPhases] = { 0.0, 0.0 };
Scalar krFam2[numPhases] = { 0.0, 0.0 };
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
MaterialLaw::relativePermeabilities(krFam1,
materialLawManager.materialLawParams(elemIdx),
fs);
MaterialLaw::relativePermeabilities(krFam2,
fam2MaterialLawManager.materialLawParams(elemIdx),
fs);
for (unsigned phaseIdx = 0; phaseIdx < numPhases; ++ phaseIdx) {
if (std::abs(pcFam1[phaseIdx] - pcFam2[phaseIdx]) > 1e-5)
OPM_THROW(std::logic_error,
"Discrepancy between capillary pressure of family 1 and family 2 keywords");
if (std::abs(krFam1[phaseIdx] - krFam2[phaseIdx]) > 1e-1)
OPM_THROW(std::logic_error,
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
"Discrepancy between relative permeabilities of family 1 and family 2 keywords");
}
// This should ideally test each of the materials (stone1, stone2, default, two-phase),
// but currently only tests default
const Scalar pcSwMdc_in[2] = { 1.0/2.0, 1.0/3.0 };
const Scalar krnSwMdc_in[2] = { 1.0/5.0, 1.0/7.0 };
hysterMaterialLawManager.setOilWaterHysteresisParams(
pcSwMdc_in[0],
krnSwMdc_in[0],
elemIdx);
hysterMaterialLawManager.setGasOilHysteresisParams(
pcSwMdc_in[1],
krnSwMdc_in[1],
elemIdx);
DenseAD: make less fuzz about it this patch converts to code to use the convenience functions instead of the math toolboxes whereever possible. the main advantage is that Opm::foo(x) will work regardless of the type of `x`, but it also reduces visual clutter. also, constant Evaluations are now directly created by assigning Scalars, which removes further visual noise. while I hope it improves the readability of the code, functionality-wise this patch should not change anything.
2017-06-12 09:36:14 -05:00
Scalar pcSwMdc_out[2] = { 0.0, 0.0 };
Scalar krnSwMdc_out[2] = { 0.0, 0.0 };
Add option to store/restore hysteresis parameters
2017-02-24 10:09:40 -06:00
hysterMaterialLawManager.oilWaterHysteresisParams(
pcSwMdc_out[0],
krnSwMdc_out[0],
elemIdx);
hysterMaterialLawManager.gasOilHysteresisParams(
pcSwMdc_out[1],
krnSwMdc_out[1],
elemIdx);
for (unsigned phasePairIdx = 0; phasePairIdx < 2; ++ phasePairIdx) {
if ((pcSwMdc_in[phasePairIdx] - pcSwMdc_out[phasePairIdx]) != 0.0)
OPM_THROW(std::logic_error,
"Hysteresis parameters did not propagate correctly");
if ((krnSwMdc_in[phasePairIdx] - krnSwMdc_out[phasePairIdx]) != 0.0)
OPM_THROW(std::logic_error,
"Hysteresis parameters did not propagate correctly");
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
}
}
}
}
}
tests: added checks with Scalar=float. All tests compile with Scalar=float, but only some work.
2016-01-14 18:28:07 -06:00
}
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
initialize MPI for all unit tests This started to cause crashes for me. I don't really have an idea why, but it is not too bad of a thing to do anyway...
2016-04-17 04:28:06 -05:00
int main(int argc, char **argv)
tests: added checks with Scalar=float. All tests compile with Scalar=float, but only some work.
2016-01-14 18:28:07 -06:00
{
initialize MPI for all unit tests This started to cause crashes for me. I don't really have an idea why, but it is not too bad of a thing to do anyway...
2016-04-17 04:28:06 -05:00
Dune::MPIHelper::instance(argc, argv);
testAll<double>();
testAll<float>();
various improvements - add unit tests for the EclMaterialLawManager and the black-oil PVT classes - rework the API of the blackoil PVT classes so that it follows the initFromDeck() pattern and uses multiplexer classes instead of dynamic polymorphism to select the concrete PVT approach - the former change allowed to use the BlackOil fluid system with arbitrary Evaluations, i.e., it is not limited to a single Evaluation class which is specified as a class template argument anymore. - more fixes for GCC and clang warnings. now it should be reasonably hard to trigger warnings using these compilers. this commit squashes the following patches: - add a unit test for the EclMaterialLawManager - black oil: simplify the WaterPvtInterface - add a unit test for the PVT classes of the black oil fluid system - black oil: improvements to the PVT classes - blackoil PVT: remove dynamic polymorphism
2015-09-22 09:44:28 -05:00
return 0;
}
Reference in New Issue Copy Permalink