move post-processing scripts to usual CFD/octave folder

move scripts and invoke plotData after CFD-DEM run

tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/octave/plotData.m

@@ -5,7 +5,7 @@ clear all
 close all
 clc
 
-dirfile = './post';
+dirfile = '../DEM/post';
 filepattern = '*.dat';
 
 % time column in the data matrix

tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/parCFDDEMrun.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
-
-#===================================================================#
+#------------------------------------------------------------------------------
 # allrun script for testcase
 # M. Efe Kinaci - Sep 2018
-#===================================================================#
+#------------------------------------------------------------------------------
 
 #- source CFDEM env vars
 . ~/.bashrc
@@ -11,21 +10,21 @@
 #- include functions
 source $CFDEM_PROJECT_DIR/etc/functions.sh
 
-#--------------------------------------------------------------------------------#
+#------------------------------------------------------------------------------
 #- define variables
 casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
 logpath=$casePath
 headerText="R2_FluidBed"
 logfileName="log_$headerText"
-solverName="cfdemSolverRhoPimpleChem"   #"cfdemSolverPiso"  #
+solverName="cfdemSolverRhoPimpleChem"
 nrProcs="4"
 machineFileName="none"   # yourMachinefileName | none
 debugMode="off"          # on | off| strict
 testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
-runOctave="false"
+runOctave="true"
 postproc="false"
 
-#--------------------------------------------------------------------------------#
+#------------------------------------------------------------------------------
 
 #- call function to run a parallel CFD-DEM case
 parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode
@@ -39,18 +38,8 @@ if [ $runOctave == "true" ]
         #- change path
         cd octave
 
-        #- rmove old graph
-        rm cfdemSolverPiso_ErgunTestMPI.eps
-
         #- run octave
-        octave totalPressureDrop.m
-
-        #- show plot 
-        evince cfdemSolverPiso_ErgunTestMPI.eps
-
-        #- copy log file to test harness
-        cp ../../$logfileName $testHarnessPath
-        cp cfdemSolverPiso_ErgunTestMPI.eps $testHarnessPath
+        octave plotData.m
 fi
     
 if [ $postproc == "true" ]
@@ -67,17 +56,13 @@ if [ $postproc == "true" ]
     #- get VTK data from CFD sim
     cd $casePath/CFD
     reconstructPar
-    foamToVTK                                                   #- serial run of foamToVTK
-    #source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh                       #- include functions
-    #pseudoParallelRun "foamToVTK" $nrPostProcProcessors          #- pseudo parallel run of foamToVTK
 
     #- start paraview
     paraview
  
- #- keep terminal open (if started in new terminal)
+    #- keep terminal open (if started in new terminal)
     echo "...press enter to clean up case"
     echo "press Ctr+C to keep data"
     read
-
 fi