[Reactor] Remove vestigial ReactorSurface code from WallBase

ischoegl · Aug 9, 2023 · 4b30fa7 · 4b30fa7
1 parent 3ee75b0
commit 4b30fa7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/include/cantera/zeroD/Wall.h b/include/cantera/zeroD/Wall.h
@@ -7,14 +7,11 @@
 #define CT_WALL_H
 
 #include "cantera/base/ctexceptions.h"
-#include "cantera/zeroD/ReactorSurface.h"
 #include "cantera/zeroD/ReactorBase.h"
 
 namespace Cantera
 {
 
-class Kinetics;
-class SurfPhase;
 class Func1;
 
 /**
@@ -24,7 +21,7 @@ class Func1;
 class WallBase
 {
 public:
-    WallBase();
+    WallBase() = default;
 
     virtual ~WallBase() {}
     WallBase(const WallBase&) = delete;
@@ -122,8 +119,6 @@ class WallBase
     ReactorBase* m_left = nullptr;
     ReactorBase* m_right = nullptr;
 
-    vector<ReactorSurface> m_surf;
-
     //! current reactor network time
     double m_time = 0.0;
 

diff --git a/src/zeroD/ConstPressureMoleReactor.cpp b/src/zeroD/ConstPressureMoleReactor.cpp
@@ -5,6 +5,7 @@
 // at https://cantera.org/license.txt for license and copyright information.
 
 #include "cantera/zeroD/Wall.h"
+#include "cantera/zeroD/ReactorSurface.h"
 #include "cantera/zeroD/FlowDevice.h"
 #include "cantera/zeroD/ConstPressureMoleReactor.h"
 #include "cantera/base/utilities.h"

diff --git a/src/zeroD/ConstPressureReactor.cpp b/src/zeroD/ConstPressureReactor.cpp
@@ -6,6 +6,7 @@
 #include "cantera/zeroD/ConstPressureReactor.h"
 #include "cantera/zeroD/FlowDevice.h"
 #include "cantera/zeroD/Wall.h"
+#include "cantera/zeroD/ReactorSurface.h"
 #include "cantera/kinetics/Kinetics.h"
 #include "cantera/thermo/SurfPhase.h"
 #include "cantera/base/utilities.h"

diff --git a/src/zeroD/Wall.cpp b/src/zeroD/Wall.cpp
@@ -6,13 +6,10 @@
 #include "cantera/base/stringUtils.h"
 #include "cantera/numerics/Func1.h"
 #include "cantera/zeroD/Wall.h"
-#include "cantera/thermo/SurfPhase.h"
 
 namespace Cantera
 {
 
-WallBase::WallBase() : m_surf(2) {}
-
 bool WallBase::install(ReactorBase& rleft, ReactorBase& rright)
 {
     // check if wall is already installed
@@ -23,15 +20,11 @@ bool WallBase::install(ReactorBase& rleft, ReactorBase& rright)
     m_right = &rright;
     m_left->addWall(*this, 0);
     m_right->addWall(*this, 1);
-    m_surf[0].setReactor(&rleft);
-    m_surf[1].setReactor(&rright);
     return true;
 }
 
 void WallBase::setArea(double a) {
     m_area = a;
-    m_surf[0].setArea(a);
-    m_surf[1].setArea(a);
 }
 
 double Wall::velocity() const {