diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp index fa8f715af2..269eec1081 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp @@ -134,7 +134,7 @@ std::vector //-------------------------------------------------------------------------------------------------- std::vector RicExportFractureCompletionsImpl::generateCompdatValues(RimEclipseCase* caseToApply, - const QString& wellPathName, + const QString& wellNameForExport, const RigWellPath* wellPathGeometry, const std::vector& fractures, std::vector* fractureDataReportItems, @@ -191,7 +191,7 @@ std::vector } return generateCompdatValuesConst(caseToApply, - wellPathName, + wellNameForExport, wellPathGeometry, fractures, fractureDataReportItems, @@ -204,7 +204,7 @@ std::vector //-------------------------------------------------------------------------------------------------- std::vector RicExportFractureCompletionsImpl::generateCompdatValuesConst( const RimEclipseCase* caseToApply, - const QString& wellPathName, + const QString& wellNameForExport, const RigWellPath* wellPathGeometry, const std::vector& fractures, std::vector* fractureDataReportItems, @@ -221,8 +221,8 @@ std::vector RicExportFractureCompletionsImpl::generateCompdat double cDarcyInCorrectUnit = RiaEclipseUnitTools::darcysConstant(caseToApply->eclipseCaseData()->unitsType()); const RigMainGrid* mainGrid = caseToApply->eclipseCaseData()->mainGrid(); - const RigCaseCellResultsData* results = caseToApply->results(RiaDefines::MATRIX_MODEL); - const RigActiveCellInfo* actCellInfo = caseToApply->eclipseCaseData()->activeCellInfo(RiaDefines::MATRIX_MODEL); + const RigCaseCellResultsData* results = caseToApply->results(RiaDefines::MATRIX_MODEL); + const RigActiveCellInfo* actCellInfo = caseToApply->eclipseCaseData()->activeCellInfo(RiaDefines::MATRIX_MODEL); bool performPressureDepletionScaling = pdParams.performScaling; @@ -237,7 +237,7 @@ std::vector RicExportFractureCompletionsImpl::generateCompdat double currentWBHPFromSummary = 0.0; // Find well pressures (WBHP) from summary case. getWellPressuresAndInitialProductionTimeStepFromSummaryData(caseToApply, - wellPathName, + wellNameForExport, pdParams.pressureScalingTimeStep, &initialWellProductionTimeStep, &initialWBHPFromSummary, @@ -331,14 +331,12 @@ std::vector RicExportFractureCompletionsImpl::generateCompdat RigTransmissibilityCondenser scaledCondenser = transCondenser; // 1. Scale matrix to fracture transmissibilities by matrix to fracture pressure std::map originalLumpedMatrixToFractureTrans = scaledCondenser.scaleMatrixToFracTransByMatrixWellDP( - actCellInfo, - currentWellPressure, - *currentMatrixPressures, &minPressureDrop, &maxPressureDrop); + actCellInfo, currentWellPressure, *currentMatrixPressures, &minPressureDrop, &maxPressureDrop); // 2: Calculate new external transmissibilities scaledCondenser.calculateCondensedTransmissibilities(); { // 3: H�gst�l correction. - + // a. Calculate new effective fracture to well transmissiblities std::map fictitiousFractureToWellTransmissibilities = scaledCondenser.calculateFicticiousFractureToWellTransmissibilities(); @@ -349,19 +347,23 @@ std::vector RicExportFractureCompletionsImpl::generateCompdat matrixToWellTrans = effectiveMatrixToWellTrans; } } - + std::vector allCompletionsForOneFracture = - generateCompdatValuesForFracture(matrixToWellTrans, wellPathName, caseToApply, fracture, fracTemplate); + generateCompdatValuesForFracture(matrixToWellTrans, wellNameForExport, caseToApply, fracture, fracTemplate); if (fractureDataReportItems) { RicWellPathFractureReportItem reportItem( - wellPathName, fracture->name(), fracTemplate->name(), fracture->fractureMD()); + wellNameForExport, fracture->name(), fracTemplate->name(), fracture->fractureMD()); reportItem.setUnitSystem(fracTemplate->fractureTemplateUnit()); - reportItem.setPressureDepletionParameters(performPressureDepletionScaling, + reportItem.setPressureDepletionParameters( + performPressureDepletionScaling, caseToApply->timeStepStrings()[pdParams.pressureScalingTimeStep], caf::AppEnum::uiTextFromIndex(pdParams.wbhpSource), - pdParams.userWBHP, currentWellPressure, minPressureDrop, maxPressureDrop); + pdParams.userWBHP, + currentWellPressure, + minPressureDrop, + maxPressureDrop); RicExportFractureCompletionsImpl::calculateAndSetReportItemData( allCompletionsForOneFracture, eclToFractureCalc, reportItem); @@ -645,7 +647,7 @@ std::map //-------------------------------------------------------------------------------------------------- std::vector RicExportFractureCompletionsImpl::generateCompdatValuesForFracture( const std::map& matrixToWellTransmissibilites, - const QString& wellPathName, + const QString& wellNameForExport, const RimEclipseCase* caseToApply, const RimFracture* fracture, const RimFractureTemplate* fracTemplate) @@ -656,7 +658,7 @@ std::vector RicExportFractureCompletionsImpl::generateCompdat size_t globalCellIndex = matrixToWellTransmissibility.first; double trans = matrixToWellTransmissibility.second; RigCompletionData compDat( - wellPathName, RigCompletionDataGridCell(globalCellIndex, caseToApply->mainGrid()), fracture->fractureMD()); + wellNameForExport, RigCompletionDataGridCell(globalCellIndex, caseToApply->mainGrid()), fracture->fractureMD()); double diameter = 2.0 * fracture->wellRadius(); compDat.setFromFracture(trans, fracTemplate->skinFactor(), diameter); diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.h b/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.h index 643222f059..06c670e8a0 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.h +++ b/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.h @@ -84,7 +84,7 @@ public: PressureDepletionParameters pdParams = PressureDepletionParameters()); static std::vector generateCompdatValues(RimEclipseCase* caseToApply, - const QString& wellPathName, + const QString& wellNameForExport, const RigWellPath* wellPathGeometry, const std::vector& fractures, std::vector* fractureDataReportItems, diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h index fd9f89aea7..97ecc4b783 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h @@ -28,7 +28,7 @@ class RicWellPathFractureReportItem { public: - RicWellPathFractureReportItem(const QString& wellPathName, const QString& fractureName, const QString& fractureTemplateName, double measuredDepth); + RicWellPathFractureReportItem(const QString& wellPathNameForExport, const QString& fractureName, const QString& fractureTemplateName, double measuredDepth); void setData(double trans, size_t connCount, double area); void setWidthAndConductivity(double width, double conductivity);