diff --git a/include/cantera/plasma/PlasmaPhase.h b/include/cantera/thermo/PlasmaPhase.h similarity index 100% rename from include/cantera/plasma/PlasmaPhase.h rename to include/cantera/thermo/PlasmaPhase.h diff --git a/interfaces/cython/cantera/_cantera.pxd b/interfaces/cython/cantera/_cantera.pxd index c16ef0143cc..e9fc419a2b2 100644 --- a/interfaces/cython/cantera/_cantera.pxd +++ b/interfaces/cython/cantera/_cantera.pxd @@ -444,7 +444,7 @@ cdef extern from "cantera/thermo/SurfPhase.h": void getCoverages(double*) except +translate_exception -cdef extern from "cantera/plasma/PlasmaPhase.h": +cdef extern from "cantera/thermo/PlasmaPhase.h": cdef cppclass CxxPlasmaPhase "Cantera::PlasmaPhase": CxxPlasmaPhase() void setElectronEnergyGrid(vector[double]&) except +translate_exception diff --git a/src/SConscript b/src/SConscript index cbc069ead85..8ce6b9699cb 100644 --- a/src/SConscript +++ b/src/SConscript @@ -27,7 +27,6 @@ libs = [('base', ['cpp'], baseSetup), ('base', ['^application.cpp'], applicationSetup), ('base', ['^global.cpp'], globalSetup), ('thermo', ['cpp'], defaultSetup), - ('plasma', ['cpp'], defaultSetup), ('tpx', ['cpp'], defaultSetup), ('equil', ['cpp','c'], defaultSetup), ('numerics', ['cpp'], defaultSetup), diff --git a/src/plasma/PlasmaPhase.cpp b/src/thermo/PlasmaPhase.cpp similarity index 98% rename from src/plasma/PlasmaPhase.cpp rename to src/thermo/PlasmaPhase.cpp index 73d002e1371..9ab0b0ec9b6 100644 --- a/src/plasma/PlasmaPhase.cpp +++ b/src/thermo/PlasmaPhase.cpp @@ -3,7 +3,7 @@ // This file is part of Cantera. See License.txt in the top-level directory or // at https://cantera.org/license.txt for license and copyright information. -#include "cantera/plasma/PlasmaPhase.h" +#include "cantera/thermo/PlasmaPhase.h" #include "cantera/base/global.h" #include "cantera/numerics/funcs.h" diff --git a/src/thermo/ThermoFactory.cpp b/src/thermo/ThermoFactory.cpp index 584f3adc462..ef51d8313a1 100644 --- a/src/thermo/ThermoFactory.cpp +++ b/src/thermo/ThermoFactory.cpp @@ -15,7 +15,7 @@ #include "cantera/thermo/PDSSFactory.h" #include "cantera/thermo/MultiSpeciesThermo.h" #include "cantera/thermo/IdealGasPhase.h" -#include "cantera/plasma/PlasmaPhase.h" +#include "cantera/thermo/PlasmaPhase.h" #include "cantera/thermo/IdealSolidSolnPhase.h" #include "cantera/thermo/MaskellSolidSolnPhase.h"