research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed the ifdef blocks around

Browse source
This commit is contained in:
Harry Moffat 2008-01-03 18:41:15 +00:00
parent 2b69c44881
commit f84634b2f3
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Cantera/src/equil/vcs_MultiPhaseEquil.cpp
View file

@ -16,16 +16,7 @@
#include "vcs_nasa_poly.h"
#include "vcs_solve.h"
#ifdef CANTERA_SRC_TREE
#include "speciesThermoTypes.h"
#ifdef WITH_IDEAL_SOLUTIONS
#include "IdealSolidSolnPhase.h"
#endif
#ifdef WITH_ELECTROLYTES
#include "IdealMolalSoln.h"
#endif
#include "ChemEquil.h"
#else
#ifdef CANTERA_APP
#include "cantera/Cantera.h"
#include "cantera/thermo.h"
#include "cantera/kernel/speciesThermoTypes.h"
@ -36,6 +27,17 @@
#include "cantera/kernel/IdealMolalSoln.h"
#endif
#include "cantera/kernel/ChemEquil.h"
#else
#include "ct_defs.h"
#include "mix_defs.h"
#include "speciesThermoTypes.h"
#ifdef WITH_IDEAL_SOLUTIONS
#include "IdealSolidSolnPhase.h"
#endif
#ifdef WITH_ELECTROLYTES
#include "IdealMolalSoln.h"
#endif
#include "ChemEquil.h"
#endif

7
Cantera/src/equil/vcs_VolPhase.cpp
View file

@ -14,13 +14,14 @@
#include "vcs_SpeciesProperties.h"
#include "vcs_species_thermo.h"
#ifdef CANTERA_SRC_TREE
#include "ThermoPhase.h"
#else
#ifdef CANTERA_APP
#include "cantera/Cantera.h"
#include "cantera/kernel/ThermoPhase.h"
#else
#include "ThermoPhase.h"
#endif
#include <cstdio>
#include <cstdlib>