Fix bugs in solution exporter implementation

Fixes several copy & paste errors in the implementation and infrastructure of the solution exporter system.
modsim · Apr 28, 2023 · 4eeeed5 · 4eeeed5
1 parent 4b55de8
commit 4eeeed5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/include/common/SolutionRecorderImpl.hpp b/include/common/SolutionRecorderImpl.hpp
@@ -251,7 +251,7 @@ class InternalStorageUnitOpRecorder : public ISolutionRecorder
 				std::vector<double>& cp = _curStorage->particle[parType];
 
 				cp.resize(cp.size() + sliceSize);
-				exporter.writeMobilePhase(cp.data() + cp.size() - sliceSize);
+				exporter.writeParticleMobilePhase(parType, cp.data() + cp.size() - sliceSize);
 			}
 		}
 
@@ -263,7 +263,7 @@ class InternalStorageUnitOpRecorder : public ISolutionRecorder
 				std::vector<double>& cs = _curStorage->solid[parType];
 
 				cs.resize(cs.size() + sliceSize);
-				exporter.writeSolidPhase(cs.data() + cs.size() - sliceSize);
+				exporter.writeSolidPhase(parType, cs.data() + cs.size() - sliceSize);
 			}
 		}
 

diff --git a/src/libcadet/model/GeneralRateModel.cpp b/src/libcadet/model/GeneralRateModel.cpp
@@ -2996,7 +2996,7 @@ int GeneralRateModel::Exporter::writeSolidPhase(double* buffer) const
 	int numWritten = 0;
 	for (unsigned int i = 0; i < _disc.nParType; ++i)
 	{
-		const int n = writeParticleMobilePhase(i, buffer);
+		const int n = writeSolidPhase(i, buffer);
 		buffer += n;
 		numWritten += n;
 	}

diff --git a/src/libcadet/model/GeneralRateModel2D.cpp b/src/libcadet/model/GeneralRateModel2D.cpp
@@ -2463,7 +2463,7 @@ int GeneralRateModel2D::Exporter::writeSolidPhase(double* buffer) const
 	int numWritten = 0;
 	for (unsigned int i = 0; i < _disc.nParType; ++i)
 	{
-		const int n = writeParticleMobilePhase(i, buffer);
+		const int n = writeSolidPhase(i, buffer);
 		buffer += n;
 		numWritten += n;
 	}

diff --git a/src/libcadet/model/LumpedRateModelWithPores.cpp b/src/libcadet/model/LumpedRateModelWithPores.cpp
@@ -1526,7 +1526,7 @@ int LumpedRateModelWithPores::Exporter::writeSolidPhase(double* buffer) const
 	int numWritten = 0;
 	for (unsigned int i = 0; i < _disc.nParType; ++i)
 	{
-		const int n = writeParticleMobilePhase(i, buffer);
+		const int n = writeSolidPhase(i, buffer);
 		buffer += n;
 		numWritten += n;
 	}