Remove obsolete unit operations (#464)

This commit removes the GRM_DG and LRMP_DG unit operation
implementations, which became part of the generalized COLUMN_MODEL_1D

Author: jbreue16

src/libcadet/CMakeLists.txt

@@ -221,9 +221,7 @@ if (ENABLE_DG)
 		${CMAKE_SOURCE_DIR}/src/libcadet/model/particle/HomogeneousParticle.cpp
 		${CMAKE_SOURCE_DIR}/src/libcadet/model/parts/ParticleDiffusionOperatorBase.cpp
 		${CMAKE_SOURCE_DIR}/src/libcadet/model/parts/ParticleDiffusionOperatorDG.cpp
-		${CMAKE_SOURCE_DIR}/src/libcadet/model/LumpedRateModelWithPoresDG.cpp
 		${CMAKE_SOURCE_DIR}/src/libcadet/model/LumpedRateModelWithoutPoresDG.cpp
-		${CMAKE_SOURCE_DIR}/src/libcadet/model/GeneralRateModelDG.cpp
 		${CMAKE_SOURCE_DIR}/src/libcadet/model/ColumnModel1D.cpp
 	)
 	if (ENABLE_2D_MODELS)

src/libcadet/model/ColumnModel1D.cpp

@@ -110,6 +110,9 @@ bool ColumnModel1D::usesAD() const CADET_NOEXCEPT
 
 bool ColumnModel1D::configureModelDiscretization(IParameterProvider& paramProvider, const IConfigHelper& helper)
 {
+	// Read unit type as name to allow model configuration via GRM, LRMP. Here, the particle types are set correspondingly
+	std::string unitName = paramProvider.getString("UNIT_TYPE");
+
 	// ==== Read discretization
 	_disc.nComp = paramProvider.getInt("NCOMP");
 
@@ -162,20 +165,33 @@ bool ColumnModel1D::configureModelDiscretization(IParameterProvider& paramProvid
 
 	for (int parType = 0; parType < _disc.nParType; parType++)
 	{
-		paramProvider.pushScope("particle_type_" + std::string(3 - std::to_string(parType).length(), '0') + std::to_string(parType));
-		std::string particleModelName = paramProvider.getString("PARTICLE_TYPE");
+		if (unitName == "COLUMN_MODEL_1D")
+		{
+			paramProvider.pushScope("particle_type_" + std::string(3 - std::to_string(parType).length(), '0') + std::to_string(parType));
+			std::string particleModelName = paramProvider.getString("PARTICLE_TYPE");
 
-		_particles[parType] = helper.createParticleModel(particleModelName);
-		if (!_particles[parType])
-			throw InvalidParameterException("Unknown particle model " + particleModelName);
+			_particles[parType] = helper.createParticleModel(particleModelName);
+			if (!_particles[parType])
+				throw InvalidParameterException("Unknown particle model " + particleModelName);
 
-		paramProvider.popScope();
+			paramProvider.popScope();
+		}
+		else
+		{
+			if (unitName == "GENERAL_RATE_MODEL_DG")
+				_particles[parType] = helper.createParticleModel("GENERAL_RATE_PARTICLE");
+			else if (unitName == "LUMPED_RATE_MODEL_WITH_PORES_DG")
+				_particles[parType] = helper.createParticleModel("HOMOGENEOUS_PARTICLE");
+		}
 	}
 
 	bool particleConfSuccess = true;
 	for (int parType = 0; parType < _disc.nParType; parType++)
 	{
-		particleConfSuccess = particleConfSuccess && _particles[parType]->configureModelDiscretization(paramProvider, helper, _disc.nComp, parType, _disc.nParType, idxr.strideColComp());
+		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());
 	}
 	paramProvider.pushScope("discretization");
 

src/libcadet/model/GeneralRateModelBuilder.cpp

@@ -1,7 +1,7 @@
 #include "model/GeneralRateModel.hpp"
 #include "CompileTimeConfig.hpp"
 #ifdef ENABLE_DG
-#include "model/GeneralRateModelDG.hpp"
+#include "model/ColumnModel1D.hpp"
 #endif
 #include "LoggingUtils.hpp"
 #include "Logging.hpp"
@@ -23,7 +23,7 @@ namespace cadet
 				const std::string discName = paramProvider.getString("SPATIAL_METHOD");
 #ifdef ENABLE_DG
 				if (discName == "DG")
-					model = new GeneralRateModelDG(uoId);
+					model = new ColumnModel1D(uoId);
 				else if (discName == "FV")
 #else
 				if (discName == "FV")
@@ -79,8 +79,8 @@ namespace cadet
 			typedef GeneralRateModel<parts::RadialConvectionDispersionOperator> RadialGRM;
 
 #ifdef ENABLE_DG
-			models[GeneralRateModelDG::identifier()] = selectAxialFlowDiscretizationGRM;
-			models["GRM_DG"] = selectAxialFlowDiscretizationGRM;
+			models[ColumnModel1D::identifier()] = selectAxialFlowDiscretizationGRM;
+			models["COLUMN_MODEL_1D"] = selectAxialFlowDiscretizationGRM;
 #endif
 			models[AxialGRM::identifier()] = selectAxialFlowDiscretizationGRM;
 			models["GRM"] = selectAxialFlowDiscretizationGRM;