Add FV particle diffusion operator

.github/workflows/ci.yml

@@ -228,6 +228,7 @@ jobs:
           ${BUILD_DIR}/test/testRunner [CI_sens22]
           ${BUILD_DIR}/test/testRunner [CI_sens23]
           ${BUILD_DIR}/test/testRunner [CI_sens24]
+          ${BUILD_DIR}/test/testRunner [CI_sens25]
       - name: Run CI test set III - crystallization
         run: |
           set -e

.github/workflows/coverage.yml

@@ -87,6 +87,7 @@ jobs:
           ${BUILD_DIR}/test/testRunner [CI_sens22]
           ${BUILD_DIR}/test/testRunner [CI_sens23]
           ${BUILD_DIR}/test/testRunner [CI_sens24]
+          ${BUILD_DIR}/test/testRunner [CI_sens25]
       - name: Run CI test set III - crystallization
         run: |
           ${BUILD_DIR}/test/testRunner [CI_cry1]

CMakeLists.txt

@@ -423,14 +423,7 @@ endif()
 
 set(EIGEN_TARGET "")
 find_package(Eigen3 3.4 REQUIRED NO_MODULE)
-
-# Disable DG if Eigen is not present
-if (NOT TARGET Eigen3::Eigen)
-	message(STATUS "Disabling DG support because Eigen3 could not be found")
-	set(ENABLE_DG OFF)
-else()
-	set(EIGEN_TARGET "Eigen3::Eigen")
-endif()
+set(EIGEN_TARGET "Eigen3::Eigen")
 
 set(IPO_AVAILABLE OFF)
 if (ENABLE_IPO)

src/libcadet/CMakeLists.txt

@@ -215,6 +215,7 @@ list (APPEND LIBCADET_SOURCES
 	${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/parts/ParticleDiffusionOperatorFV.cpp
 	${CMAKE_SOURCE_DIR}/src/libcadet/model/LumpedRateModelWithoutPoresDG.cpp
 	${CMAKE_SOURCE_DIR}/src/libcadet/model/ColumnModel1D.cpp
 )

src/libcadet/model/particle/GeneralRateParticle.cpp

@@ -12,6 +12,7 @@
 
 #include "model/particle/GeneralRateParticle.hpp"
 #include "model/parts/ParticleDiffusionOperatorDG.hpp"
+#include "model/parts/ParticleDiffusionOperatorFV.hpp"
 
 #include "cadet/Exceptions.hpp"
 #include "BindingModelFactory.hpp"
@@ -92,16 +93,13 @@ namespace model
 
 		paramProvider.pushScope("discretization");
 
-		if (paramProvider.exists("SPATIAL_METHOD"))
-		{
-			const std::string parSpatialMethod = paramProvider.getString("SPATIAL_METHOD");
-			if (parSpatialMethod != "DG")
-				throw InvalidParameterException("Unsupported SPATIAL_METHOD '" + parSpatialMethod + "' for GeneralRateParticle. Only 'DG' is supported for now.");
-
+		const std::string parSpatialMethod = paramProvider.getString("SPATIAL_METHOD");
+		if (parSpatialMethod == "DG")
 			_parDiffOp = new parts::ParticleDiffusionOperatorDG();
-		}
+		else if (parSpatialMethod == "FV")
+			_parDiffOp = new parts::ParticleDiffusionOperatorFV();
 		else
-			_parDiffOp = new parts::ParticleDiffusionOperatorDG();
+			throw InvalidParameterException("Unsupported SPATIAL_METHOD '" + parSpatialMethod + "' for GeneralRateParticle. Only 'DG' and 'FV' are supported.");
 
 		paramProvider.popScope();
 

src/libcadet/model/parts/ParticleDiffusionOperatorDG.cpp

@@ -1603,7 +1603,7 @@ namespace parts
 					jacCl[0] += static_cast<double>(filmDiff[comp]) * (1.0 - colPorosity) / colPorosity
 					* _parGeomSurfToVol / static_cast<double>(_parRadius)
 					* static_cast<double>(parTypeVolFrac[_parTypeIdx + blk * nParType]);
-				// add Cl on Cp entries (added since these entries are also touched by bulk jacobian)
+				// add Cl on Cp entries
 				// row: already at bulk phase. already at current node and component.
 				// col: go to current particle phase entry.
 				jacCl[jacCp.row() - jacCl.row()] = -static_cast<double>(filmDiff[comp]) * (1.0 - colPorosity) / colPorosity
@@ -1615,7 +1615,7 @@ namespace parts
 				for (int node = _parPolyDeg; node >= 0; node--, jacCp -= strideParNode()) {
 					// row: already at particle. Already at current node and liquid state.
 					// col: original entry at outer node.
-					if (!outliersOnly) // Cp on Cb
+					if (!outliersOnly) // Cp on Cp
 						jacCp[entry - jacCp.row()]
 						+= static_cast<double>(filmDiff[comp]) * 2.0 / static_cast<double>(_deltaR[0]) * _parInvMM[_nParElem - 1](node, _nParNode - 1) * exIntLiftContribution / static_cast<double>(_parPorosity) / static_cast<double>(_poreAccessFactor[comp]);
 					// row: already at particle. Already at current node and liquid state.

src/libcadet/model/parts/ParticleDiffusionOperatorDG.hpp

@@ -200,7 +200,7 @@ namespace parts
 
 		/* DG specific operators */
 
-		active* _deltaR; //!< equidistant particle element spacing
+		active* _deltaR; //!< particle element spacing
 		Eigen::VectorXd _parNodes; //!< Array with positions of nodes in radial reference element for each particle
 		Eigen::MatrixXd _parPolyDerM; //!< Array with polynomial derivative Matrix for each particle
 		Eigen::MatrixXd* _minus_InvMM_ST; //!< equals minus inverse mass matrix times transposed stiffness matrix.