Skip to content

Commit 68801ae

Browse files
jbreue16schmoelder
jbreue16
authored and
schmoelder
committed
return parameter value (instead of modifying factor) in parameter parameter dependence
1 parent 866db2c commit 68801ae

12 files changed

+81
-315
lines changed

‎src/libcadet/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ set(LIBCADET_SOURCES
146146
${CMAKE_SOURCE_DIR}/src/libcadet/model/paramdep/ParameterDependenceBase.cpp
147147
${CMAKE_SOURCE_DIR}/src/libcadet/model/paramdep/LiquidSaltSolidParameterDependence.cpp
148148
${CMAKE_SOURCE_DIR}/src/libcadet/model/paramdep/DummyParameterDependence.cpp
149-
${CMAKE_SOURCE_DIR}/src/libcadet/model/paramdep/IdentityParameterDependence.cpp
150149
${CMAKE_SOURCE_DIR}/src/libcadet/model/paramdep/PowerLawParameterDependence.cpp
151150
)
152151

‎src/libcadet/ParameterDependenceFactory.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ namespace cadet
2222
void registerLiquidSaltSolidParamDependence(std::unordered_map<std::string, std::function<model::IParameterStateDependence*()>>& paramDeps);
2323
void registerDummyParamDependence(std::unordered_map<std::string, std::function<model::IParameterStateDependence*()>>& paramDeps);
2424
void registerDummyParamDependence(std::unordered_map<std::string, std::function<model::IParameterParameterDependence*()>>& paramDeps);
25-
void registerIdentityParamDependence(std::unordered_map<std::string, std::function<model::IParameterStateDependence*()>>& paramDeps);
26-
void registerIdentityParamDependence(std::unordered_map<std::string, std::function<model::IParameterParameterDependence*()>>& paramDeps);
2725
void registerPowerLawParamDependence(std::unordered_map<std::string, std::function<model::IParameterParameterDependence*()>>& paramDeps);
2826
}
2927
}
@@ -33,11 +31,9 @@ namespace cadet
3331
// Register all ParamState dependencies
3432
model::paramdep::registerLiquidSaltSolidParamDependence(_paramStateDeps);
3533
model::paramdep::registerDummyParamDependence(_paramStateDeps);
36-
model::paramdep::registerIdentityParamDependence(_paramStateDeps);
3734

3835
// Register all ParamParam dependencies
3936
model::paramdep::registerDummyParamDependence(_paramParamDeps);
40-
model::paramdep::registerIdentityParamDependence(_paramParamDeps);
4137
model::paramdep::registerPowerLawParamDependence(_paramParamDeps);
4238
}
4339

‎src/libcadet/model/GeneralRateModel.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ bool GeneralRateModel<ConvDispOperator>::configureModelDiscretization(IParameter
440440
_filmDiffDep->configureModelDiscretization(paramProvider);
441441
}
442442
else
443-
_filmDiffDep = helper.createParameterParameterDependence("CONSTANT_ONE");
443+
_filmDiffDep = helper.createParameterParameterDependence("IDENTITY");
444444

445445
// ==== Construct and configure binding model
446446
clearBindingModels();
@@ -1907,11 +1907,11 @@ int GeneralRateModel<ConvDispOperator>::residualFlux(double t, unsigned int secI
19071907

19081908
const double relPos = _convDispOp.relativeCoordinate(colCell);
19091909
const active curVelocity = _convDispOp.currentVelocity(relPos);
1910-
const active modifier = _filmDiffDep->getValue(*this, ColumnPosition{ relPos, 0.0, 0.0 }, comp, ParTypeIndep, BoundStateIndep, curVelocity);
1910+
const ParamType filmDiffDep = static_cast<ParamType>(_filmDiffDep->getValue(*this, ColumnPosition{ relPos, 0.0, 0.0 }, comp, ParTypeIndep, BoundStateIndep, filmDiff[comp], curVelocity));
19111911
if (cadet_likely(_colParBoundaryOrder == 2))
1912-
kf_FV[comp] = 1.0 / (absOuterShellHalfRadius / epsP / static_cast<ParamType>(_poreAccessFactor[type * _disc.nComp + comp]) / static_cast<ParamType>(parDiff[comp]) + 1.0 / (static_cast<ParamType>(filmDiff[comp]) * static_cast<ParamType>(modifier)));
1912+
kf_FV[comp] = 1.0 / (absOuterShellHalfRadius / epsP / static_cast<ParamType>(_poreAccessFactor[type * _disc.nComp + comp]) / static_cast<ParamType>(parDiff[comp]) + 1.0 / filmDiffDep);
19131913
else
1914-
kf_FV[comp] = static_cast<ParamType>(filmDiff[comp]) * static_cast<ParamType>(modifier);
1914+
kf_FV[comp] = filmDiffDep;
19151915
}
19161916

