move post-processing scripts to usual CFD/octave folder

move scripts and invoke plotData after CFD-DEM run
This commit is contained in:
danielque
2022-03-25 15:19:31 +01:00
parent f0454797af
commit 2b69485204
3 changed files with 9 additions and 24 deletions

View File

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

View File

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