diff --git a/Cantera/src/oneD/OneDim.cpp b/Cantera/src/oneD/OneDim.cpp index ea1a14f05..e1aab26ff 100644 --- a/Cantera/src/oneD/OneDim.cpp +++ b/Cantera/src/oneD/OneDim.cpp @@ -8,7 +8,7 @@ #include "MultiNewton.h" #include "OneDim.h" -#include "ctml.h" +#include "../ctml.h" using namespace ctml; namespace Cantera { @@ -48,7 +48,7 @@ namespace Cantera { // create a Newton iterator, and add each domain. m_newt = new MultiNewton(1); - int nd = domains.size(); + int nd = static_cast(domains.size()); int i; for (i = 0; i < nd; i++) { addDomain(domains[i]); @@ -73,7 +73,7 @@ namespace Cantera { // if 'd' is not the first domain, link it to the last domain // added (the rightmost one) - int n = m_dom.size(); + int n = static_cast(m_dom.size()); if (n > 0) m_dom.back()->append(d); // every other domain is a connector diff --git a/Cantera/src/oneD/refine.cpp b/Cantera/src/oneD/refine.cpp index 1a36b01bd..23c610747 100644 --- a/Cantera/src/oneD/refine.cpp +++ b/Cantera/src/oneD/refine.cpp @@ -194,7 +194,7 @@ namespace Cantera { //done: //m_did_analysis = true; - return m_loc.size(); + return static_cast(m_loc.size()); } double Refiner::value(const double* x, int i, int j) { @@ -202,7 +202,7 @@ namespace Cantera { } void Refiner::show() { - int nnew = m_loc.size(); + int nnew = static_cast(m_loc.size()); if (nnew > 0) { drawline(); writelog(string("Refining grid in ") + @@ -232,7 +232,7 @@ namespace Cantera { int Refiner::getNewGrid(int n, const doublereal* z, int nn, doublereal* zn) { int j; - int nnew = m_loc.size(); + int nnew = static_cast(m_loc.size()); if (nnew + n > nn) { throw CanteraError("Refine::getNewGrid", "array size too small.");