19171917
// J_{0,f} block, adds flux to column void / bulk volume equations
@@ -1955,9 +1955,9 @@ int GeneralRateModel<ConvDispOperator>::residualFlux(double t, unsigned int secI
19551955

19561956
const double relPos = _convDispOp.relativeCoordinate(pblk);
19571957
const active curVelocity = _convDispOp.currentVelocity(relPos);
1958-
const active modifier = _filmDiffDep->getValue(*this, ColumnPosition{ relPos, 0.0, 0.0 }, comp, ParTypeIndep, BoundStateIndep, curVelocity);
1958+
const ParamType filmDiffDep = static_cast<ParamType>(_filmDiffDep->getValue(*this, ColumnPosition{ relPos, 0.0, 0.0 }, comp, ParTypeIndep, BoundStateIndep, filmDiff[comp], curVelocity));
19591959

1960-
kf_FV[comp] = (1.0 - static_cast<ParamType>(_parPorosity[type])) / (1.0 + epsP * static_cast<ParamType>(_poreAccessFactor[type * _disc.nComp + comp]) * static_cast<ParamType>(parDiff[comp]) / (absOuterShellHalfRadius * static_cast<ParamType>(filmDiff[comp]) * static_cast<ParamType>(modifier)));
1960+
kf_FV[comp] = (1.0 - static_cast<ParamType>(_parPorosity[type])) / (1.0 + epsP * static_cast<ParamType>(_poreAccessFactor[type * _disc.nComp + comp]) * static_cast<ParamType>(parDiff[comp]) / (absOuterShellHalfRadius * filmDiffDep));
19611961
}
19621962

19631963
const ColumnPosition colPos{(0.5 + static_cast<double>(pblk)) / static_cast<double>(_disc.nCol), 0.0, static_cast<double>(parCenterRadius[0]) / static_cast<double>(_parRadius[type])};
@@ -2070,12 +2070,12 @@ void GeneralRateModel<ConvDispOperator>::assembleOffdiagJac(double t, unsigned i
20702070

20712071
const double relPos = _convDispOp.relativeCoordinate(pblk);
20722072
const double curVelocity = static_cast<double>(_convDispOp.currentVelocity(relPos));
2073-
const double modifier = _filmDiffDep->getValue(*this, ColumnPosition{ relPos, 0.0, 0.0 }, comp, ParTypeIndep, BoundStateIndep, curVelocity);
2073+
const double filmDiffDep = static_cast<double>(_filmDiffDep->getValue(*this, ColumnPosition{ relPos, 0.0, 0.0 }, comp, ParTypeIndep, BoundStateIndep, filmDiff[comp], curVelocity));
20742074

20752075
if (cadet_likely(_colParBoundaryOrder == 2))
2076-
kf_FV[comp] = 1.0 / (absOuterShellHalfRadius / epsP / static_cast<double>(_poreAccessFactor[type * _disc.nComp + comp]) / static_cast<double>(parDiff[comp]) + 1.0 / (static_cast<double>(filmDiff[comp]) * modifier));
2076+
kf_FV[comp] = 1.0 / (absOuterShellHalfRadius / epsP / static_cast<double>(_poreAccessFactor[type * _disc.nComp + comp]) / static_cast<double>(parDiff[comp]) + 1.0 / filmDiffDep);
20772077
else
2078-
kf_FV[comp] = static_cast<double>(filmDiff[comp]) * modifier;
2078+
kf_FV[comp] = filmDiffDep;
20792079
}
20802080

