[thermo] move plasma back to thermo folder

Cantera · Feb 19, 2022 · 9d5fe95 · 9d5fe95
1 parent eac2838
commit 9d5fe95
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/include/cantera/plasma/PlasmaPhase.h → include/cantera/thermo/PlasmaPhase.h b/include/cantera/plasma/PlasmaPhase.h → include/cantera/thermo/PlasmaPhase.h
diff --git 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
@@ -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 → src/thermo/PlasmaPhase.cpp b/src/plasma/PlasmaPhase.cpp → 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
@@ -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"