From 4eeeed5ec020f706361deedbe9fe804db98c8007 Mon Sep 17 00:00:00 2001 From: Samuel Leweke Date: Fri, 28 Apr 2023 21:28:15 +0200 Subject: [PATCH] Fix bugs in solution exporter implementation Fixes several copy & paste errors in the implementation and infrastructure of the solution exporter system. --- include/common/SolutionRecorderImpl.hpp | 4 ++-- src/libcadet/model/GeneralRateModel.cpp | 2 +- src/libcadet/model/GeneralRateModel2D.cpp | 2 +- src/libcadet/model/LumpedRateModelWithPores.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/common/SolutionRecorderImpl.hpp b/include/common/SolutionRecorderImpl.hpp index 8184a08c6..1c973be71 100644 --- a/include/common/SolutionRecorderImpl.hpp +++ b/include/common/SolutionRecorderImpl.hpp @@ -251,7 +251,7 @@ class InternalStorageUnitOpRecorder : public ISolutionRecorder std::vector& 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& 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 index 1d184705c..540e570eb 100644 --- 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 index 410907df2..fe7d6f1ab 100644 --- 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 index 3b18cb8eb..227811ed9 100644 --- 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; }