From 615c64153005b08ec50bcb3e930a5416cf81edcc Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Tue, 3 Jun 2014 14:34:34 +0200 Subject: [PATCH] Added asserts for the lengths of the residual HE vectors loaded Signed-off-by: Ian Bell --- src/Backends/Helmholtz/Fluids/FluidLibrary.h | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/Backends/Helmholtz/Fluids/FluidLibrary.h b/src/Backends/Helmholtz/Fluids/FluidLibrary.h index f4a3263c..36d9463e 100644 --- a/src/Backends/Helmholtz/Fluids/FluidLibrary.h +++ b/src/Backends/Helmholtz/Fluids/FluidLibrary.h @@ -47,6 +47,9 @@ protected: std::vector d = cpjson::get_long_double_array(contribution["d"]); std::vector t = cpjson::get_long_double_array(contribution["t"]); std::vector l = cpjson::get_long_double_array(contribution["l"]); + assert(n.size() == d.size()); + assert(n.size() == t.size()); + assert(n.size() == l.size()); EOS.alphar.Power = ResidualHelmholtzPower(n,d,t,l); } else if (!type.compare("ResidualHelmholtzGaussian")) @@ -59,6 +62,12 @@ protected: std::vector epsilon = cpjson::get_long_double_array(contribution["epsilon"]); std::vector beta = cpjson::get_long_double_array(contribution["beta"]); std::vector gamma = cpjson::get_long_double_array(contribution["gamma"]); + assert(n.size() == d.size()); + assert(n.size() == t.size()); + assert(n.size() == eta.size()); + assert(n.size() == epsilon.size()); + assert(n.size() == beta.size()); + assert(n.size() == gamma.size()); EOS.alphar.Gaussian = ResidualHelmholtzGaussian(n,d,t,eta,epsilon,beta,gamma); } else if (!type.compare("ResidualHelmholtzNonAnalytic")) @@ -72,6 +81,13 @@ protected: std::vector B = cpjson::get_long_double_array(contribution["B"]); std::vector C = cpjson::get_long_double_array(contribution["C"]); std::vector D = cpjson::get_long_double_array(contribution["D"]); + assert(n.size() == a.size()); + assert(n.size() == b.size()); + assert(n.size() == beta.size()); + assert(n.size() == A.size()); + assert(n.size() == B.size()); + assert(n.size() == C.size()); + assert(n.size() == D.size()); EOS.alphar.NonAnalytic = ResidualHelmholtzNonAnalytic(n,a,b,beta,A,B,C,D); } else if (!type.compare("ResidualHelmholtzLemmon2005")) @@ -82,6 +98,10 @@ protected: std::vector t = cpjson::get_long_double_array(contribution["t"]); std::vector l = cpjson::get_long_double_array(contribution["l"]); std::vector m = cpjson::get_long_double_array(contribution["m"]); + assert(n.size() == d.size()); + assert(n.size() == t.size()); + assert(n.size() == l.size()); + assert(n.size() == m.size()); EOS.alphar.Lemmon2005 = ResidualHelmholtzLemmon2005(n,d,t,l,m); } else if (!type.compare("ResidualHelmholtzExponential")) @@ -92,6 +112,10 @@ protected: std::vector t = cpjson::get_long_double_array(contribution["t"]); std::vector g = cpjson::get_long_double_array(contribution["g"]); std::vector l = cpjson::get_long_double_array(contribution["l"]); + assert(n.size() == d.size()); + assert(n.size() == t.size()); + assert(n.size() == g.size()); + assert(n.size() == l.size()); EOS.alphar.Exponential = ResidualHelmholtzExponential(n,d,t,g,l); } else if (!type.compare("ResidualHelmholtzAssociating"))