OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename SpiralICD -> SICD

Browse Source
This commit is contained in:
Joakim Hove
2020-05-28 09:36:20 +02:00
parent 83cafe9517
commit 195d2b1c21
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/utils/ParallelSerialization.cpp
View File

@@ -22,7 +22,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/SpiralICD.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp>

4
opm/simulators/wells/MSWellHelpers.hpp
View File

@@ -25,7 +25,7 @@
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp> #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
#include <opm/simulators/utils/DeferredLogger.hpp> #include <opm/simulators/utils/DeferredLogger.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/SpiralICD.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.hpp>
#include <dune/istl/solvers.hh> #include <dune/istl/solvers.hh>
#if HAVE_UMFPACK #if HAVE_UMFPACK
#include <dune/istl/umfpack.hh> #include <dune/istl/umfpack.hh>
@@ -254,7 +254,7 @@ namespace mswellhelpers
template <typename ValueType> template <typename ValueType>
ValueType emulsionViscosity(const ValueType& water_fraction, const ValueType& water_viscosity, ValueType emulsionViscosity(const ValueType& water_fraction, const ValueType& water_viscosity,
const ValueType& oil_fraction, const ValueType& oil_viscosity, const ValueType& oil_fraction, const ValueType& oil_viscosity,
const SpiralICD& sicd) const SICD& sicd)
{ {
const double width_transition = sicd.widthTransitionRegion(); const double width_transition = sicd.widthTransitionRegion();

4
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@@ -3638,7 +3638,7 @@ namespace Opm
total_connection_length += connection_length; total_connection_length += connection_length;
} }
SpiralICD& sicd = *segment.spiralICD(); SICD& sicd = *segment.spiralICD();
sicd.updateScalingFactor(segment_length, total_connection_length); sicd.updateScalingFactor(segment_length, total_connection_length);
} }
} }
@@ -3676,7 +3676,7 @@ namespace Opm
pressureDropSpiralICD(const int seg) const pressureDropSpiralICD(const int seg) const
{ {
// TODO: We have to consider the upwinding here // TODO: We have to consider the upwinding here
const SpiralICD& sicd = *segmentSet()[seg].spiralICD(); const SICD& sicd = *segmentSet()[seg].spiralICD();
const std::vector<EvalWell>& phase_fractions = segment_phase_fractions_[seg]; const std::vector<EvalWell>& phase_fractions = segment_phase_fractions_[seg];
const std::vector<EvalWell>& phase_viscosities = segment_phase_viscosities_[seg]; const std::vector<EvalWell>& phase_viscosities = segment_phase_viscosities_[seg];

4
tests/test_ParallelRestart.cpp
View File

@@ -59,7 +59,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/SpiralICD.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp>
@@ -417,7 +417,7 @@ TEST_FOR_TYPE(SimpleTable)
TEST_FOR_TYPE(SimulationConfig) TEST_FOR_TYPE(SimulationConfig)
TEST_FOR_TYPE(SkprpolyTable) TEST_FOR_TYPE(SkprpolyTable)
TEST_FOR_TYPE(SkprwatTable) TEST_FOR_TYPE(SkprwatTable)
TEST_FOR_TYPE(SpiralICD) TEST_FOR_TYPE(SICD)
TEST_FOR_TYPE(SolventDensityTable) TEST_FOR_TYPE(SolventDensityTable)
TEST_FOR_TYPE(SummaryConfig) TEST_FOR_TYPE(SummaryConfig)
TEST_FOR_TYPE(SummaryConfigNode) TEST_FOR_TYPE(SummaryConfigNode)