OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#5494 Add user changable water density and change model for where WBS-curves meet

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-02-10 12:39:16 +01:00
parent 6dfd994403
commit ae112bab64
6 changed files with 86 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ReservoirDataModel/RigWbsParameter.cpp
View File

@@ -336,21 +336,38 @@ RigWbsParameter RigWbsParameter::FG_Shale()
{
RigWbsParameter param( "FG Shale",
false,
{
{DERIVED_FROM_K0FG, SourceAddress()},
{PROPORTIONAL_TO_SH, SourceAddress()},
{LAS_FILE, SourceAddress( "FG_SHALE_INP" )},
} );
{{DERIVED_FROM_K0FG, SourceAddress()},
{PROPORTIONAL_TO_SH, SourceAddress()},
{LAS_FILE, SourceAddress( "FG_SHALE_INP" )}} );
param.setOptionsExclusive( true );
return param;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigWbsParameter RigWbsParameter::waterDensity()
{
RigWbsParameter param( "Density of Sea Water", false, {{USER_DEFINED, SourceAddress()}} );
return param;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RigWbsParameter> RigWbsParameter::allParameters()
{
return {PP_Reservoir(), PP_NonReservoir(), poissonRatio(), UCS(), OBG(), OBG0(), SH(), DF(), K0_FG(), K0_SH(), FG_Shale()};
return {PP_Reservoir(),
PP_NonReservoir(),
poissonRatio(),
UCS(),
OBG(),
OBG0(),
SH(),
DF(),
K0_FG(),
K0_SH(),
FG_Shale(),
waterDensity()};
}
//--------------------------------------------------------------------------------------------------