diff --git a/ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.cpp index e5f2187352..384c93af6d 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.cpp @@ -593,7 +593,7 @@ void RicWellPathExportCompletionDataFeature::appendCompletionData(std::mapfind(completion.cellIndex()); if (it != completionData->end()) { - it->second = it->second.combine(completion); + it->second = RigCompletionData::combine(it->second, completion); } else { diff --git a/ApplicationCode/ProjectDataModel/RimCaseAndFileExportSettings.cpp b/ApplicationCode/ProjectDataModel/RimCaseAndFileExportSettings.cpp index e67f947fe9..fa9ed4285f 100644 --- a/ApplicationCode/ProjectDataModel/RimCaseAndFileExportSettings.cpp +++ b/ApplicationCode/ProjectDataModel/RimCaseAndFileExportSettings.cpp @@ -31,7 +31,7 @@ RimCaseAndFileExportSettings::RimCaseAndFileExportSettings() { CAF_PDM_InitObject("RimCaseAndFileExportSettings", "", "", ""); - CAF_PDM_InitFieldNoDefault(&fileName, "Filename", "Export filename", "", "", ""); + CAF_PDM_InitFieldNoDefault(&fileName, "Filename", "Export Filename", "", "", ""); fileName.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName()); CAF_PDM_InitFieldNoDefault(&caseToApply, "CaseToApply", "Case to Apply", "", "", ""); diff --git a/ApplicationCode/ReservoirDataModel/RigCompletionData.cpp b/ApplicationCode/ReservoirDataModel/RigCompletionData.cpp index 4f64e2d467..066f15504a 100644 --- a/ApplicationCode/ReservoirDataModel/RigCompletionData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCompletionData.cpp @@ -59,25 +59,25 @@ RigCompletionData::RigCompletionData(const RigCompletionData& other) //================================================================================================== /// //================================================================================================== -RigCompletionData RigCompletionData::combine(const RigCompletionData& other) const +RigCompletionData RigCompletionData::combine(const RigCompletionData& first, const RigCompletionData& second) { - RigCompletionData result(*this); - CVF_ASSERT(result.m_wellName == other.m_wellName); - CVF_ASSERT(result.m_cellIndex == other.m_cellIndex); + RigCompletionData result(first); + CVF_ASSERT(result.m_wellName == second.m_wellName); + CVF_ASSERT(result.m_cellIndex == second.m_cellIndex); - if (onlyOneIsDefaulted(result.m_transmissibility, other.m_transmissibility)) + if (onlyOneIsDefaulted(result.m_transmissibility, second.m_transmissibility)) { RiaLogging::error("Transmissibility defaulted in one but not both, will produce erroneous result"); } else { - result.m_transmissibility += other.m_transmissibility; + result.m_transmissibility += second.m_transmissibility; } - result.m_metadata.reserve(result.m_metadata.size() + other.m_metadata.size()); - result.m_metadata.insert(result.m_metadata.end(), other.m_metadata.begin(), other.m_metadata.end()); + result.m_metadata.reserve(result.m_metadata.size() + second.m_metadata.size()); + result.m_metadata.insert(result.m_metadata.end(), second.m_metadata.begin(), second.m_metadata.end()); - result.m_count += other.m_count; + result.m_count += second.m_count; return result; } diff --git a/ApplicationCode/ReservoirDataModel/RigCompletionData.h b/ApplicationCode/ReservoirDataModel/RigCompletionData.h index 3ecd5c4ff8..6560c207b3 100644 --- a/ApplicationCode/ReservoirDataModel/RigCompletionData.h +++ b/ApplicationCode/ReservoirDataModel/RigCompletionData.h @@ -95,7 +95,7 @@ public: ~RigCompletionData(); RigCompletionData(const RigCompletionData& other); - RigCompletionData combine(const RigCompletionData& other) const; + static RigCompletionData combine(const RigCompletionData& first, const RigCompletionData& second); bool operator<(const RigCompletionData& other) const; RigCompletionData& operator=(const RigCompletionData& other);