Deprecate old particle interface for particle module (#464)

Author: jbreue16

src/libcadet/model/ColumnModel1D.cpp

@@ -188,10 +188,7 @@ bool ColumnModel1D::configureModelDiscretization(IParameterProvider& paramProvid
 	bool particleConfSuccess = true;
 	for (int parType = 0; parType < _disc.nParType; parType++)
 	{
-		if (unitName == "COLUMN_MODEL_1D")
-			particleConfSuccess = particleConfSuccess && _particles[parType]->configureModelDiscretization(paramProvider, helper, _disc.nComp, parType, _disc.nParType, idxr.strideColComp());
-		else
-			particleConfSuccess = particleConfSuccess && _particles[parType]->configureModelDiscretization_old(paramProvider, helper, _disc.nComp, parType, _disc.nParType, idxr.strideColComp());
+		particleConfSuccess = particleConfSuccess && _particles[parType]->configureModelDiscretization(paramProvider, helper, _disc.nComp, parType, _disc.nParType, idxr.strideColComp());
 	}
 	paramProvider.pushScope("discretization");
 

src/libcadet/model/particle/GeneralRateParticle.cpp

@@ -53,137 +53,6 @@ namespace model
 		delete _parDiffOp;
 	}
 
-	bool GeneralRateParticle::configureModelDiscretization_old(IParameterProvider& paramProvider, const IConfigHelper& helper, const int nComp, const int parTypeIdx, const int nParType, const int strideBulkComp)
-	{
-		_parTypeIdx = parTypeIdx;
-		_nComp = nComp;
-
-		// ==== Construct and configure particle transport and discretization
-
-		paramProvider.pushScope("discretization");
-
-		if (paramProvider.exists("PAR_SPATIAL_METHOD"))
-		{
-			const std::string parSpatialMethod = paramProvider.getString("PAR_SPATIAL_METHOD");
-			if (parSpatialMethod != "DG")
-				throw InvalidParameterException("Unsupported PAR_SPATIAL_METHOD '" + parSpatialMethod + "' for GeneralRateParticle. Only 'DG' is supported.");
-
-			_parDiffOp = new parts::ParticleDiffusionOperatorDG();
-		}
-		else
-			_parDiffOp = new parts::ParticleDiffusionOperatorDG();
-
-		paramProvider.popScope();
-
-		const bool particleTransportConfigSuccess = _parDiffOp->configureModelDiscretization_old(paramProvider, helper, nComp, parTypeIdx, nParType, strideBulkComp);
-
-		_nBound = _parDiffOp->nBound();
-
-		// ==== Construct and configure binding model
-		_binding = nullptr;
-		std::vector<std::string> bindModelNames = { "NONE" };
-		if (paramProvider.exists("ADSORPTION_MODEL"))
-			bindModelNames = paramProvider.getStringArray("ADSORPTION_MODEL");
-
-		if (paramProvider.exists("ADSORPTION_MODEL_MULTIPLEX"))
-			_bindingParDep = (paramProvider.getInt("ADSORPTION_MODEL_MULTIPLEX") == 1);
-		else
-		{
-			// Infer multiplex mode
-			_bindingParDep = (bindModelNames.size() == 1);
-		}
-
-		if (!_bindingParDep && (bindModelNames.size() < nParType))
-			throw InvalidParameterException("Field ADSORPTION_MODEL contains too few elements (" + std::to_string(nParType) + " required)");
-		else if (_bindingParDep && (bindModelNames.size() != 1))
-			throw InvalidParameterException("Field ADSORPTION_MODEL requires (only) 1 element");
-
-		bool bindingConfSuccess = true;
-
-		_binding = helper.createBindingModel(bindModelNames[_bindingParDep ? 0 : _parTypeIdx]);
-		if (!_binding)
-			throw InvalidParameterException("Unknown binding model " + bindModelNames[_bindingParDep ? 0 : _parTypeIdx]);
-
-		MultiplexedScopeSelector scopeGuard(paramProvider, "adsorption", _bindingParDep, _parTypeIdx, nParType == 1, _binding->usesParamProviderInDiscretizationConfig());
-		bindingConfSuccess = _binding->configureModelDiscretization(paramProvider, _nComp, _nBound.get(), _parDiffOp->offsetBoundComp());
-
-		// ==== Construct and configure dynamic reaction model
-		bool reactionConfSuccess = true;
-
-		_dynReaction = nullptr;
-
-		if (paramProvider.exists("REACTION_MODEL_PARTICLES"))
-		{
-			const std::vector<std::string> dynReactModelNames = paramProvider.getStringArray("REACTION_MODEL_PARTICLES");
-
-			if (paramProvider.exists("REACTION_MODEL_PARTICLES_MULTIPLEX"))
-				_reactionParDep = (paramProvider.getInt("REACTION_MODEL_PARTICLES_MULTIPLEX") == 1);
-			else
-			{
-				// Infer multiplex mode
-				_reactionParDep = (dynReactModelNames.size() == 1);
-			}
-
-			if (!_reactionParDep && (dynReactModelNames.size() < nParType))
-				throw InvalidParameterException("Field REACTION_MODEL_PARTICLES contains too few elements (" + std::to_string(nParType) + " required)");
-			else if (_reactionParDep && (dynReactModelNames.size() != 1))
-				throw InvalidParameterException("Field REACTION_MODEL_PARTICLES requires (only) 1 element");
-
-			_dynReaction = helper.createDynamicReactionModel(dynReactModelNames[_reactionParDep ? 0 : _parTypeIdx]);
-
-			if (!_dynReaction)
-				throw InvalidParameterException("Unknown dynamic reaction model " + dynReactModelNames[_reactionParDep ? 0 : _parTypeIdx]);
-
-			MultiplexedScopeSelector scopeGuard(paramProvider, "reaction_particle", _reactionParDep, _parTypeIdx, nParType == 1, _dynReaction->usesParamProviderInDiscretizationConfig());
-			reactionConfSuccess = _dynReaction->configureModelDiscretization(paramProvider, _nComp, _nBound.get(), _parDiffOp->offsetBoundComp()) && reactionConfSuccess;
-		}
-
-		return particleTransportConfigSuccess && bindingConfSuccess && reactionConfSuccess;
-	}
-
-	bool GeneralRateParticle::configure_old(UnitOpIdx unitOpIdx, IParameterProvider& paramProvider, std::unordered_map<ParameterId, active*>& parameters, const int nParType, const unsigned int* nBoundBeforeType, const int nTotalBound)
-	{
-		// Reconfigure binding model
-		bool bindingConfSuccess = true;
-		if (_binding)
-		{
-			if (_binding->requiresConfiguration())
-			{
-				if (_bindingParDep)
-				{
-					MultiplexedScopeSelector scopeGuard(paramProvider, "adsorption", true);
-					bindingConfSuccess = _binding->configure(paramProvider, unitOpIdx, ParTypeIndep);
-				}
-				else
-				{
-					MultiplexedScopeSelector scopeGuard(paramProvider, "adsorption", _parTypeIdx, nParType == 1, true);
-					bindingConfSuccess = _binding->configure(paramProvider, unitOpIdx, _parTypeIdx);
-				}
-			}
-		}
-
-		// Reconfigure reaction model
-		bool dynReactionConfSuccess = true;
-		if (_dynReaction && _dynReaction->requiresConfiguration())
-		{
-			if (_reactionParDep)
-			{
-				MultiplexedScopeSelector scopeGuard(paramProvider, "reaction_particle", true);
-				dynReactionConfSuccess = _dynReaction->configure(paramProvider, unitOpIdx, ParTypeIndep) && dynReactionConfSuccess;
-			}
-			else
-			{
-				MultiplexedScopeSelector scopeGuard(paramProvider, "reaction_particle", _parTypeIdx, nParType == 1, true);
-				dynReactionConfSuccess = _dynReaction->configure(paramProvider, unitOpIdx, _parTypeIdx) && dynReactionConfSuccess;
-			}
-		}
-
-		// Reconfigure particle transport and discretization
-		const bool parTransportConfigSuccess = _parDiffOp->configure_old(unitOpIdx, paramProvider, parameters, nParType, nBoundBeforeType, nTotalBound, _binding->reactionQuasiStationarity(), _binding->hasDynamicReactions());
-
-		return parTransportConfigSuccess && bindingConfSuccess && dynReactionConfSuccess;
-	}
-
 	bool GeneralRateParticle::configureModelDiscretization(IParameterProvider& paramProvider, const IConfigHelper& helper, const int nComp, const int parTypeIdx, const int nParType, const int strideBulkComp)
 	{
 		_parTypeIdx = parTypeIdx;

src/libcadet/model/particle/GeneralRateParticle.hpp

@@ -89,8 +89,6 @@ namespace parts
 
 		bool configureModelDiscretization(IParameterProvider& paramProvider, const IConfigHelper& helper, const int nComp, const int parTypeIdx, const int nParType, const int strideBulkComp) override;
 		bool configure(UnitOpIdx unitOpIdx, IParameterProvider& paramProvider, std::unordered_map<ParameterId, active*>& parameters, const int nParType, const unsigned int* nBoundBeforeType, const int nTotalBound) override;
-		bool configureModelDiscretization_old(IParameterProvider& paramProvider, const IConfigHelper& helper, const int nComp, const int parTypeIdx, const int nParType, const int strideBulkComp) override;
-		bool configure_old(UnitOpIdx unitOpIdx, IParameterProvider& paramProvider, std::unordered_map<ParameterId, active*>& parameters, const int nParType, const unsigned int* nBoundBeforeType, const int nTotalBound) override;
 
 		void updateRadialDisc() { _parDiffOp->updateRadialDisc(); }