diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/Allrun b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/Allrun index 45134c2b3..4d6fee645 100755 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/Allrun +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/Allrun @@ -16,6 +16,6 @@ sed -i -e '1d' -e 's/# /#/g' numberDensity.dat transposeFile numberDensity.dat > numberDensity.transposed.dat # Create plot -./plot +( cd validation && ./createGraphs ) #------------------------------------------------------------------------------ diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/plot b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/plot deleted file mode 100755 index 206faaf82..000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/plot +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/gnuplot - -set terminal postscript eps monochrome -set output "numberDensity.eps" -set decimalsign "." - -set format xy '%g' -set xtics 1e1 mirror -set xlabel 'v(m^{3})' -set ytics 1e1 mirror -set ylabel 'n(m^{-3}m^{-3})' - -set logscale xy -set xrange [1e-5:1.5] -set yrange [1e-5:10] -set key at graph 0.8,0.5 - -N0 = 0.05 -v0 = 1.0 - -n(x,t) = N0*exp(-t*x**2.0)*2.0*t*v0 - -plot " /dev/null 2>&1 +then + echo 'gnuplot not found - skipping graph creation' >&2 + exit 1 +fi + +gnuplot< numberDensity.transposed.dat # Create plot -./plot +( cd validation && ./createGraphs ) #------------------------------------------------------------------------------ diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/plot b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/plot deleted file mode 100755 index 206faaf82..000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/plot +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/gnuplot - -set terminal postscript eps monochrome -set output "numberDensity.eps" -set decimalsign "." - -set format xy '%g' -set xtics 1e1 mirror -set xlabel 'v(m^{3})' -set ytics 1e1 mirror -set ylabel 'n(m^{-3}m^{-3})' - -set logscale xy -set xrange [1e-5:1.5] -set yrange [1e-5:10] -set key at graph 0.8,0.5 - -N0 = 0.05 -v0 = 1.0 - -n(x,t) = N0*exp(-t*x**2.0)*2.0*t*v0 - -plot " /dev/null 2>&1 +then + echo 'gnuplot not found - skipping graph creation' >&2 + exit 1 +fi + +gnuplot< numberDensity.transposed.dat # Create plot -./plot +( cd validation && ./createGraphs ) #------------------------------------------------------------------------------ diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/plot b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/plot deleted file mode 100755 index 7676d6a2e..000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/plot +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/gnuplot - -set terminal postscript eps monochrome -set output "numberDensity.eps" -set decimalsign "." - -set format xy '%g' -set xtics 1e2 mirror -set xlabel 'v(m^{3})' -set ytics 1e5 mirror -set ylabel 'n(m^{-3}m^{-3})' - -set logscale xy -set xrange [1e-5:1e2] -set yrange [1e-15:100] -set key at graph 0.55,0.5 - -C = 1 -N0 = 2.5 -v0 = 0.01 - -# Dimensionless volume -X(x) = x/v0 - -# Initial condition -n0(x) = (N0/v0)*X(x)*exp(-X(x)) - -T(t) = C*N0*t - -# For solution of quadratic saddle point equation -p(x) = -1/X(x) -q(t) = -(T(t)/(T(t) + 2)) - -# Saddle point calculation -y_s(t,x) = -p(x)/2 + sqrt((p(x)/2)**2 - q(T(t))) - -# Dimensionless spectrum function -phi(x,t) = (8*exp((y_s(t,x) - 1)*X(x)*2))/(((T(t) + 2)**2)*y_s(t,x)*(4*pi*(2 - 1/(y_s(t,x)*X(x))))) - -# Number density at time t -n(x,t) = (N0/v0)*phi(x,t) - -plot n0(x) ls -1 t 'Initial Condition',\ -n(x,10.0) ls 2 lc rgb 'black' t '[Scott, J. Atmos. Sci., 25: 54-65, 1968]',\ -'numberDensity.transposed.dat' every ::0::46 u 1:2 w p pt 1 t 'air1',\ -'numberDensity.transposed.dat' every ::47::55 u 1:2 w p pt 5 t 'air2',\ -'numberDensity.transposed.dat' every ::56::70 u 1:2 w p pt 9 t 'air3' diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/validation/createGraphs b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/validation/createGraphs new file mode 100755 index 000000000..a8290721d --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/validation/createGraphs @@ -0,0 +1,57 @@ +#!/bin/sh + +if ! which gnuplot > /dev/null 2>&1 +then + echo 'gnuplot not found - skipping graph creation' >&2 + exit 1 +fi + +gnuplot< volumeDensity.transposed.dat # Create plot -./plot +( cd validation && ./createGraphs ) #------------------------------------------------------------------------------ diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/plot b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/plot deleted file mode 100755 index e198ef185..000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/plot +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/gnuplot - -set terminal postscript eps monochrome -set output "probabilityDensity.eps" -set decimalsign "." - -set format x '%g' -set format y "%.1f" -set xtics 1 mirror -set xlabel 'd(m)' -set ytics 0.1 mirror -set ylabel 'Probability density function (m^{-3})' - -set xrange [1:10] -set yrange [0:0.4] -set key below - -plot '-' w l t "Number density, [Vanni, J. Colloid Interface Sci., 221: 143-160, 2000]",\ -'-' w l t "Volume density, [Vanni, J. Colloid Interface Sci., 221: 143-160, 2000]",\ -'numberDensity.transposed.dat' every ::0::12 u 1:2 w p pt 1 t 'Number density, air1',\ -'numberDensity.transposed.dat' every ::13::22 u 1:2 w p pt 5 t 'Number density, air2',\ -'numberDensity.transposed.dat' every ::23::30 u 1:2 w p pt 9 t 'Number density, air3',\ -'volumeDensity.transposed.dat' every ::0::12 u 1:2 w p pt 2 t 'Volume density, air1',\ -'volumeDensity.transposed.dat' every ::13::22 u 1:2 w p pt 6 t 'Volume density, air2',\ -'volumeDensity.transposed.dat' every ::23::30 u 1:2 w p pt 10 t 'Volume density, air3' -1.000 0.042 -1.460 0.062 -1.950 0.083 -2.403 0.100 -2.775 0.116 -3.109 0.127 -3.562 0.141 -4.015 0.151 -4.475 0.162 -4.876 0.172 -5.270 0.179 -5.700 0.188 -6.035 0.190 -6.436 0.188 -6.777 0.178 -7.163 0.157 -7.416 0.137 -7.705 0.109 -7.980 0.078 -8.285 0.047 -8.589 0.026 -8.953 0.010 -9.228 0.003 -9.495 0.002 -EOF -0.993 0.000 -0.985 0.002 -1.475 0.003 -1.965 0.005 -2.485 0.010 -2.975 0.020 -3.488 0.032 -3.985 0.055 -4.468 0.084 -4.995 0.123 -5.507 0.176 -6.087 0.240 -6.532 0.289 -6.755 0.309 -7.007 0.326 -7.260 0.324 -7.535 0.305 -7.683 0.284 -7.839 0.252 -8.017 0.215 -8.196 0.172 -8.351 0.137 -8.574 0.090 -8.723 0.065 -8.946 0.037 -9.161 0.021 -9.339 0.013 -9.517 0.006 -9.770 0.004 -9.993 0.002 -EOF diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/validation/createGraphs b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/validation/createGraphs new file mode 100755 index 000000000..aeff07a89 --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/validation/createGraphs @@ -0,0 +1,91 @@ +#!/bin/sh + +if ! which gnuplot > /dev/null 2>&1 +then + echo 'gnuplot not found - skipping graph creation' >&2 + exit 1 +fi + +gnuplot< numberDensity.transposed.dat # Create plot -./plot +( cd validation && ./createGraphs ) #------------------------------------------------------------------------------ diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/plot b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/plot deleted file mode 100755 index a6b66f101..000000000 --- a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/plot +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/gnuplot - -set terminal postscript eps monochrome -set output "numberDensity.eps" -set decimalsign "." - -set format xy '%g' -set xtics 1 mirror -set xlabel 'v(m^3)' -set ytics 0.005 mirror -set ylabel 'n(m^{-3}m^{-3})' - -set xrange [1:15] -set yrange [0:1.5e-2] -set key top right - -plot " /dev/null 2>&1 +then + echo 'gnuplot not found - skipping graph creation' >&2 + exit 1 +fi + +gnuplot< numberDensity.transposed.dat # Create plot -./plot +( cd validation && ./createGraphs ) #------------------------------------------------------------------------------ diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/plot b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/plot deleted file mode 100755 index 15b549c77..000000000 --- a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/plot +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/gnuplot - -set terminal postscript eps monochrome -set output "numberDensity.eps" -set decimalsign "." - -set format xy '%g' -set xtics 1 mirror -set xlabel 'v(m^3)' -set ytics 0.005 mirror -set ylabel 'n(m^{-3}m^{-3})' - -set xrange [1:15] -set yrange [0:1.5e-2] -set key top right - -plot " /dev/null 2>&1 +then + echo 'gnuplot not found - skipping graph creation' >&2 + exit 1 +fi + +gnuplot<