diff --git a/Cantera/matlab/Makefile.in b/Cantera/matlab/Makefile.in index 6eacad788..62b8f0d64 100644 --- a/Cantera/matlab/Makefile.in +++ b/Cantera/matlab/Makefile.in @@ -29,7 +29,9 @@ LIB_DEPS = $(CANTERA_LIBDIR)/libcantera.a $(CANTERA_LIBDIR)/libzeroD.a \ $(CANTERA_LIBDIR)/liboneD.a \ $(CANTERA_LIBDIR)/libtransport.a else -LIB_DEPS = +LIB_DEPS = $(CANTERA_LIBDIR)/cantera.lib $(CANTERA_LIBDIR)/zeroD.lib \ + $(CANTERA_LIBDIR)/oneD.lib \ + $(CANTERA_LIBDIR)/transport.lib endif os_is_win=@OS_IS_WIN@ diff --git a/Cantera/matlab/cantera/@Solution/set.m b/Cantera/matlab/cantera/@Solution/set.m index 7cc8e4f25..9631b47d5 100755 --- a/Cantera/matlab/cantera/@Solution/set.m +++ b/Cantera/matlab/cantera/@Solution/set.m @@ -134,7 +134,7 @@ elseif ntot == 2 % set property pairs % if nt == 1 - setTemperature(a,tval) + setTemperature(a,tval); if nv == 1 setDensity(a,1.0/vval); % temperature held fixed elseif np == 1 diff --git a/Cantera/matlab/cantera/examples/prandtl1.m b/Cantera/matlab/cantera/examples/prandtl1.m index ac354fed0..a2273724e 100755 --- a/Cantera/matlab/cantera/examples/prandtl1.m +++ b/Cantera/matlab/cantera/examples/prandtl1.m @@ -24,10 +24,14 @@ ih2 = speciesIndex(gas,'H2'); ih = speciesIndex(gas,'H'); ih2o = speciesIndex(gas,'H2O'); +minT = minTemp(gas); +maxT = maxTemp(gas); +dT = (maxT - minT)/30.0; + atm = oneatm; t0 = cputime; for i = 1:31 - t(i) = 300.0 + 100.0*i; + t(i) = minT + dT*(i-1); for j = 1:31 xo2(j) = 0.99*(j-1)/30.0; x = zeros(nSpecies(gas),1); diff --git a/Cantera/matlab/cantera/examples/prandtl2.m b/Cantera/matlab/cantera/examples/prandtl2.m index a9819d90d..6e09114e9 100755 --- a/Cantera/matlab/cantera/examples/prandtl2.m +++ b/Cantera/matlab/cantera/examples/prandtl2.m @@ -23,10 +23,14 @@ ih2 = speciesIndex(gas,'H2'); ih = speciesIndex(gas,'H'); ih2o = speciesIndex(gas,'H2O'); +minT = minTemp(gas); +maxT = maxTemp(gas); +dT = (maxT - minT)/30.0; + atm = oneatm; t0 = cputime; for i = 1:31 - t(i) = 300.0 + 100.0*i; + t(i) = minT + dT*(i-1); for j = 1:31 xo2(j) = 0.99*(j-1)/30.0; x = zeros(nSpecies(gas),1); diff --git a/Cantera/src/ChemEquil.cpp b/Cantera/src/ChemEquil.cpp index 76fff71e8..185a39afb 100755 --- a/Cantera/src/ChemEquil.cpp +++ b/Cantera/src/ChemEquil.cpp @@ -473,8 +473,8 @@ namespace Cantera { if (elMoles[m] < Cutoff && m != m_eloc) x[m] = -1000.0; //if (m == m_eloc) x[m] = -10.0; } - above[mm] = log(m_thermo->maxTemp()); //log(1.e4); - below[mm] = log(m_thermo->minTemp()); //log(10.0); + above[mm] = log(m_thermo->maxTemp() + 1.0); //log(1.e4); + below[mm] = log(m_thermo->minTemp() - 1.0); //log(10.0); vector_fp grad(nvar, 0.0); // gradient of f = F*F/2 vector_fp oldx(nvar, 0.0); // old solution diff --git a/tools/src/finish_install.py.in b/tools/src/finish_install.py.in index eb2e1786b..bd5ec8a07 100644 --- a/tools/src/finish_install.py.in +++ b/tools/src/finish_install.py.in @@ -12,7 +12,7 @@ templdir = '@ct_templdir@' ctdir = '@ct_dir@' home = '@homedir@' -f = open(ctdir+'/setup_cantera','w') +f = open(home+'/setup_cantera','w') f.write('#!/bin/sh\n') f.write('LD_LIBRARY_PATH='+libdir+':$LD_LIBRARY_PATH\nexport LD_LIBRARY_PATH\n') f.write('PATH='+bindir+':$PATH\nexport PATH\n') @@ -118,12 +118,12 @@ else: print """ - setup script """+ctdir+"""/setup_cantera + setup script """+home+"""/setup_cantera The setup script configures the environment for Cantera. It is recommended that you run this script by typing - source """+ctdir+"""/setup_cantera + source """+home+"""/setup_cantera before using Cantera, or else include its contents in your shell login script.