From 16e82a3ab0358c7d1ab34b71c9aa105439fc33e6 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 22 Feb 2012 00:17:30 +0000 Subject: [PATCH] Remove unused definitions of the function pAtable from test_problems --- .../cathermo/DH_graph_1/DH_graph_1.cpp | 21 -------------- .../HMW_graph_CpvT/HMW_graph_CpvT.cpp | 22 -------------- .../cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp | 27 ----------------- .../cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp | 28 ------------------ .../cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp | 29 ------------------- .../cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp | 21 -------------- .../mixGasTransport/mixGasTransport.cpp | 9 ------ .../multiGasTransport/multiGasTransport.cpp | 9 ------ 8 files changed, 166 deletions(-) diff --git a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp index 652bcdb36..1612e5226 100644 --- a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp +++ b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp @@ -16,27 +16,6 @@ void printUsage() cout <<" -> Everything is hardwired" << endl; } -void pAtable(DebyeHuckel* DH) -{ - int nsp = DH->nSpecies(); - double acMol[100]; - double mf[100]; - double activities[100]; - double moll[100]; - - DH->getMolalityActivityCoefficients(acMol); - DH->getMoleFractions(mf); - DH->getActivities(activities); - DH->getMolalities(moll); - string sName; - printf(" Name Activity ActCoeffMolal " - " MoleFract Molality\n"); - for (int k = 0; k < nsp; k++) { - sName = DH->speciesName(k); - printf("%16s %13g %13g %13g %13g\n", - sName.c_str(), activities[k], acMol[k], mf[k], moll[k]); - } -} int main(int argc, char** argv) { diff --git a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp index fd570442a..7d97b2266 100644 --- a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp +++ b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp @@ -18,28 +18,6 @@ void printUsage() cout <<" -> Everything is hardwired" << endl; } -void pAtable(HMWSoln* HMW) -{ - int nsp = HMW->nSpecies(); - double acMol[100]; - double mf[100]; - double activities[100]; - double moll[100]; - - HMW->getMolalityActivityCoefficients(acMol); - HMW->getMoleFractions(mf); - HMW->getActivities(activities); - HMW->getMolalities(moll); - string sName; - printf(" Name Activity ActCoeffMolal " - " MoleFract Molality\n"); - for (int k = 0; k < nsp; k++) { - sName = HMW->speciesName(k); - printf("%16s %13g %13g %13g %13g\n", - sName.c_str(), activities[k], acMol[k], mf[k], moll[k]); - } - -} int main(int argc, char** argv) { diff --git a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp index 031a07679..9476ce545 100644 --- a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp +++ b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp @@ -16,33 +16,6 @@ void printUsage() cout <<" -> Everything is hardwired" << endl; } -void pAtable(HMWSoln* HMW) -{ - int nsp = HMW->nSpecies(); - double acMol[100]; - double mf[100]; - double activities[100]; - double moll[100]; - for (int i = 0; i < 100; i++) { - acMol[i] = 1.0; - mf[i] = 0.0; - activities[i] = 1.0; - moll[i] = 0.0; - } - - HMW->getMolalityActivityCoefficients(acMol); - HMW->getMoleFractions(mf); - HMW->getActivities(activities); - HMW->getMolalities(moll); - string sName; - printf(" Name Activity ActCoeffMolal " - " MoleFract Molality\n"); - for (int k = 0; k < nsp; k++) { - sName = HMW->speciesName(k); - printf("%16s %13g %13g %13g %13g\n", - sName.c_str(), activities[k], acMol[k], mf[k], moll[k]); - } -} int main(int argc, char** argv) { diff --git a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp index 66cad0228..367280600 100644 --- a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp +++ b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp @@ -20,34 +20,6 @@ void printUsage() cout <<" -> Everything is hardwired" << endl; } -void pAtable(HMWSoln* HMW) -{ - double acMol[30]; - double mf[30]; - double activities[30]; - double moll[30]; - int nsp = HMW->nSpecies(); - - for (int i = 0; i < 30; i++) { - acMol[i] = 1.0; - mf[i] = 0.0; - activities[i] = 0.0; - moll[i] = 0.0; - } - - HMW->getMolalityActivityCoefficients(acMol); - HMW->getMoleFractions(mf); - HMW->getActivities(activities); - HMW->getMolalities(moll); - string sName; - printf(" Name Activity ActCoeffMolal " - " MoleFract Molality\n"); - for (int k = 0; k < nsp; k++) { - sName = HMW->speciesName(k); - printf("%16s %13g %13g %13g %13g\n", - sName.c_str(), activities[k], acMol[k], mf[k], moll[k]); - } -} int main(int argc, char** argv) { diff --git a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp index b05c96d6e..d3d93b455 100644 --- a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp +++ b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp @@ -18,35 +18,6 @@ void printUsage() cout <<" -> Everything is hardwired" << endl; } -void pAtable(HMWSoln* HMW) -{ - int nsp = HMW->nSpecies(); - double acMol[30]; - double mf[30]; - - double activities[30]; - double moll[30]; - for (int i = 0; i < 30; i++) { - acMol[i] = 1.0; - mf[i] = 0.0; - activities[i] = 1.0; - moll[i] = 0.0; - } - - HMW->getMolalityActivityCoefficients(acMol); - HMW->getMoleFractions(mf); - HMW->getActivities(activities); - HMW->getMolalities(moll); - string sName; - printf(" Name Activity ActCoeffMolal " - " MoleFract Molality\n"); - for (int k = 0; k < nsp; k++) { - sName = HMW->speciesName(k); - printf("%16s %13g %13g %13g %13g\n", - sName.c_str(), activities[k], acMol[k], mf[k], moll[k]); - } - -} int main(int argc, char** argv) { diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp index d78ba28a0..5e8dad06f 100644 --- a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp +++ b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp @@ -17,27 +17,6 @@ void printUsage() cout <<" -> Everything is hardwired" << endl; } -void pAtable(HMWSoln* HMW) -{ - int nsp = HMW->nSpecies(); - double acMol[100]; - double mf[100]; - double activities[100]; - double moll[100]; - - HMW->getMolalityActivityCoefficients(acMol); - HMW->getMoleFractions(mf); - HMW->getActivities(activities); - HMW->getMolalities(moll); - string sName; - printf(" Name Activity ActCoeffMolal " - " MoleFract Molality\n"); - for (int k = 0; k < nsp; k++) { - sName = HMW->speciesName(k); - printf("%16s %13g %13g %13g %13g\n", - sName.c_str(), activities[k], acMol[k], mf[k], moll[k]); - } -} int main(int argc, char** argv) { diff --git a/test_problems/mixGasTransport/mixGasTransport.cpp b/test_problems/mixGasTransport/mixGasTransport.cpp index 6e8db267f..88b2bc51e 100644 --- a/test_problems/mixGasTransport/mixGasTransport.cpp +++ b/test_problems/mixGasTransport/mixGasTransport.cpp @@ -30,15 +30,6 @@ using namespace std; using namespace Cantera; -void printDbl(double val) -{ - if (fabs(val) < 5.0E-17) { - cout << " nil"; - } else { - cout << val; - } -} - int main(int argc, char** argv) { #ifdef _MSC_VER diff --git a/test_problems/multiGasTransport/multiGasTransport.cpp b/test_problems/multiGasTransport/multiGasTransport.cpp index fd39d9d78..6de06627a 100644 --- a/test_problems/multiGasTransport/multiGasTransport.cpp +++ b/test_problems/multiGasTransport/multiGasTransport.cpp @@ -30,15 +30,6 @@ using namespace std; using namespace Cantera; -void printDbl(double val) -{ - if (fabs(val) < 1.0E-17) { - cout << " nil"; - } else { - cout << val; - } -} - static double cutoff(double val, double atol=1.0E-15) { if (fabs(val) < atol) {