20812081
// J_{0,f} block, adds flux to column void / bulk volume equations
@@ -2129,9 +2129,9 @@ void GeneralRateModel<ConvDispOperator>::assembleOffdiagJac(double t, unsigned i
21292129
{
21302130
const double relPos = _convDispOp.relativeCoordinate(pblk);
21312131
const double curVelocity = static_cast<double>(_convDispOp.currentVelocity(relPos));
2132-
const double modifier = _filmDiffDep->getValue(*this, ColumnPosition{ relPos, 0.0, 0.0 }, comp, ParTypeIndep, BoundStateIndep, curVelocity);
2132+
const double filmDiffDep = static_cast<double>(_filmDiffDep->getValue(*this, ColumnPosition{ relPos, 0.0, 0.0 }, comp, ParTypeIndep, BoundStateIndep, filmDiff[comp], curVelocity));
21332133

2134-
kf_FV[comp] = (1.0 - static_cast<double>(_parPorosity[type])) / (1.0 + epsP * static_cast<double>(_poreAccessFactor[type * _disc.nComp + comp]) * static_cast<double>(parDiff[comp]) / (absOuterShellHalfRadius * static_cast<double>(filmDiff[comp]) * modifier));
2134+
kf_FV[comp] = (1.0 - static_cast<double>(_parPorosity[type])) / (1.0 + epsP * static_cast<double>(_poreAccessFactor[type * _disc.nComp + comp]) * static_cast<double>(parDiff[comp]) / (absOuterShellHalfRadius * filmDiffDep));
21352135
}
21362136

21372137
const ColumnPosition colPos{ (0.5 + static_cast<double>(pblk)) / static_cast<double>(_disc.nCol), 0.0, static_cast<double>(parCenterRadius[0]) / static_cast<double>(_parRadius[type]) };

‎src/libcadet/model/LumpedRateModelWithPores.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ bool LumpedRateModelWithPores<ConvDispOperator>::configureModelDiscretization(IP
249249
_filmDiffDep->configureModelDiscretization(paramProvider);
250250
}
251251
else
252-
_filmDiffDep = helper.createParameterParameterDependence("CONSTANT_ONE");
252+
_filmDiffDep = helper.createParameterParameterDependence("IDENTITY");
253253

254254
// Allocate memory
255255
Indexer idxr(_disc);
@@ -1065,9 +1065,9 @@ int LumpedRateModelWithPores<ConvDispOperator>::residualFlux(double t, unsigned
10651065

10661066
const double relPos = _convDispOp.relativeCoordinate(colCell);
10671067
const active curVelocity = _convDispOp.currentVelocity(relPos);
1068-
const active modifier = _filmDiffDep->getValue(*this, ColumnPosition{relPos, 0.0, 0.0}, comp, ParTypeIndep, BoundStateIndep, curVelocity);
1068+
const ParamType filmDiffDep = static_cast<ParamType>(_filmDiffDep->getValue(*this, ColumnPosition{relPos, 0.0, 0.0}, comp, ParTypeIndep, BoundStateIndep, filmDiff[comp], curVelocity));
10691069

1070-
resCol[i] += jacCF_val * static_cast<ParamType>(filmDiff[comp]) * static_cast<ParamType>(modifier) * static_cast<ParamType>(_parTypeVolFrac[type + _disc.nParType * colCell]) * yFluxType[i];
1070+
resCol[i] += jacCF_val * filmDiffDep * static_cast<ParamType>(_parTypeVolFrac[type + _disc.nParType * colCell]) * yFluxType[i];
10711071
}
10721072

10731073
// J_{f,0} block, adds bulk volume state c_i to flux equation
@@ -1088,10 +1088,10 @@ int LumpedRateModelWithPores<ConvDispOperator>::residualFlux(double t, unsigned
10881088

10891089
for (unsigned int comp = 0; comp < _disc.nComp; ++comp)
10901090
{
1091-
const active modifier = _filmDiffDep->getValue(*this, ColumnPosition{relPos, 0.0, 0.0}, comp, ParTypeIndep, BoundStateIndep, curVelocity);
1091+
const ParamType filmDiffDep = static_cast<ParamType>(_filmDiffDep->getValue(*this, ColumnPosition{relPos, 0.0, 0.0}, comp, ParTypeIndep, BoundStateIndep, filmDiff[comp], curVelocity));
10921092

10931093
const unsigned int eq = pblk * idxr.strideColCell() + comp * idxr.strideColComp();
1094-
resParType[pblk * idxr.strideParBlock(type) + comp] += jacPF_val / static_cast<ParamType>(poreAccFactor[comp]) * static_cast<ParamType>(filmDiff[comp]) * static_cast<ParamType>(modifier) * yFluxType[eq];
1094+
resParType[pblk * idxr.strideParBlock(type) + comp] += jacPF_val / static_cast<ParamType>(poreAccFactor[comp]) * filmDiffDep * yFluxType[eq];
10951095
}
10961096
}
10971097

@@ -1154,10 +1154,10 @@ void LumpedRateModelWithPores<ConvDispOperator>::assembleOffdiagJac(double t, un
11541154

11551155
const double relPos = _convDispOp.relativeCoordinate(colCell);
11561156
const double curVelocity = static_cast<double>(_convDispOp.currentVelocity(relPos));
1157-
const double modifier = _filmDiffDep->getValue(*this, ColumnPosition{relPos, 0.0, 0.0}, comp, ParTypeIndep, BoundStateIndep, curVelocity);
1157+
const double filmDiffDep = static_cast<double>(_filmDiffDep->getValue(*this, ColumnPosition{relPos, 0.0, 0.0}, comp, ParTypeIndep, BoundStateIndep, filmDiff[comp], curVelocity));
11581158

11591159
// Main diagonal corresponds to j_{f,i} (flux) state variable
1160-
_jacCF.addElement(eq, eq + typeOffset, jacCF_val * static_cast<double>(filmDiff[comp]) * modifier * static_cast<double>(_parTypeVolFrac[type + _disc.nParType * colCell]));
1160+
_jacCF.addElement(eq, eq + typeOffset, jacCF_val * filmDiffDep * static_cast<double>(_parTypeVolFrac[type + _disc.nParType * colCell]));
11611161
}
11621162

11631163
// J_{f,0} block, adds bulk volume state c_i to flux equation
@@ -1177,8 +1177,8 @@ void LumpedRateModelWithPores<ConvDispOperator>::assembleOffdiagJac(double t, un
11771177
const unsigned int eq = typeOffset + pblk * idxr.strideColCell() + comp * idxr.strideColComp();
11781178
const unsigned int col = pblk * idxr.strideParBlock(type) + comp;
11791179

1180-
const double modifier = _filmDiffDep->getValue(*this, ColumnPosition{relPos, 0.0, 0.0}, comp, ParTypeIndep, BoundStateIndep, curVelocity);
1181-
_jacPF[type].addElement(col, eq, jacPF_val / static_cast<double>(poreAccFactor[comp]) * static_cast<double>(filmDiff[comp]) * modifier);
1180+
const double filmDiffDep = static_cast<double>(_filmDiffDep->getValue(*this, ColumnPosition{relPos, 0.0, 0.0}, comp, ParTypeIndep, BoundStateIndep, filmDiff[comp], curVelocity));
1181+
_jacPF[type].addElement(col, eq, jacPF_val / static_cast<double>(poreAccFactor[comp]) * filmDiffDep);
11821182
}
11831183
}
11841184

