From e6d170a230bf5da9099149e1e0a42eb29b3c5c51 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Wed, 26 Aug 2020 10:18:29 +0200 Subject: [PATCH] #6364 Fix incorrect spelling of coefficient everywhere. --- .../Application/RiaFractureModelDefines.cpp | 6 +++--- .../Application/RiaFractureModelDefines.h | 2 +- .../RicNewFractureModelPlotFeature.cpp | 2 +- ...RigFemPartResultCalculatorPoreCompressibility.cpp | 2 +- .../Completions/RimFractureModel.cpp | 8 ++++---- .../ProjectDataModel/RimFractureModelPlot.cpp | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ApplicationCode/Application/RiaFractureModelDefines.cpp b/ApplicationCode/Application/RiaFractureModelDefines.cpp index 68dd6c1707..ae0ab0dfd8 100644 --- a/ApplicationCode/Application/RiaFractureModelDefines.cpp +++ b/ApplicationCode/Application/RiaFractureModelDefines.cpp @@ -46,9 +46,9 @@ void AppEnum::setUp() "RELATIVE_PERMEABILITY_FACTOR", "Relative Permeability Factor" ); addItem( RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT, "PORO_ELASTIC_CONSTANT", "Poro-Elastic Constant" ); - addItem( RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFISIENT, - "THERMAL_EXPANSION_COEFFISIENT", - "Thermal Expansion Coeffisient" ); + addItem( RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFICIENT, + "THERMAL_EXPANSION_COEFFICIENT", + "Thermal Expansion Coefficient" ); addItem( RiaDefines::CurveProperty::IMMOBILE_FLUID_SATURATION, "IMMOBILE_FLUID_SATURATION", "Immobile FLuid Saturation" ); setDefault( RiaDefines::CurveProperty::UNDEFINED ); diff --git a/ApplicationCode/Application/RiaFractureModelDefines.h b/ApplicationCode/Application/RiaFractureModelDefines.h index 6eda767620..68dac98c63 100644 --- a/ApplicationCode/Application/RiaFractureModelDefines.h +++ b/ApplicationCode/Application/RiaFractureModelDefines.h @@ -47,7 +47,7 @@ enum class CurveProperty TEMPERATURE, RELATIVE_PERMEABILITY_FACTOR, PORO_ELASTIC_CONSTANT, - THERMAL_EXPANSION_COEFFISIENT, + THERMAL_EXPANSION_COEFFICIENT, IMMOBILE_FLUID_SATURATION, }; }; // namespace RiaDefines diff --git a/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp index caf136729a..26f093978a 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp @@ -143,7 +143,7 @@ RimFractureModelPlot* RiaDefines::CurveProperty::SPURT_LOSS, RiaDefines::CurveProperty::RELATIVE_PERMEABILITY_FACTOR, RiaDefines::CurveProperty::PORO_ELASTIC_CONSTANT, - RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFISIENT, + RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFICIENT, RiaDefines::CurveProperty::IMMOBILE_FLUID_SATURATION}; for ( auto result : results ) diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp index a3a998412d..9f1ec2fc62 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp +++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorPoreCompressibility.cpp @@ -85,7 +85,7 @@ RigFemScalarResultFrames* frameCountProgress.incrementProgress(); - // Biot porelastic coeffisient (alpha) + // Biot porelastic coefficient (alpha) frameCountProgress.setNextProgressIncrement( m_resultCollection->frameCount() ); RigFemScalarResultFrames* biotCoefficient = nullptr; if ( !m_resultCollection->biotResultAddress().isEmpty() ) diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp index 802a98fab0..5dc916a903 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp @@ -195,9 +195,9 @@ RimFractureModel::RimFractureModel() "" ); CAF_PDM_InitScriptableField( &m_poroElasticConstantDefault, "PoroElasticConstant", 0.0, "Poro-Elastic Constant", "", "", "" ); CAF_PDM_InitScriptableField( &m_thermalExpansionCoeffientDefault, - "ThermalExpansionCoeffisient", + "ThermalExpansionCoefficient", 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; } - else if ( curveProperty == RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFISIENT ) + else if ( curveProperty == RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFICIENT ) { return m_thermalExpansionCoeffientDefault; } @@ -786,7 +786,7 @@ bool RimFractureModel::hasDefaultValueForProperty( RiaDefines::CurveProperty cur { auto withDefaults = {RiaDefines::CurveProperty::RELATIVE_PERMEABILITY_FACTOR, 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(); } diff --git a/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp b/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp index 43f35df330..9b73144a7e 100644 --- a/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp +++ b/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp @@ -623,15 +623,15 @@ std::vector RimFractureModelPlot::calculatePoroElasticConstant() const std::vector RimFractureModelPlot::calculateThermalExpansionCoefficient() const { // SI unit is 1/Celsius - std::vector coeffisientCelsius = - findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFISIENT ); + std::vector coefficientCelsius = + findCurveAndComputeLayeredAverage( RiaDefines::CurveProperty::THERMAL_EXPANSION_COEFFICIENT ); // Field unit is 1/Fahrenheit - std::vector coeffisientFahrenheit; - for ( double c : coeffisientCelsius ) + std::vector coefficientFahrenheit; + for ( double c : coefficientCelsius ) { - coeffisientFahrenheit.push_back( c / 1.8 ); + coefficientFahrenheit.push_back( c / 1.8 ); } - return coeffisientFahrenheit; + return coefficientFahrenheit; }