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

Allow default build with msvc-12.0.

Browse source 
Fixes the appearance of C2536 (cannot specify explicit initializer for
arrays). This was preventing a build with msvc_version=12.0. It was
fixed using Visual Studio 2013 (12.0) Update 5.
This commit is contained in:
Evan McCorkle 2017-10-18 22:29:39 -04:00 • committed by Ray Speth
parent 680d0841b5
commit e921cb89c8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/thermo/RedlichKwongMFTP.cpp
View file

@ -10,6 +10,8 @@
#include <boost/math/tools/roots.hpp>
#include <algorithm>
using namespace std;
namespace bmt = boost::math::tools;
@ -25,10 +27,10 @@ RedlichKwongMFTP::RedlichKwongMFTP() :
m_b_current(0.0),
m_a_current(0.0),
NSolns_(0),
Vroot_{0.0, 0.0, 0.0},
dpdV_(0.0),
dpdT_(0.0)
{
fill_n(Vroot_, 3, 0.0);
}
RedlichKwongMFTP::RedlichKwongMFTP(const std::string& infile, const std::string& id_) :
@ -36,10 +38,10 @@ RedlichKwongMFTP::RedlichKwongMFTP(const std::string& infile, const std::string&
m_b_current(0.0),
m_a_current(0.0),
NSolns_(0),
Vroot_{0.0, 0.0, 0.0},
dpdV_(0.0),
dpdT_(0.0)
{
fill_n(Vroot_, 3, 0.0);
initThermoFile(infile, id_);
}
@ -48,10 +50,10 @@ RedlichKwongMFTP::RedlichKwongMFTP(XML_Node& phaseRefRoot, const std::string& id
m_b_current(0.0),
m_a_current(0.0),
NSolns_(0),
Vroot_{0.0, 0.0, 0.0},
dpdV_(0.0),
dpdT_(0.0)
{
fill_n(Vroot_, 3, 0.0);
importPhase(phaseRefRoot, this);
}