GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Reactor] Remove vestigial ReactorSurface code from WallBase

Browse Source
This commit is contained in:
Ray Speth 2023-08-08 13:12:34 -04:00 committed by Ingmar Schoegl
parent 3ee75b0b25
commit 4b30fa74bc
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/cantera/zeroD/Wall.h
View File

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

1
src/zeroD/ConstPressureMoleReactor.cpp
View File

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

1
src/zeroD/ConstPressureReactor.cpp
View File

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

7
src/zeroD/Wall.cpp
View File

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