‎src/libcadet/model/ParameterDependence.hpp

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -460,9 +460,11 @@ class IParameterParameterDependence
460460
* @param [in] comp Index of the component the parameter belongs to (or @c -1 if independent of components)
461461
* @param [in] parType Index of the particle type the parameter belongs to (or @c -1 if independent of particle types)
462462
* @param [in] bnd Index of the bound state the parameter belongs to (or @c -1 if independent of bound states)
463+
* @param [in] depVal parameter-dependent value
464+
* @param [in] indepVal parameter depVal depends on
463465
* @return Actual parameter value
464466
*/
465-
virtual double getValue(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd) const = 0;
467+
virtual double getValue(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd, double depVal, double indepVal) const = 0;
466468

467469
/**
468470
* @brief Evaluates the parameter
@@ -473,37 +475,11 @@ class IParameterParameterDependence
473475
* @param [in] comp Index of the component the parameter belongs to (or @c -1 if independent of components)
474476
* @param [in] parType Index of the particle type the parameter belongs to (or @c -1 if independent of particle types)
475477
* @param [in] bnd Index of the bound state the parameter belongs to (or @c -1 if independent of bound states)
478+
* @param [in] depVal parameter-dependent value
479+
* @param [in] indepVal parameter depVal depends on
476480
* @return Actual parameter value
477481
*/
478-
virtual active getValueActive(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd) const = 0;
479-
480-
/**
481-
* @brief Evaluates the parameter
482-
* @details This function is called simultaneously from multiple threads.
483-
*
484-
* @param [in] model Model that owns this parameter dependence
485-
* @param [in] colPos Position in normalized coordinates (column inlet = 0, column outlet = 1; outer shell = 1, inner center = 0)
486-
* @param [in] comp Index of the component the parameter belongs to (or @c -1 if independent of components)
487-
* @param [in] parType Index of the particle type the parameter belongs to (or @c -1 if independent of particle types)
488-
* @param [in] bnd Index of the bound state the parameter belongs to (or @c -1 if independent of bound states)
489-
* @param [in] val Additional parameter-dependent value
490-
* @return Actual parameter value
491-
*/
492-
virtual double getValue(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd, double val) const = 0;
493-
494-
/**
495-
* @brief Evaluates the parameter
496-
* @details This function is called simultaneously from multiple threads.
497-
*
498-
* @param [in] model Model that owns this parameter dependence
499-
* @param [in] colPos Position in normalized coordinates (column inlet = 0, column outlet = 1; outer shell = 1, inner center = 0)
500-
* @param [in] comp Index of the component the parameter belongs to (or @c -1 if independent of components)
501-
* @param [in] parType Index of the particle type the parameter belongs to (or @c -1 if independent of particle types)
502-
* @param [in] bnd Index of the bound state the parameter belongs to (or @c -1 if independent of bound states)
503-
* @param [in] val Additional parameter-dependent value
504-
* @return Actual parameter value
505-
*/
506-
virtual active getValue(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd, const active& val) const = 0;
482+
virtual active getValue(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd, const active& depVal, const active& indepVal) const = 0;
507483

