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

*** empty log message ***

Browse source
This commit is contained in:
Dave Goodwin 2004-12-02 19:58:06 +00:00
parent 560cf632bf
commit b3df568a46
5 changed files with 1599 additions and 3865 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Cantera/src/MultiPhaseEquil.cpp
View file

@ -175,13 +175,14 @@ namespace Cantera {
integer m2 = 0;
integer m3 = m_nel;
integer icase=0;
integer nel = m_nel;
integer nsp = m_nsp;
vector_int iposv(m_nel);
vector_int izrov(m_nsp);
// solve the linear programming problem
simplx_(&aa(0,0), &m_nel, &m_nsp, &mp, &np, &m1, &m2, &m3,
simplx_(&aa(0,0), &nel, &nsp, &mp, &np, &m1, &m2, &m3,
&icase, izrov.begin(), iposv.begin());
fill(m_moles.begin(), m_moles.end(), 0.0);
@ -398,7 +399,7 @@ namespace Cantera {
m_moles[k] += omega * deltaN[k];
}
else {
m_moles[k] = fabs(m_moles[k])*fmin(10.0, exp(-m_deltaG_RT[ik - m_nel]));
m_moles[k] = fabs(m_moles[k])*fminn(10.0, exp(-m_deltaG_RT[ik - m_nel]));
}
}
setMoles();

1
Cantera/src/ctvector.h
View file

@ -153,7 +153,6 @@ namespace ct {
private:
};
std::ostream& operator<<(std::ostream& s, const ct::ctvector_fp& v);
//std::ostream& operator<<(std::ostream& s, ct::ctvector_fp& v);
//std::ostream& operator<<(std::ostream& s, const ct::ctvector_float& v);

1
Makefile.in
View file

@ -137,7 +137,6 @@ hdr-collect:
@INSTALL@ Cantera/src/converters/*.h build/include/cantera/kernel/converters
@INSTALL@ Cantera/src/transport/*.h build/include/cantera/kernel/transport
particles:
ifeq ($(build_particles),1)
cd Cantera/cads; @MAKE@

5453
config/configure vendored
View file

File diff suppressed because it is too large Load diff

2
configure vendored
View file

@ -149,7 +149,7 @@ BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="default"}
# "n" Do not build the Fortran 90/95 interface, even if a
# Fortran 90/95 compiler is installed.
BUILD_F90_INTERFACE=${BUILD_F90_INTERFACE:="y"}
BUILD_F90_INTERFACE=${BUILD_F90_INTERFACE:="n"}
# The Fortran 90/95 compiler.