merge with CFDEMcoupling-PUBLIC 2.9.0

This commit is contained in:
dqueteschiner
2015-03-25 14:23:49 +01:00
parent 0f0ca849f6
commit a1d8c61241
46 changed files with 414 additions and 128 deletions

View File

@ -23,5 +23,5 @@ else
fi
gnome-terminal --title='cfdemSolverIB twoSpheresGlowinskiMPI CFD' -e "bash $casePath/parCFDDEMrun.sh"
#gnome-terminal --title='cfdemSolverIB twoSpheresGlowinskiMPI CFD' -e "bash $casePath/parCFDDEMrun.sh"
bash $casePath/parCFDDEMrun.sh

View File

@ -26,4 +26,5 @@ else
fi
#- run parallel CFD-DEM in new terminal
gnome-terminal --title='cfdemSolverPiso ErgunTestMPI CFD' -e "bash $casePath/parCFDDEMrun.sh"
#gnome-terminal --title='cfdemSolverPiso ErgunTestMPI CFD' -e "bash $casePath/parCFDDEMrun.sh"
bash $casePath/parCFDDEMrun.sh

View File

@ -26,6 +26,9 @@ FoamFile
//===========================================================================//
// sub-models & settings
syncMode false;
//verbose;
modelType "A"; // A or B
couplingInterval 100;
@ -171,7 +174,7 @@ KochHillDragProps
//);
implForceDEM true;
//implForceDEMaccumulated true;
//explicitInterpCorr true;
//explicitCorr true;
}
BeetstraDragProps

View File

@ -63,27 +63,27 @@ functions
name probes;
probeLocations
(
(0 0 0.0001)
(0 0 0.0026)
(0 0 0.0051)
(0 0 0.0076)
(0 0 0.0101)
(0 0 0.0126)
(0 0 0.0151)
(0 0 0.0176)
(0 0 0.0201)
(0 0 0.0226)
(0 0 0.0251)
(0 0 0.0276)
(0 0 0.0301)
(0 0 0.0326)
(0 0 0.0351)
(0 0 0.0375)
(0 0 0.0401)
(0 0 0.0426)
(0 0 0.0451)
(0 0 0.0476)
(0 0 0.0529)
(0.00003 0 0.0001)
(0.00003 0 0.0026)
(0.00003 0 0.0051)
(0.00003 0 0.0076)
(0.00003 0 0.0101)
(0.00003 0 0.0126)
(0.00003 0 0.0151)
(0.00003 0 0.0176)
(0.00003 0 0.0201)
(0.00003 0 0.0226)
(0.00003 0 0.0251)
(0.00003 0 0.0276)
(0.00003 0 0.0301)
(0.00003 0 0.0326)
(0.00003 0 0.0351)
(0.00003 0 0.0375)
(0.00003 0 0.0401)
(0.00003 0 0.0426)
(0.00003 0 0.0451)
(0.00003 0 0.0476)
(0.00003 0 0.0529)
);
// Fields to be probed

View File

@ -21,7 +21,7 @@ logfileName="log_$headerText"
solverName="cfdemSolverPiso"
nrProcs="4"
machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off| strict # on | off| strict
debugMode="off" # on | off| strict
testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
runOctave="true"
postproc="false"

View File

@ -26,5 +26,5 @@ else
fi
#- run parallel CFD-DEM in new terminal
gnome-terminal --title='cfdemSolverPiso ErgunTestMPI CFD' -e "bash $casePath/parCFDDEMrun.sh"
#gnome-terminal --title='cfdemSolverPiso ErgunTestMPI_cgs CFD' -e "bash $casePath/parCFDDEMrun.sh"
bash $casePath/parCFDDEMrun.sh

View File

@ -49,7 +49,8 @@ cp $casePath/CFD/constant/couplingProperties_restart $casePath/CFD/constant/coup
cp $casePath/CFD/system/controlDict_restart $casePath/CFD/system/controlDict
#- run parallel CFD-DEM in new terminal
gnome-terminal --title='cfdemSolverPiso ErgunTestMPI_restart CFD' -e "bash $casePath/parCFDDEMrun.sh"
#gnome-terminal --title='cfdemSolverPiso ErgunTestMPI_restart CFD' -e "bash $casePath/parCFDDEMrun.sh"
bash $casePath/parCFDDEMrun.sh
#- wait until sim has finished then run octave

View File

@ -19,5 +19,5 @@ else
fi
#- run parallel CFD-DEM in new terminal
gnome-terminal --title='cfdemSolverPiso settlingTest CFD' -e "bash $casePath/parCFDDEMrun.sh"
#gnome-terminal --title='cfdemSolverPiso settlingTest CFD' -e "bash $casePath/parCFDDEMrun.sh"
bash $casePath/parCFDDEMrun.sh

View File

@ -26,5 +26,5 @@ else
fi
#- run parallel CFD-DEM in new terminal
gnome-terminal --title='cfdemSolverPisoScalar packedBedTemp CFD' -e "bash $casePath/parCFDDEMrun.sh"
#gnome-terminal --title='cfdemSolverPisoScalar packedBedTemp CFD' -e "bash $casePath/parCFDDEMrun.sh"
bash $casePath/parCFDDEMrun.sh