508484
protected:
509485
};

‎src/libcadet/model/paramdep/DummyParameterDependence.cpp

Lines changed: 32 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,36 @@ namespace cadet
2626
namespace model
2727
{
2828

29+
/**
30+
* @brief Defines a dummy parameter dependence that outputs the (independent) parameter itself
31+
*/
32+
class IdentityParameterParameterDependence : public ParameterParameterDependenceBase
33+
{
34+
public:
35+
36+
IdentityParameterParameterDependence() { }
37+
virtual ~IdentityParameterParameterDependence() CADET_NOEXCEPT { }
38+
39+
static const char* identifier() { return "IDENTITY"; }
40+
virtual const char* name() const CADET_NOEXCEPT { return IdentityParameterParameterDependence::identifier(); }
41+
42+
CADET_PARAMETERPARAMETERDEPENDENCE_BOILERPLATE
43+
44+
protected:
45+
46+
virtual bool configureImpl(IParameterProvider& paramProvider, UnitOpIdx unitOpIdx, ParticleTypeIdx parTypeIdx, BoundStateIdx bndIdx, const std::string& name)
47+
{
48+
return true;
49+
}
50+
51+
template <typename ParamType>
52+
ParamType getValueImpl(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd, const ParamType& depVal, const ParamType& indepVal) const
53+
{
54+
return depVal;
55+
}
56+
57+
};
58+
2959
/**
3060
* @brief Defines a parameter dependence that outputs constant 0.0
3161
*/
@@ -83,7 +113,6 @@ class ConstantZeroParameterStateDependence : public ParameterStateDependenceBase
83113
void analyticJacobianCombinedAddSolidImpl(const ColumnPosition& colPos, double param, double const* yLiquid, double const* ySolid, int bnd, double factor, int offset, RowIterator jac) const { }
84114
};
85115

