Fix MCT sensitivities for CHANNEL_CROSS_SECTION_AREAS (#549)

Author: AntoniaBerger

src/libcadet/model/exchange/LangumirExchange.cpp

@@ -67,9 +67,25 @@ class LangumirExchangeBase : public IExchangeModel
 	{
 		_parameters.clear();
 		readParameterMatrix(_exchangeMatrix, paramProvider, "EXCHANGE_MATRIX", _nChannel * _nChannel * _nComp, 1); // include parameterPeaderHelp in exchange modul
-		_crossSections = paramProvider.getDoubleArray("CHANNEL_CROSS_SECTION_AREAS");
+		readScalarParameterOrArray(_crossSections, paramProvider,"CHANNEL_CROSS_SECTION_AREAS", 1);
 		readParameterMatrix(_saturationMatrix, paramProvider, "SATURATION_MATRIX", _nChannel * _nComp, 1);
 
+		registerParam3DArray(parameters, _exchangeMatrix, [=](bool multi, unsigned int channelSrc, unsigned int channelDest, unsigned comp)
+		{
+		return makeParamId(hashString("EXCHANGE_MATRIX"), unitOpIdx, multi ? comp : CompIndep, channelDest, channelSrc, ReactionIndep, SectionIndep);
+		}, _nComp, _nChannel); // particleType -> channelDest, BoundState -> channelSrc
+
+		registerParam1DArray(parameters, _crossSections, [=](bool multi, unsigned int channel)
+		{
+		return makeParamId(hashString("CHANNEL_CROSS_SECTION_AREAS"), unitOpIdx, CompIndep, channel, BoundStateIndep, ReactionIndep, SectionIndep); // particleType -> Channel
+		});
+
+		registerParam2DArray(parameters, _saturationMatrix, [=](bool multi, unsigned int channel, unsigned int comp)
+		{
+		return makeParamId(hashString("SATURATION_MATRIX"), unitOpIdx, multi ? comp : CompIndep, channel, BoundStateIndep, ReactionIndep, SectionIndep);
+		}, _nComp); // particleType -> channel
+
+
 		return true;
 	}
 
@@ -176,7 +192,7 @@ class LangumirExchangeBase : public IExchangeModel
 	unsigned int _nCol; //!< Number of columns
 
 	std::vector<active> _exchangeMatrix; //!< Matrix of exchange coeffs for the langmuir inter-channel transport
-	std::vector<double> _crossSections; //!< Cross sections of the channels
+	std::vector<active> _crossSections; //!< Cross sections of the channels
 	std::vector<active> _saturationMatrix; //!< Capacity of the channels -> double  ncomp x nchannel
 	//parts::MultiChannelConvectionDispersionOperator _conDis; //!< Convection dispersion operator
 

src/libcadet/model/exchange/LinearExchange.cpp

@@ -65,13 +65,18 @@ class LinearExchangeBase : public IExchangeModel
 	{
 		_parameters.clear();
 		readParameterMatrix(_exchangeMatrix, paramProvider, "EXCHANGE_MATRIX", _nChannel * _nChannel * _nComp, 1); // TODO include parameterPeaderHelp in exchange modul
-		_crossSections = paramProvider.getDoubleArray("CHANNEL_CROSS_SECTION_AREAS");
+		readScalarParameterOrArray(_crossSections, paramProvider,"CHANNEL_CROSS_SECTION_AREAS", 1);
 
 		registerParam3DArray(parameters, _exchangeMatrix, [=](bool multi, unsigned int channelSrc, unsigned int channelDest, unsigned comp)
 		{
 		return makeParamId(hashString("EXCHANGE_MATRIX"), unitOpIdx, multi ? comp : CompIndep, channelDest, channelSrc, ReactionIndep, SectionIndep);
 		}, _nComp, _nChannel);
 
+		registerParam1DArray(parameters, _crossSections, [=](bool multi, unsigned int channel)
+		{
+		return makeParamId(hashString("CHANNEL_CROSS_SECTION_AREAS"), unitOpIdx, CompIndep, channel, BoundStateIndep, ReactionIndep, SectionIndep); // particleType -> Channel
+		});
+
 		return true;
 	}
 
@@ -174,7 +179,7 @@ class LinearExchangeBase : public IExchangeModel
 	std::vector<int> _reactionQuasistationarity; //!< Determines whether each bound state is quasi-stationary (@c true) or not (@c false)
 
 	std::vector<active> _exchangeMatrix; //!< Matrix of exchange coeffs for the linear inter-channel transport
-	std::vector<double> _crossSections; //!< Cross sections of the channels
+	std::vector<active> _crossSections; //!< Cross sections of the channels
 
 	std::unordered_map<ParameterId, active*> _parameters; //!< Map used to translate ParameterIds to actual variables