diff --git a/test_problems/NASA9poly_test/Makefile.in b/test_problems/NASA9poly_test/Makefile.in index 13d32e762..ddcbc385a 100644 --- a/test_problems/NASA9poly_test/Makefile.in +++ b/test_problems/NASA9poly_test/Makefile.in @@ -66,9 +66,8 @@ CANTERA_LIB_DEPS = $(CANTERA_LIBDIR)/liboneD.a \ $(CANTERA_LIBDIR)/libconverters.a ifeq (@build_lapack@, 1) -CANTERA_LIB_DEPS = $CANTERA_LIB_DEPS \ - $(CANTERA_LIBDIR)/libctblas.a \ - $(CANTERA_LIBDIR)/libctlapack.a +CANTERA_LAPACK_DEPS = $(CANTERA_LIBDIR)/libctblas.a \ + $(CANTERA_LIBDIR)/libctlapack.a endif # the directory where Cantera include files may be found. @@ -99,7 +98,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) all: $(PROGRAM) # Rule to make the program -$(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS) +$(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS) $(CANTERA_LAPACK_DEPS) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS) diff --git a/test_problems/NASA9poly_test/NASA9poly_test.cpp b/test_problems/NASA9poly_test/NASA9poly_test.cpp index 372861ee7..c74d78fb9 100644 --- a/test_problems/NASA9poly_test/NASA9poly_test.cpp +++ b/test_problems/NASA9poly_test/NASA9poly_test.cpp @@ -55,6 +55,8 @@ int main(int argc, char** argv) { vector_fp cp_R(nsp, 0.0); g.getCp_R(DATA_PTR(cp_R)); + vector_fp Gvalues(nsp, 0.0); + printf("Comparisons of H2 calculated via several equivalent classes:\n"); printf("1500 K and 1 atm:\n"); printf(" NasaThermo Nasa9 Nasa9_4reg \n"); @@ -70,6 +72,21 @@ int main(int argc, char** argv) { g.getEntropy_R(DATA_PTR(S_R)); printf(" S/R: %11.6g %11.6g %11.6g\n", S_R[0], S_R[1], S_R[2]); + Transport * tran = newTransportMgr("Mix", &g); + + // MultiTransport * tranMix = dynamic_cast(tran); + printf("Viscoscity and thermal Cond vs. T\n"); + for ( int k = 0; k < 40; k++) { + double T1 = 400. + 200. * k; + g.setState_TPX(T1, pres, DATA_PTR(Xset)); + g.getPureGibbs(DATA_PTR(Gvalues)); + //printf(" -- %13g %13.5g %13.5g %13.5g %13.5g \n", + // Gvalues[0], Gvalues[1], Gvalues[2], + // Gvalues[3], Gvalues[4]); + double visc = tran->viscosity(); + double cond = tran->thermalConductivity(); + printf(" %13g %13.5g %13.5g\n", T1, visc, cond); + } } catch (CanteraError) { diff --git a/test_problems/NASA9poly_test/output_blessed.txt b/test_problems/NASA9poly_test/output_blessed.txt index fbd202638..8e31d663b 100644 --- a/test_problems/NASA9poly_test/output_blessed.txt +++ b/test_problems/NASA9poly_test/output_blessed.txt @@ -4,3 +4,44 @@ Comparisons of H2 calculated via several equivalent classes: cp/R: 3.8823 3.8823 3.8823 H/RT: 2.91015 2.91015 2.91015 S/R: 21.5255 21.5255 21.5255 +Viscoscity and thermal Cond vs. T + 400 1.0869e-05 0.2291 + 600 1.4145e-05 0.29844 + 800 1.7036e-05 0.36333 + 1000 1.9676e-05 0.42821 + 1200 2.2132e-05 0.49363 + 1400 2.4445e-05 0.55933 + 1600 2.6644e-05 0.62489 + 1800 2.8746e-05 0.68996 + 2000 3.0767e-05 0.7542 + 2200 3.2716e-05 0.8174 + 2400 3.4603e-05 0.87934 + 2600 3.6434e-05 0.93991 + 2800 3.8214e-05 0.99898 + 3000 3.9949e-05 1.0565 + 3200 4.1642e-05 1.1124 + 3400 4.3296e-05 1.1666 + 3600 4.4915e-05 1.2191 + 3800 4.6501e-05 1.2699 + 4000 4.8056e-05 1.319 + 4200 4.9582e-05 1.3664 + 4400 5.1081e-05 1.4121 + 4600 5.2555e-05 1.456 + 4800 5.4004e-05 1.4983 + 5000 5.543e-05 1.5389 + 5200 5.6835e-05 1.5779 + 5400 5.8219e-05 1.6152 + 5600 5.9583e-05 1.6509 + 5800 6.0929e-05 1.685 + 6000 6.2256e-05 1.7176 + 6200 6.3566e-05 1.7485 + 6400 6.486e-05 1.778 + 6600 6.6137e-05 1.8059 + 6800 6.74e-05 1.8324 + 7000 6.8647e-05 1.8573 + 7200 6.988e-05 1.8808 + 7400 7.11e-05 1.9029 + 7600 7.2306e-05 1.9236 + 7800 7.35e-05 1.9429 + 8000 7.468e-05 1.9609 + 8200 7.5849e-05 1.9775