86-
87116
/**
88117
* @brief Defines a parameter dependence that outputs constant 1.0
89118
*/
@@ -141,81 +170,6 @@ class ConstantOneParameterStateDependence : public ParameterStateDependenceBase
141170
void analyticJacobianCombinedAddSolidImpl(const ColumnPosition& colPos, double param, double const* yLiquid, double const* ySolid, int bnd, double factor, int offset, RowIterator jac) const { }
142171
};
143172

144-
145-
/**
146-
* @brief Defines a parameter dependence that outputs constant 0.0
147-
*/
148-
class ConstantZeroParameterParameterDependence : public ParameterParameterDependenceBase
149-
{
150-
public:
151-
152-
ConstantZeroParameterParameterDependence() { }
153-
virtual ~ConstantZeroParameterParameterDependence() CADET_NOEXCEPT { }
154-
155-
static const char* identifier() { return "CONSTANT_ZERO"; }
156-
virtual const char* name() const CADET_NOEXCEPT { return ConstantZeroParameterParameterDependence::identifier(); }
157-
158-
CADET_PARAMETERPARAMETERDEPENDENCE_BOILERPLATE
159-
160-
protected:
161-
162-
virtual bool configureImpl(IParameterProvider& paramProvider, UnitOpIdx unitOpIdx, ParticleTypeIdx parTypeIdx, BoundStateIdx bndIdx, const std::string& name)
163-
{
164-
return true;
165-
}
166-
167-
template <typename ParamType>
168-
ParamType getValueImpl(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd) const
169-
{
170-
return 0.0;
171-
}
172-
173-
template <typename ParamType>
174-
ParamType getValueImpl(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd, const ParamType& val) const
175-
{
176-
return 0.0;
177-
}
178-
179-
};
180-
181-
182-
/**
183-
* @brief Defines a parameter dependence that outputs constant 1.0
184-
*/
185-
class ConstantOneParameterParameterDependence : public ParameterParameterDependenceBase
186-
{
187-
public:
188-
189-
ConstantOneParameterParameterDependence() { }
190-
virtual ~ConstantOneParameterParameterDependence() CADET_NOEXCEPT { }
191-
192-
static const char* identifier() { return "CONSTANT_ONE"; }
193-
virtual const char* name() const CADET_NOEXCEPT { return ConstantOneParameterParameterDependence::identifier(); }
194-
195-
CADET_PARAMETERPARAMETERDEPENDENCE_BOILERPLATE
196-
197-
protected:
198-
199-
virtual bool configureImpl(IParameterProvider& paramProvider, UnitOpIdx unitOpIdx, ParticleTypeIdx parTypeIdx, BoundStateIdx bndIdx, const std::string& name)
200-
{
201-
return true;
202-
}
203-
204-
template <typename ParamType>
205-
ParamType getValueImpl(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd) const
206-
{
207-
return 1.0;
208-
}
209-
210-
template <typename ParamType>
211-
ParamType getValueImpl(const IModel& model, const ColumnPosition& colPos, int comp, int parType, int bnd, const ParamType& val) const
212-
{
213-
return 1.0;
214-
}
215-
216-
};
217-
218-
219173
namespace paramdep
220174
{
221175
void registerDummyParamDependence(std::unordered_map<std::string, std::function<model::IParameterStateDependence*()>>& paramDeps)
@@ -227,9 +181,8 @@ namespace paramdep
227181

228182
void registerDummyParamDependence(std::unordered_map<std::string, std::function<model::IParameterParameterDependence*()>>& paramDeps)
229183
{
230-
paramDeps[ConstantOneParameterParameterDependence::identifier()] = []() { return new ConstantOneParameterParameterDependence(); };
231-
paramDeps[ConstantZeroParameterParameterDependence::identifier()] = []() { return new ConstantZeroParameterParameterDependence(); };
232-
paramDeps["NONE"] = []() { return new ConstantOneParameterParameterDependence(); };
184+
paramDeps[IdentityParameterParameterDependence::identifier()] = []() { return new IdentityParameterParameterDependence(); };
185+
paramDeps["NONE"] = []() { return new IdentityParameterParameterDependence(); };
233186
}
234187
} // namespace paramdep
235188

0 commit comments

Comments
 (0)