From 0dd5faa31ab2cd7357e6b04c83f484a24e602f4e Mon Sep 17 00:00:00 2001
From: jowr <jowr@mek.dtu.dk>
Date: Fri, 6 Jun 2014 15:33:32 +0200
Subject: [PATCH] Fixed some incompressible build problems

---
 .../Helmholtz/Fluids/Incompressible.cpp       | 66 +++++++++----------
 .../Helmholtz/Fluids/Incompressible.h         |  6 +-
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/Backends/Helmholtz/Fluids/Incompressible.cpp b/src/Backends/Helmholtz/Fluids/Incompressible.cpp
index edd50552..5dc2cb56 100644
--- a/src/Backends/Helmholtz/Fluids/Incompressible.cpp
+++ b/src/Backends/Helmholtz/Fluids/Incompressible.cpp
@@ -22,39 +22,39 @@ std::vector<std::vector<double> > Incompressible::changeAxis(const std::vector<d
 	return output;
 }
 
-/* All functions need T and p as input. Might not
- * be necessary, but gives a clearer structure.
- */
-/// Density as a function of temperature, pressure and composition.
-double Incompressible::rho(double T_K, double p) {
-	return poly.polyval(cRho, getxInput(x), getTInput(T_K));
-}
-/// Heat capacities as a function of temperature, pressure and composition.
-double Incompressible::c(double T_K, double p) {
-	return poly.polyval(cHeat, getxInput(x), getTInput(T_K));
-}
-/// Enthalpy as a function of temperature, pressure and composition.
-double Incompressible::h(double T_K, double p) {
-	return h_u(T_K, p);
-}
-/// Entropy as a function of temperature, pressure and composition.
-double Incompressible::s(double T_K, double p) {
-	return poly.polyfracintcentral(cHeat, getxInput(x), T_K, Tbase)
-			- poly.polyfracintcentral(cHeat, getxInput(x), Tref, Tbase);
-}
-/// Viscosity as a function of temperature, pressure and composition.
-double Incompressible::visc(double T_K, double p) {
-	return expo.expval(cVisc, getxInput(x), getTInput(T_K), 2) / 1e3;
-}
-/// Thermal conductivity as a function of temperature, pressure and composition.
-double Incompressible::cond(double T_K, double p) {
-	return poly.polyval(cCond, getxInput(x), getTInput(T_K));
-}
-/// Internal energy as a function of temperature, pressure and composition.
-double Incompressible::u(double T_K, double p) {
-	return poly.polyint(cHeat, getxInput(x), getTInput(T_K))
-			- poly.polyint(cHeat, getxInput(x), getTInput(Tref));
-}
+// /* All functions need T and p as input. Might not
+//  * be necessary, but gives a clearer structure.
+//  */
+// /// Density as a function of temperature, pressure and composition.
+// double Incompressible::rho(double T_K, double p) {
+// 	return poly.polyval(cRho, getxInput(x), getTInput(T_K));
+// }
+// /// Heat capacities as a function of temperature, pressure and composition.
+// double Incompressible::c(double T_K, double p) {
+// 	return poly.polyval(cHeat, getxInput(x), getTInput(T_K));
+// }
+// /// Enthalpy as a function of temperature, pressure and composition.
+// double Incompressible::h(double T_K, double p) {
+// 	return h_u(T_K, p);
+// }
+// /// Entropy as a function of temperature, pressure and composition.
+// double Incompressible::s(double T_K, double p) {
+// 	return poly.polyfracintcentral(cHeat, getxInput(x), T_K, Tbase)
+// 			- poly.polyfracintcentral(cHeat, getxInput(x), Tref, Tbase);
+// }
+// /// Viscosity as a function of temperature, pressure and composition.
+// double Incompressible::visc(double T_K, double p) {
+// 	return expo.expval(cVisc, getxInput(x), getTInput(T_K), 2) / 1e3;
+// }
+// /// Thermal conductivity as a function of temperature, pressure and composition.
+// double Incompressible::cond(double T_K, double p) {
+// 	return poly.polyval(cCond, getxInput(x), getTInput(T_K));
+// }
+// /// Internal energy as a function of temperature, pressure and composition.
+// double Incompressible::u(double T_K, double p) {
+// 	return poly.polyint(cHeat, getxInput(x), getTInput(T_K))
+// 			- poly.polyint(cHeat, getxInput(x), getTInput(Tref));
+// }
 
 /// Saturation pressure as a function of temperature and composition.
 double Incompressible::psat(double T_K          ){throw NotImplementedError("Psat is not available");};
diff --git a/src/Backends/Helmholtz/Fluids/Incompressible.h b/src/Backends/Helmholtz/Fluids/Incompressible.h
index 79713bf8..5b4a55ca 100644
--- a/src/Backends/Helmholtz/Fluids/Incompressible.h
+++ b/src/Backends/Helmholtz/Fluids/Incompressible.h
@@ -36,9 +36,9 @@ protected:
 
 	std::vector<std::vector<double> > changeAxis(const std::vector<double> &input);
 
-	BasePolynomial poly;
-	PolynomialSolver solver;
-	BaseExponential expo;
+	//BasePolynomial poly;
+	//PolynomialSolver solver;
+	//BaseExponential expo;
 
 public:
 	Incompressible();