[plasma] fix the failed tests due to m_cs_interp

Cantera · Nov 19, 2024 · 72998bb · 72998bb
1 parent c4fba55
commit 72998bb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/include/cantera/thermo/PlasmaPhase.h b/include/cantera/thermo/PlasmaPhase.h
@@ -100,12 +100,20 @@ class PlasmaPhase: public IdealGasPhase
 
     void initThermo() override;
 
-    //! Set electron energy levels.
+    //! Set electron energy levels, and update electron energy distribution.
     //! @param  levels The vector of electron energy levels (eV).
     //!                Length: #m_nPoints.
     //! @param  length The length of the @c levels.
     void setElectronEnergyLevels(const double* levels, size_t length);
 
+    //! Set electron energy levels.
+    //! @param  levels The vector of electron energy levels (eV).
+    //!                Length: #m_nPoints.
+    //! @param  length The length of the @c levels.
+    //! @param  updateEnergyDist update electron energy distribution
+    void setElectronEnergyLevels(const double* levels, size_t length,
+                                 bool updateEnergyDist);
+
     //! Get electron energy levels.
     //! @param  levels The vector of electron energy levels (eV). Length: #m_nPoints
     void getElectronEnergyLevels(double* levels) const {

diff --git a/src/thermo/PlasmaPhase.cpp b/src/thermo/PlasmaPhase.cpp
@@ -27,6 +27,9 @@ PlasmaPhase::PlasmaPhase(const string& inputFile, const string& id_)
 
     // initial electron temperature
     setElectronTemperature(temperature());
+
+    // resize vectors
+    m_cs_interp.resize(m_nPoints);
 }
 
 void PlasmaPhase::updateElectronEnergyDistribution()
@@ -89,20 +92,26 @@ void PlasmaPhase::setMeanElectronEnergy(double energy) {
     updateElectronEnergyDistribution();
 }
 
-void PlasmaPhase::setElectronEnergyLevels(const double* levels, size_t length)
+void PlasmaPhase::setElectronEnergyLevels(const double* levels, size_t length,
+                                          bool updateEnergyDist)
 {
     m_nPoints = length;
     m_electronEnergyLevels = Eigen::Map<const Eigen::ArrayXd>(levels, length);
     checkElectronEnergyLevels();
     electronEnergyLevelChanged();
-    updateElectronEnergyDistribution();
+    if (updateEnergyDist) updateElectronEnergyDistribution();
     m_interp_cs.resize(m_nPoints);
     // The cross sections are interpolated on the energy levels
     if (nCollisions() > 0) {
         updateInterpolatedCrossSections();
     }
 }
 
+void PlasmaPhase::setElectronEnergyLevels(const double* levels, size_t length)
+{
+    setElectronEnergyLevels(levels, length, true);
+}
+
 void PlasmaPhase::electronEnergyDistributionChanged()
 {
     m_distNum++;
@@ -151,9 +160,7 @@ void PlasmaPhase::setDiscretizedElectronEnergyDist(const double* levels,
                                                 size_t length)
 {
     m_distributionType = "discretized";
-    m_nPoints = length;
-    m_electronEnergyLevels =
-        Eigen::Map<const Eigen::ArrayXd>(levels, length);
+    setElectronEnergyLevels(levels, length, false);
     m_electronEnergyDist =
         Eigen::Map<const Eigen::ArrayXd>(dist, length);
     checkElectronEnergyLevels();

diff --git a/test/kinetics/kineticsFromYaml.cpp b/test/kinetics/kineticsFromYaml.cpp
@@ -534,7 +534,7 @@ TEST(Reaction, TwoTempPlasmaFromYaml)
 
 TEST(Reaction, ElectronCollisionPlasmaFromYaml)
 {
-    auto sol = newSolution("oxygen-plasma.yaml", "", "none");
+    auto sol = newSolution("oxygen-plasma.yaml", "discretized-electron-energy-plasma", "none");
     AnyMap rxn = AnyMap::fromYamlString(
         "{equation: O2 + E => E + O2,"
         " type: electron-collision-plasma,"