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

#6364 Fix incorrect spelling of coefficient everywhere.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-08-26 10:18:29 +02:00
parent 7daed80af7
commit e6d170a230
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Application/RiaFractureModelDefines.cpp
View File

@ -46,9 +46,9 @@ void AppEnum<RiaDefines::CurveProperty>::setUp()
"RELATIVE_PERMEABILITY_FACTOR", "RELATIVE_PERMEABILITY_FACTOR",
"Relative Permeability Factor" ); "Relative Permeability Factor" );
addItem( RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT, "PORO_ELASTIC_CONSTANT", "Poro-Elastic Constant" ); addItem( RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT, "PORO_ELASTIC_CONSTANT", "Poro-Elastic Constant" );
addItem( RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFISIENT, addItem( RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFICIENT,
"THERMAL_EXPANSION_COEFFISIENT", "THERMAL_EXPANSION_COEFFICIENT",
"Thermal Expansion Coeffisient" ); "Thermal Expansion Coefficient" );
addItem( RiaDefines::CurveProperty::IMMOBILE_FLUID_SATURATION, "IMMOBILE_FLUID_SATURATION", "Immobile FLuid Saturation" ); addItem( RiaDefines::CurveProperty::IMMOBILE_FLUID_SATURATION, "IMMOBILE_FLUID_SATURATION", "Immobile FLuid Saturation" );
setDefault( RiaDefines::CurveProperty::UNDEFINED ); setDefault( RiaDefines::CurveProperty::UNDEFINED );

2
ApplicationCode/Application/RiaFractureModelDefines.h
View File

@ -47,7 +47,7 @@ enum class CurveProperty
TEMPERATURE, TEMPERATURE,
RELATIVE_PERMEABILITY_FACTOR, RELATIVE_PERMEABILITY_FACTOR,
PORO_ELASTIC_CONSTANT, PORO_ELASTIC_CONSTANT,
THERMAL_EXPANSION_COEFFISIENT, THERMAL_EXPANSION_COEFFICIENT,
IMMOBILE_FLUID_SATURATION, IMMOBILE_FLUID_SATURATION,
}; };
}; // namespace RiaDefines }; // namespace RiaDefines

2
ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp
View File

@ -143,7 +143,7 @@ RimFractureModelPlot*
RiaDefines::CurveProperty::SPURT_LOSS, RiaDefines::CurveProperty::SPURT_LOSS,
RiaDefines::CurveProperty::RELATIVE_PERMEABILITY_FACTOR, RiaDefines::CurveProperty::RELATIVE_PERMEABILITY_FACTOR,
RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT, RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT,
RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFISIENT, RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFICIENT,
RiaDefines::CurveProperty::IMMOBILE_FLUID_SATURATION}; RiaDefines::CurveProperty::IMMOBILE_FLUID_SATURATION};
for ( auto result : results ) for ( auto result : results )

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp
View File

@ -85,7 +85,7 @@ RigFemScalarResultFrames*
frameCountProgress.incrementProgress(); frameCountProgress.incrementProgress();
// Biot porelastic coeffisient (alpha) // Biot porelastic coefficient (alpha)
frameCountProgress.setNextProgressIncrement( m_resultCollection->frameCount() ); frameCountProgress.setNextProgressIncrement( m_resultCollection->frameCount() );
RigFemScalarResultFrames* biotCoefficient = nullptr; RigFemScalarResultFrames* biotCoefficient = nullptr;
if ( !m_resultCollection->biotResultAddress().isEmpty() ) if ( !m_resultCollection->biotResultAddress().isEmpty() )

8
ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp
View File

@ -195,9 +195,9 @@ RimFractureModel::RimFractureModel()
"" ); "" );
CAF_PDM_InitScriptableField( &m_poroElasticConstantDefault, "PoroElasticConstant", 0.0, "Poro-Elastic Constant", "", "", "" ); CAF_PDM_InitScriptableField( &m_poroElasticConstantDefault, "PoroElasticConstant", 0.0, "Poro-Elastic Constant", "", "", "" );
CAF_PDM_InitScriptableField( &m_thermalExpansionCoeffientDefault, CAF_PDM_InitScriptableField( &m_thermalExpansionCoeffientDefault,
"ThermalExpansionCoeffisient", "ThermalExpansionCoefficient",
0.0, 0.0,
"Thermal Expansion Coeffisient [1/C]", "Thermal Expansion Coefficient [1/C]",
"", "",
"", "",
"" ); "" );
@ -767,7 +767,7 @@ double RimFractureModel::getDefaultValueForProperty( RiaDefines::CurveProperty c
{ {
return m_poroElasticConstantDefault; return m_poroElasticConstantDefault;
} }
else if ( curveProperty == RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFISIENT ) else if ( curveProperty == RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFICIENT )
{ {
return m_thermalExpansionCoeffientDefault; return m_thermalExpansionCoeffientDefault;
} }
@ -786,7 +786,7 @@ bool RimFractureModel::hasDefaultValueForProperty( RiaDefines::CurveProperty cur
{ {
auto withDefaults = {RiaDefines::CurveProperty::RELATIVE_PERMEABILITY_FACTOR, auto withDefaults = {RiaDefines::CurveProperty::RELATIVE_PERMEABILITY_FACTOR,
RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT, RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT,
RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFISIENT}; RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFICIENT};
return std::find( withDefaults.begin(), withDefaults.end(), curveProperty ) != withDefaults.end(); return std::find( withDefaults.begin(), withDefaults.end(), curveProperty ) != withDefaults.end();
} }

12
ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp
View File

@ -623,15 +623,15 @@ std::vector<double> RimFractureModelPlot::calculatePoroElasticConstant() const
std::vector<double> RimFractureModelPlot::calculateThermalExpansionCoefficient() const std::vector<double> RimFractureModelPlot::calculateThermalExpansionCoefficient() const
{ {
// SI unit is 1/Celsius // SI unit is 1/Celsius
std::vector<double> coeffisientCelsius = std::vector<double> coefficientCelsius =
findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFISIENT ); findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFICIENT );
// Field unit is 1/Fahrenheit // Field unit is 1/Fahrenheit
std::vector<double> coeffisientFahrenheit; std::vector<double> coefficientFahrenheit;
for ( double c : coeffisientCelsius ) for ( double c : coefficientCelsius )
{ {
coeffisientFahrenheit.push_back( c / 1.8 ); coefficientFahrenheit.push_back( c / 1.8 );
} }
return coeffisientFahrenheit; return coefficientFahrenheit;
} }