#5662 and #5663 Add Elm Prop Table options for K0_* and rename UCS, POISSON_RATIO and DF

This commit is contained in:
Gaute Lindkvist
2020-03-10 16:00:08 +01:00
parent 9a2d256392
commit 2b7cbee0a6

View File

@@ -269,7 +269,7 @@ RigWbsParameter RigWbsParameter::poissonRatio()
return RigWbsParameter( "Poisson Ratio", return RigWbsParameter( "Poisson Ratio",
false, false,
{{LAS_FILE, SourceAddress( "POISSON_RATIO_INP" )}, {{LAS_FILE, SourceAddress( "POISSON_RATIO_INP" )},
{ELEMENT_PROPERTY_TABLE, SourceAddress( "RATIO" )}, {ELEMENT_PROPERTY_TABLE, SourceAddress( "POISSON_RATIO_INP" )},
{USER_DEFINED, SourceAddress()}} ); {USER_DEFINED, SourceAddress()}} );
} }
@@ -281,7 +281,7 @@ RigWbsParameter RigWbsParameter::UCS()
return RigWbsParameter( "UCS", return RigWbsParameter( "UCS",
false, false,
{{LAS_FILE, SourceAddress( "UCS_INP", "", RiaWellLogUnitTools::MPaUnitString() )}, {{LAS_FILE, SourceAddress( "UCS_INP", "", RiaWellLogUnitTools::MPaUnitString() )},
{ELEMENT_PROPERTY_TABLE, SourceAddress( "UCS", RiaWellLogUnitTools::barUnitString() )}, {ELEMENT_PROPERTY_TABLE, SourceAddress( "UCS_INP", RiaWellLogUnitTools::barUnitString() )},
{USER_DEFINED, SourceAddress( "", "", RiaWellLogUnitTools::barUnitString() )}} ); {USER_DEFINED, SourceAddress( "", "", RiaWellLogUnitTools::barUnitString() )}} );
} }
@@ -325,7 +325,7 @@ RigWbsParameter RigWbsParameter::DF()
return RigWbsParameter( "DF", return RigWbsParameter( "DF",
false, false,
{{LAS_FILE, SourceAddress( "DF_INP" )}, {{LAS_FILE, SourceAddress( "DF_INP" )},
{ELEMENT_PROPERTY_TABLE, SourceAddress( "DF" )}, {ELEMENT_PROPERTY_TABLE, SourceAddress( "DF_INP" )},
{USER_DEFINED, SourceAddress()}} ); {USER_DEFINED, SourceAddress()}} );
} }
@@ -337,6 +337,7 @@ RigWbsParameter RigWbsParameter::K0_FG()
return RigWbsParameter( "K0_FG", return RigWbsParameter( "K0_FG",
false, false,
{{LAS_FILE, SourceAddress( "K0_FG_INP", "", RiaWellLogUnitTools::sg_emwUnitString() )}, {{LAS_FILE, SourceAddress( "K0_FG_INP", "", RiaWellLogUnitTools::sg_emwUnitString() )},
{ELEMENT_PROPERTY_TABLE, SourceAddress( "K0_FG_INP" )},
{USER_DEFINED, SourceAddress()}} ); {USER_DEFINED, SourceAddress()}} );
} }
@@ -348,6 +349,7 @@ RigWbsParameter RigWbsParameter::K0_SH()
return RigWbsParameter( "K0_SH", return RigWbsParameter( "K0_SH",
false, false,
{{LAS_FILE, SourceAddress( "K0_SH_INP", "", RiaWellLogUnitTools::sg_emwUnitString() )}, {{LAS_FILE, SourceAddress( "K0_SH_INP", "", RiaWellLogUnitTools::sg_emwUnitString() )},
{ELEMENT_PROPERTY_TABLE, SourceAddress( "K0_SH_INP" )},
{USER_DEFINED, SourceAddress()}} ); {USER_DEFINED, SourceAddress()}} );
} }