modified reactions interface

Author: schmoelder

src/libcadet/model/GeneralRateModel.cpp

@@ -482,9 +482,9 @@ bool GeneralRateModel<ConvDispOperator>::configureModelDiscretization(IParameter
 	bool reactionConfSuccess = true;
 
 	_dynReactionBulk = nullptr;
-	if (paramProvider.exists("REACTION_MODEL"))
+	if (paramProvider.exists("REACTION_MODEL_BULK"))
 	{
-		const std::string dynReactName = paramProvider.getString("REACTION_MODEL");
+		const std::string dynReactName = paramProvider.getString("REACTION_MODEL_BULK");
 		_dynReactionBulk = helper.createDynamicReactionModel(dynReactName);
 		if (!_dynReactionBulk)
 			throw InvalidParameterException("Unknown dynamic reaction model " + dynReactName);

src/libcadet/model/GeneralRateModel2D.cpp

@@ -667,9 +667,9 @@ bool GeneralRateModel2D::configureModelDiscretization(IParameterProvider& paramP
 	bool reactionConfSuccess = true;
 
 	_dynReactionBulk = nullptr;
-	if (paramProvider.exists("REACTION_MODEL"))
+	if (paramProvider.exists("REACTION_MODEL_BULK"))
 	{
-		const std::string dynReactName = paramProvider.getString("REACTION_MODEL");
+		const std::string dynReactName = paramProvider.getString("REACTION_MODEL_BULK");
 		_dynReactionBulk = helper.createDynamicReactionModel(dynReactName);
 		if (!_dynReactionBulk)
 			throw InvalidParameterException("Unknown dynamic reaction model " + dynReactName);

src/libcadet/model/LumpedRateModelWithPores.cpp

@@ -341,9 +341,9 @@ bool LumpedRateModelWithPores<ConvDispOperator>::configureModelDiscretization(IP
 	bool reactionConfSuccess = true;
 
 	_dynReactionBulk = nullptr;
-	if (paramProvider.exists("REACTION_MODEL"))
+	if (paramProvider.exists("REACTION_MODEL_BULK"))
 	{
-		const std::string dynReactName = paramProvider.getString("REACTION_MODEL");
+		const std::string dynReactName = paramProvider.getString("REACTION_MODEL_BULK");
 		_dynReactionBulk = helper.createDynamicReactionModel(dynReactName);
 		if (!_dynReactionBulk)
 			throw InvalidParameterException("Unknown dynamic reaction model " + dynReactName);

src/libcadet/model/LumpedRateModelWithoutPores.cpp

@@ -255,14 +255,14 @@ bool LumpedRateModelWithoutPores<ConvDispOperator>::configureModelDiscretization
 	clearDynamicReactionModels();
 	_dynReaction.push_back(nullptr);
 
-	if (paramProvider.exists("REACTION_MODEL"))
+	if (paramProvider.exists("REACTION_MODEL_BULK"))
 	{
-		_dynReaction[0] = helper.createDynamicReactionModel(paramProvider.getString("REACTION_MODEL"));
+		_dynReaction[0] = helper.createDynamicReactionModel(paramProvider.getString("REACTION_MODEL_BULK"));
 		if (!_dynReaction[0])
-			throw InvalidParameterException("Unknown dynamic reaction model " + paramProvider.getString("REACTION_MODEL"));
+			throw InvalidParameterException("Unknown dynamic reaction model " + paramProvider.getString("REACTION_MODEL_BULK"));
 
 		if (_dynReaction[0]->usesParamProviderInDiscretizationConfig())
-			paramProvider.pushScope("reaction");
+			paramProvider.pushScope("reaction_bulk");
 
 		reactionConfSuccess = _dynReaction[0]->configureModelDiscretization(paramProvider, _disc.nComp, _disc.nBound, _disc.boundOffset);
 

src/libcadet/model/StirredTankModel.cpp

@@ -221,9 +221,9 @@ bool CSTRModel::configureModelDiscretization(IParameterProvider& paramProvider,
 	bool reactionConfSuccess = true;
 
 	_dynReactionBulk = nullptr;
-	if (paramProvider.exists("REACTION_MODEL"))
+	if (paramProvider.exists("REACTION_MODEL_BULK"))
 	{
-		const std::string dynReactName = paramProvider.getString("REACTION_MODEL");
+		const std::string dynReactName = paramProvider.getString("REACTION_MODEL_BULK");
 		_dynReactionBulk = helper.createDynamicReactionModel(dynReactName);
 		if (!_dynReactionBulk)
 			throw InvalidParameterException("Unknown dynamic reaction model " + dynReactName);