diff --git a/test/transport/transportFromScratch.cpp b/test/transport/transportFromScratch.cpp index 2e1f86388..cde9c29e4 100644 --- a/test/transport/transportFromScratch.cpp +++ b/test/transport/transportFromScratch.cpp @@ -253,6 +253,13 @@ TEST_F(SimpleTransportTest, fromScratch) check_transport(tr); } +TEST_F(SimpleTransportTest, fromXML) +{ + shared_ptr tr(newDefaultTransportMgr(p.get())); + check_transport(dynamic_cast(*tr.get())); +} + + int main(int argc, char** argv) { printf("Running main() from transportFromScratch.cpp\n"); diff --git a/test_problems/SConscript b/test_problems/SConscript index d11a4edc3..267247760 100644 --- a/test_problems/SConscript +++ b/test_problems/SConscript @@ -251,8 +251,6 @@ CompileAndTest('pureFluid', 'pureFluidTest', 'testPureWater', 'output_blessed.tx if haveConverters: CompileAndTest('rankine_democxx', 'rankine_democxx', 'rankine', 'output_blessed.txt') CompileAndTest('silane_equil', 'silane_equil', 'silane_equi', 'output_blessed.txt') -CompileAndTest('simpleTransport', 'simpleTransport', 'simpleTransport', - 'output_blessed.txt') CompileAndTest('stoichSolidKinetics', 'stoichSolidKinetics', 'stoichSolidKinetics', 'output_blessed.txt') CompileAndTest('surfkin', 'surfkin', 'surfdemo', 'output_blessed.txt') diff --git a/test_problems/simpleTransport/output_blessed.txt b/test_problems/simpleTransport/output_blessed.txt deleted file mode 100644 index ba5905bad..000000000 --- a/test_problems/simpleTransport/output_blessed.txt +++ /dev/null @@ -1,27 +0,0 @@ -visc = 0.001 -sp visc (H2O(L)) = 0.001 -sp visc (Na+) = 0 -sp visc (Cl-) = 0 -sp visc (H+) = 0 -sp visc (OH-) = 0 -cond = 0.58 -sp diff (H2O(L)) = 1e-05 -sp diff (Na+) = 1e-05 -sp diff (Cl-) = 1e-05 -sp diff (H+) = 1e-05 -sp diff (OH-) = 1e-05 -Mobility (H2O(L)) = 0.000382823 -Mobility (Na+) = 0.000382823 -Mobility (Cl-) = 0.000382823 -Mobility (H+) = 0.000382823 -Mobility (OH-) = 0.000382823 -SpeciesFlux (H2O(L)) = 0.0102344 -SpeciesFlux (Na+) = -0.0124461 -SpeciesFlux (Cl-) = 0.00221167 -SpeciesFlux (H+) = 2.22987e-14 -SpeciesFlux (OH-) = 2.43291e-10 -SpeciesFlux (H2O(L)) = -0.0191255 -SpeciesFlux (Na+) = -0.0505223 -SpeciesFlux (Cl-) = 0.0696478 -SpeciesFlux (H+) = -7.85548e-13 -SpeciesFlux (OH-) = 7.6615e-09 diff --git a/test_problems/simpleTransport/simpleTransportTest.cpp b/test_problems/simpleTransport/simpleTransportTest.cpp deleted file mode 100644 index 8b5ef34bf..000000000 --- a/test_problems/simpleTransport/simpleTransportTest.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "cantera/thermo.h" -#include "cantera/transport.h" -#include "cantera/thermo/HMWSoln.h" -#include "cantera/transport/SimpleTransport.h" - -#include - -using namespace std; -using namespace Cantera; - -int main(int argc, char** argv) -{ - try { - int log_level = 3; - - HMWSoln HMW("HMW_NaCl_pdss.xml", "NaCl_electrolyte"); - - unique_ptr tran(newDefaultTransportMgr(&HMW, log_level)); - - SimpleTransport& tranSimple = dynamic_cast(*tran.get()); - size_t nsp = HMW.nSpecies(); - - HMW.setState_TP(30+273.13, OneAtm); - - double visc = tranSimple.viscosity(); - printf("visc = %g\n", visc); - - vector_fp x(nsp, 0.0); - - tranSimple.getSpeciesViscosities(&x[0]); - for (size_t k = 0; k < nsp; k++) { - printf("sp visc (%s) = %g\n", HMW.speciesName(k).c_str(), x[k]); - } - - double cond = tranSimple.thermalConductivity(); - printf("cond = %g\n", cond); - - tranSimple.getMixDiffCoeffs(&x[0]); - for (size_t k = 0; k < nsp; k++) { - printf("sp diff (%s) = %g\n", HMW.speciesName(k).c_str(), x[k]); - } - - tranSimple.getMobilities(&x[0]); - for (size_t k = 0; k < nsp; k++) { - printf("Mobility (%s) = %g\n", HMW.speciesName(k).c_str(), x[k]); - } - - vector_fp gradX(nsp, 0.0); - gradX[1] = 1.0; - double gradT = 0.0; - - tranSimple.getSpeciesFluxes(1, &gradT, 5, &gradX[0], 5, &x[0]); - for (size_t k = 0; k < nsp; k++) { - string spName = HMW.speciesName(k); - printf("SpeciesFlux (%s) = %g\n", spName.c_str(), x[k]); - } - - gradX[1] = 0.0; - double gradV = 1.0; - - tranSimple.set_Grad_T(&gradT); - tranSimple.set_Grad_V(&gradV); - tranSimple.set_Grad_X(&gradX[0]); - - tranSimple.getSpeciesFluxesExt(5, &x[0]); - for (size_t k = 0; k < nsp; k++) { - printf("SpeciesFlux (%s) = %g\n", HMW.speciesName(k).c_str(), x[k]); - } - - Cantera::appdelete(); - return 0; - } catch (CanteraError& err) { - std::cout << err.what() << std::endl; - return -1; - } -}