From 6e71533e60b3a57dd459deb692654c68ccf61d58 Mon Sep 17 00:00:00 2001
From: danielque <daniel.queteschiner@jku.at>
Date: Tue, 13 Dec 2016 16:44:35 +0100
Subject: [PATCH] fix post-processing of ErgunTest cases for OpenFOAM 4.0

fix number of headerlines expected in probe files for ErgunTestCG,
ErgunTestMPI_cgs and ErgunTestMPI_restart
---
 .../ErgunTestCG/CFD/octave/totalPressureDrop.m                | 2 +-
 .../ErgunTestMPI/CFD/octave/totalPressureDrop.m               | 2 +-
 .../ErgunTestMPI_cgs/CFD/octave/totalPressureDrop.m           | 2 +-
 .../ErgunTestMPI_restart/CFD/octave/totalPressureDrop.m       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/octave/totalPressureDrop.m b/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/octave/totalPressureDrop.m
index f1c519b7..87e6a316 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/octave/totalPressureDrop.m
+++ b/tutorials/cfdemSolverPiso/ErgunTestCG/CFD/octave/totalPressureDrop.m
@@ -9,7 +9,7 @@ rhoG = 10			% density in kg/m3
 %path = '../probes/0/p';
 path = '../postProcessing/probes/0/p';
 columns=22;
-headerlines=4;
+headerlines=23;
 data = loaddata(path,columns,headerlines);
 data=transpose(data);
 [x,y]=size(data)
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m
index e0905ca6..727ab265 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m
@@ -9,7 +9,7 @@ rhoG = 10			% density in kg/m3
 %path = '../probes/0/p'; % 2.1.x
 path = '../postProcessing/probes/0/p'; % 2.2.x
 columns=22;
-headerlines=23;%4;
+headerlines=23;
 data = loaddata(path,columns,headerlines);
 data=transpose(data);
 [x,y]=size(data)
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/octave/totalPressureDrop.m b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/octave/totalPressureDrop.m
index d1e329fb..c0f8532d 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/octave/totalPressureDrop.m
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/octave/totalPressureDrop.m
@@ -9,7 +9,7 @@ rhoG = 0.01			% density in g/cm3
 %path = '../probes/0/p'; % 2.1.x
 path = '../postProcessing/probes/0/p'; % 2.2.x
 columns=22;
-headerlines=4;
+headerlines=23;
 data = loaddata(path,columns,headerlines);
 data=transpose(data);
 [x,y]=size(data)
diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/octave/totalPressureDrop.m b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/octave/totalPressureDrop.m
index a6873016..3c1e16b4 100644
--- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/octave/totalPressureDrop.m
+++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/octave/totalPressureDrop.m
@@ -9,7 +9,7 @@ rhoG = 10			% density in kg/m3
 %path = '../probes/0/p'; % 2.1.x
 path = '../postProcessing/probes/0/p'; % 2.2.x
 columns=22;
-headerlines=4;
+headerlines=23;
 data = loaddata(path,columns,headerlines);
 data=transpose(data);
 [x,y]=size(data)
@@ -23,7 +23,7 @@ t_sim = data(:,1);
 %path = '../probes/0.05/p'; % 2.1.x
 path = '../postProcessing/probes/0.05/p'; % 2.2.x
 columns=22;
-headerlines=4;
+headerlines=23;
 data = loaddata(path,columns,headerlines);
 data=transpose(data);
 [x,y]=size(data)