Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ApplicationLibCode/Application/Tools/RiaEclipseUnitTools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@
#include "RiaEclipseUnitTools.h"

#include "cafAppEnum.h"

#include "cvfAssert.h"

#include <cmath>

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RiaEclipseUnitTools::darcysConstant( RiaDefines::EclipseUnitSystem unitSystem )
{
// See "Cartesian transmissibility calculations" in the "Eclipse Technical Description"
// CDARCY Darcys constant
// = 0.00852702 (E300); 0.008527 (ECLIPSE 100) (METRIC)
// = 0.00112712 (E300); 0.001127 (ECLIPSE 100) (FIELD)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RicWellPathExportMswTableData.h
${CMAKE_CURRENT_LIST_DIR}/RicMswTableDataTools.h
${CMAKE_CURRENT_LIST_DIR}/RicScheduleDataGenerator.h
${CMAKE_CURRENT_LIST_DIR}/RicTransmissibilityCalculator.h
)

set(SOURCE_GROUP_SOURCE_FILES
Expand All @@ -48,6 +49,7 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RicWellPathExportMswTableData.cpp
${CMAKE_CURRENT_LIST_DIR}/RicMswTableDataTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RicScheduleDataGenerator.cpp
${CMAKE_CURRENT_LIST_DIR}/RicTransmissibilityCalculator.cpp
)

list(APPEND COMMAND_CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "RicMswCompletions.h"
#include "RicMswExportInfo.h"
#include "RicMswSegment.h"
#include "RicTransmissibilityCalculator.h"
#include "RicWellPathExportCompletionDataFeatureImpl.h"
#include "RicWellPathExportMswTableData.h"

Expand Down Expand Up @@ -113,9 +114,9 @@ std::vector<RigCompletionData> RicFishbonesTransmissibilityCalculationFeatureImp
}
else
{
mainBoreDirection = RicWellPathExportCompletionDataFeatureImpl::calculateCellMainDirection( settings.caseToApply,
globalCellIndex,
wellBorePart.lengthsInCell );
mainBoreDirection = RicTransmissibilityCalculator::calculateCellMainDirection( settings.caseToApply,
globalCellIndex,
wellBorePart.lengthsInCell );
}
}

Expand All @@ -137,38 +138,36 @@ std::vector<RigCompletionData> RicFishbonesTransmissibilityCalculationFeatureImp
{
// No change in transmissibility for main bore
auto transmissibilityAndPermeability =
RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityData( settings.caseToApply,
wellPath,
wellBorePart.lengthsInCell,
wellBorePart.skinFactor,
wellBorePart.wellRadius,
globalCellIndex,
settings.useLateralNTG );
RicTransmissibilityCalculator::calculateTransmissibilityData( settings.caseToApply,
wellPath,
wellBorePart.lengthsInCell,
wellBorePart.skinFactor,
wellBorePart.wellRadius,
globalCellIndex,
settings.useLateralNTG );

transmissibility = transmissibilityAndPermeability.connectionFactor();
kh = transmissibilityAndPermeability.kh();
}
else
{
// Adjust transmissibility for fishbone laterals
auto transmissibilityAndPermeability =
RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityData( settings.caseToApply,
wellPath,
wellBorePart.lengthsInCell,
wellBorePart.skinFactor,
wellBorePart.wellRadius,
globalCellIndex,
settings.useLateralNTG,
numberOfLaterals,
mainBoreDirection );
auto transmissibilityAndPermeability = RicTransmissibilityCalculator::calculateTransmissibilityData( settings.caseToApply,
wellPath,
wellBorePart.lengthsInCell,
wellBorePart.skinFactor,
wellBorePart.wellRadius,
globalCellIndex,
settings.useLateralNTG,
numberOfLaterals,
mainBoreDirection );

transmissibility = transmissibilityAndPermeability.connectionFactor();
kh = transmissibilityAndPermeability.kh();
}

auto direction = RicWellPathExportCompletionDataFeatureImpl::calculateCellMainDirection( settings.caseToApply,
globalCellIndex,
wellBorePart.lengthsInCell );
auto direction =
RicTransmissibilityCalculator::calculateCellMainDirection( settings.caseToApply, globalCellIndex, wellBorePart.lengthsInCell );

completion.setTransAndWPImultBackgroundDataFromFishbone( transmissibility,
wellBorePart.skinFactor,
Expand Down
Loading