zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16 from ParticulateFlow/master

Browse Source 
update develop with latest changes to master
This commit is contained in:
Daniel
2017-03-08 16:50:57 +01:00
committed by GitHub
parent 2bee441cea b764943f04
commit 69f93a1e27
35 changed files with 76 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,4 +5,4 @@
log_*
log.*
*~
**/linux64GccDPInt32Opt

11
README
View File

@ -5,7 +5,8 @@
www.cfdem.com
Christoph Goniva, christoph.goniva@cfdem.com
Copyright 2009-2012 JKU Linz
Copyright 2012- DCS Computing GmbH, Linz
Copyright 2012-2015 DCS Computing GmbH, Linz
Copyright 2015- JKU Linz
-------------------------------------------------------------------------------
License
This file is part of CFDEMcoupling.
@ -32,7 +33,7 @@ Description
CFDEM(R) coupling provides an open source parallel coupled CFD-DEM framework
combining the strengths of LIGGGHTS(R) DEM code and the Open Source
combining the strengths of the LIGGGHTS(R) DEM code and the Open Source
CFD package OpenFOAM(R)(*). The CFDEM(R)coupling toolbox allows to expand
standard CFD solvers of OpenFOAM(R)(*) to include a coupling to the DEM
code LIGGGHTS(R). In this toolbox the particle representation within the
@ -46,8 +47,6 @@ Features are:
- its modular approach allows users to easily implement new models
- its MPI parallelization enables to use it for large scale problems
- the "forum"_lws on CFD-DEM gives the possibility to exchange with other
users / developers
- the use of GIT allows to easily update to the latest version
- basic documentation is provided
@ -75,7 +74,7 @@ Core development of CFDEM(R)coupling is done by
Christoph Goniva and Christoph Kloss, both at DCS Computing GmbH, 2012
\*---------------------------------------------------------------------------*/
(*) "OpenFOAM(R)"_of is a registered trade mark of OpenCFD Limited, a wholly owned subsidiary of the ESI Group.
/*---------------------------------------------------------------------------*\
(*) "OpenFOAM(R)" is a registered trade mark of OpenCFD Limited, a wholly owned subsidiary of the ESI Group.
This offering is not approved or endorsed by OpenCFD Limited, the producer of the OpenFOAM software and owner of the OPENFOAM® and OpenCFD® trade marks.
\*---------------------------------------------------------------------------*/

1
src/finiteVolume/Make/files
View File

@ -3,6 +3,7 @@ derivedFvPatchFields = $(fvPatchFields)/derived
general = cfdTools/general
$(derivedFvPatchFields)/uniformFixedValueVoidfraction/uniformFixedValueVoidfractionFvPatchFields.C
$(derivedFvPatchFields)/uniformFixedValueTube/uniformFixedValueTubeFvPatchFields.C
LIB = $(CFDEM_LIB_DIR)/libfiniteVolumeCFDEM

7
src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValueVoidfraction/uniformFixedValueVoidfractionFvPatchField.C
View File

@ -41,7 +41,6 @@ uniformFixedValueVoidfractionFvPatchField<Type>::uniformFixedValueVoidfractionFv
:
fixedValueFvPatchField<Type>(p, iF),
uniformValue_(),
//voidfractionFieldName_(dict.lookupOrDefault<word>("voidfraction", "voidfraction"))
voidfractionFieldName_("voidfraction")
{}
@ -56,7 +55,7 @@ uniformFixedValueVoidfractionFvPatchField<Type>::uniformFixedValueVoidfractionFv
)
:
fixedValueFvPatchField<Type>(p, iF),
uniformValue_(ptf.uniformValue_().clone().ptr()),
uniformValue_(ptf.uniformValue_, false),
voidfractionFieldName_("voidfraction")
{
const scalar t = this->db().time().timeOutputValue();
@ -88,7 +87,7 @@ uniformFixedValueVoidfractionFvPatchField<Type>::uniformFixedValueVoidfractionFv
)
:
fixedValueFvPatchField<Type>(ptf),
uniformValue_(ptf.uniformValue_().clone().ptr()),
uniformValue_(ptf.uniformValue_, false),
voidfractionFieldName_("voidfraction")
{
const scalar t = this->db().time().timeOutputValue();
@ -104,7 +103,7 @@ uniformFixedValueVoidfractionFvPatchField<Type>::uniformFixedValueVoidfractionFv
)
:
fixedValueFvPatchField<Type>(ptf, iF),
uniformValue_(ptf.uniformValue_().clone().ptr()),
uniformValue_(ptf.uniformValue_, false),
voidfractionFieldName_("voidfraction")
{
const scalar t = this->db().time().timeOutputValue();

2
src/lagrangian/cfdemParticle/Make/options
View File

@ -1,7 +1,7 @@
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)
GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)
GIT_VERSION := $(shell git describe --dirty --always --tags)
PFLAGS+= -DGITVERSION=\"$(GIT_VERSION)\"
include $(CFDEM_ADD_LIBS_DIR)/additionalLibs

4
src/lagrangian/cfdemParticle/cfdTools/global.C
View File

@ -47,8 +47,8 @@ defineRunTimeSelectionTable(global, dictionary);
void global::info()
{
Info << "\nYou are currently using:" << endl;
Info << "OF version: " << FOAMversion << endl;
Info << "OF build: " << FOAMbuild << endl;
Info << "OpenFOAM version: " << FOAMversion << endl;
Info << "OpenFOAM build: " << FOAMbuild << endl;
Info << "CFDEM build: " << CFDEMversion << "\n" << endl;
}

11
src/lagrangian/cfdemParticle/cfdTools/versionInfo.H
View File

@ -5,7 +5,8 @@
www.cfdem.com
Christoph Goniva, christoph.goniva@cfdem.com
Copyright 2009-2012 JKU Linz
Copyright 2012- DCS Computing GmbH, Linz
Copyright 2012-2015 DCS Computing GmbH, Linz
Copyright 2015- JKU Linz
-------------------------------------------------------------------------------
License
This file is part of CFDEMcoupling.
@ -33,12 +34,12 @@ Description
#ifndef versionInfo_H
#define versionInfo_H
word CFDEMversion="cfdem-2.9.0PFM";
word compatibleLIGGGHTSversion="3.0.6PFM";
word OFversion="2.3.x-commit-4d6f4a3115ff76ec4154c580eb041bc95ba4ec09";
word CFDEMversion="PFM 17.02";
word compatibleLIGGGHTSversion="PFM 17.02";
word OFversion="4.x";
Info << "\nCFDEMcoupling version: " << CFDEMversion << endl;
Info << ", compatible to LIGGGHTS version: " << compatibleLIGGGHTSversion << endl;
Info << ", compatible to OF version and build: " << OFversion << endl;
Info << ", compatible to OpenFOAM version: " << OFversion << endl;
#endif

22
src/lagrangian/cfdemParticle/etc/OFversion/OFversion.H
View File

@ -1,24 +1,2 @@
#define version4x
//#define version23 // currently being used
//#define version22
//#define version21
//#define version16ext
//#define version15
// choose comp/incomp
//#define compre // if comp is on - you must use Make/options_comp!
//define multi sphere
//#define multisphere
// features of 2.1 work also in 2.3
#if defined(version23)
#define version21
#define version221
#endif
// features of 2.1 work also in 2.2
#if defined(version22)
#define version21
#define version221
#endif

10
src/lagrangian/cfdemParticle/etc/cfdemSystemTest.sh
View File

@ -12,7 +12,7 @@ source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh
checkGPP="true"
#- sys check for add on
checkAddOn="true"
checkAddOn="false"
#- system settings
printHeader
@ -37,7 +37,7 @@ checkDirComment "$CFDEM_LPP_DIR" '$CFDEM_LPP_DIR' "yes"
checkDirComment "$CFDEM_ADD_LIBS_DIR" '$CFDEM_ADD_LIBS_DIR' "yes"
checkDirComment "$CFDEM_PIZZA_DIR" '$CFDEM_PIZZA_DIR' "no"
checkDirComment "$CFDEM_TEST_HARNESS_PATH" '$CFDEM_TEST_HARNESS_PATH' "no"
checkDirComment "$C3PO_SRC_DIR" '$C3PO_SRC_DIR' "no"
#checkDirComment "$C3PO_SRC_DIR" '$C3PO_SRC_DIR' "no"
echo ""
echo "library names"
@ -68,11 +68,11 @@ if [ $checkGPP == "true" ]
mpirun --version
fi
echo "**********************"
echo "additional packages..."
if [ $checkAddOn == "true" ]
then
echo "**********************"
echo "additional packages..."
packageName=c3po
filePath=$CFDEM_SRC_DIR/$packageName
if [ $(checkDir $filePath) == "true" ]; then

2
tutorials/cfdemPostproc/fillCylinder/Allrun.sh
View File

@ -97,4 +97,4 @@ rm -r $casePath/DEM/log.*
echo "done"
#- preserve post directory
echo "dummyfile" >> $casePath/DEM/post/dummy
touch $casePath/DEM/post/.gitignore

0
tutorials/cfdemPostproc/fillCylinder/DEM/post/.gitignore vendored Normal file
View File

6
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/CFD/octave/postproc.m
View File

@ -23,11 +23,11 @@ set(gca,'FontSize',14)
axis([0 .25 0 6])
xlabel('time (s)')
ylabel('position (cm)')
title('Comparison of the y-position of two particles','FontSize',15)
title('Comparison of the z-position of two particles','FontSize',15)
legend('following particle','leading particle','following particle Glow.','leading particle Glow.')
set(gca,'FontSize',12)
#print('pos_y_two_part_rec_glow.png')
print('pos_y_two_part_rec_glow.eps','-deps2')
print('pos_z_two_part_rec_glow.eps','-deps2')
clear;
@ -53,4 +53,4 @@ title('Comparison of the settling velocity of two particles','FontSize',15)
legend('following particle','leading particle','following particle Glow.','leading particle Glow.')
set(gca,'FontSize',12)
%print('vel_y_two_part_rec_glow.png')
print('vel_y_two_part_rec_glow.eps','-deps2')
print('vel_z_two_part_rec_glow.eps','-deps2')

2
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/CFD/system/controlDict
View File

@ -76,6 +76,6 @@ functions
outputControl timeStep;//outputTime;
outputInterval 1;
}
};
}
// ************************************************************************* //

4
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/CFD/system/controlDict.foam
View File

@ -56,7 +56,7 @@ maxDeltaT 1;
functions
(
{
probes
{
type probes;
@ -76,6 +76,6 @@ functions
outputControl timeStep;//outputTime;
outputInterval 1;
}
);
}
// ************************************************************************* //

8
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/DEM/in.liggghts_run
View File

@ -68,10 +68,10 @@ variable y2 equal y[2]
variable z2 equal z[2]
variable time equal step*dt
fix extra1 all print 100 "${time} ${vx1} ${vy1} ${vz1}" file ../DEM/post/velocity_particle_1.txt title "%" screen no
fix extra2 all print 100 "${time} ${vx2} ${vy2} ${vz2}" file ../DEM/post/velocity_particle_2.txt title "%" screen no
fix extra3 all print 100 "${time} ${x1} ${y1} ${z1}" file ../DEM/post/position_particle_1.txt title "%" screen no
fix extra4 all print 100 "${time} ${x2} ${y2} ${z2}" file ../DEM/post/position_particle_2.txt title "%" screen no
fix extra1 all print 100 "${time} ${vx1} ${vy1} ${vz1}" file ../DEM/post/velocity_particle_1.txt title "#" screen no
fix extra2 all print 100 "${time} ${vx2} ${vy2} ${vz2}" file ../DEM/post/velocity_particle_2.txt title "#" screen no
fix extra3 all print 100 "${time} ${x1} ${y1} ${z1}" file ../DEM/post/position_particle_1.txt title "#" screen no
fix extra4 all print 100 "${time} ${x2} ${y2} ${z2}" file ../DEM/post/position_particle_2.txt title "#" screen no
# apply nve integration to all particles that are inserted as single particles

4
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh
View File

@ -35,8 +35,8 @@ if [ $runOctave == "true" ]
cd $casePath/CFD/octave
octave postproc.m
evince pos_y_two_part_rec_glow.eps
evince vel_y_two_part_rec_glow.eps
evince pos_z_two_part_rec_glow.eps
evince vel_z_two_part_rec_glow.eps
#display pos_y_two_part_rec_glow.png &
#display vel_y_two_part_rec_glow.png &
fi

14
tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/run.config
View File

@ -5,7 +5,19 @@
"name" : "cfdemrun",
"solver" : "cfdemSolverIB",
"type" : "CFDEMcoupling/mpi",
"nprocs" : 4
"nprocs" : 4,
"data" : {
"series" : [
{"name" : "velocity1", "file" : "velocity_particle_1.txt", "columns" : ["t", "vx", "vy", "vz"]},
{"name" : "velocity2", "file" : "velocity_particle_2.txt", "columns" : ["t", "vx", "vy", "vz"]},
{"name" : "position1", "file" : "position_particle_1.txt", "columns" : ["t", "x", "y", "z"]},
{"name" : "position2", "file" : "position_particle_2.txt", "columns" : ["t", "x", "y", "z"]}
],
"plots" : [
{"name" : "z-position", "title" : "Particle z-Position", "xdata" : "position1.t", "ydata" : ["position1.z", "position2.z"], "xlabel" : "time [s]", "ylabel" : "position [cm]"},
{"name" : "z-velocity", "title" : "Particle z-Velocity", "xdata" : "velocity1.t", "ydata" : ["velocity1.vz", "velocity2.vz"], "xlabel" : "time [s]", "ylabel" : "velocity [cm/s]"}
]
}
}
]
}

4
tutorials/cfdemSolverPiso/ErgunTestCG/CFD/0/U
View File

@ -30,8 +30,8 @@ boundaryField
inlet
{
type uniformFixedValue;
uniformValue table
type uniformFixedValueVoidfraction;
uniformValue table
(
(0.000 (0 0 0.002))
(0.100 (0 0 0.030))

2
tutorials/cfdemSolverPiso/ErgunTestCG/CFD/system/controlDict
View File

@ -93,5 +93,5 @@ functions
outputControl timeStep;//outputTime;
outputInterval 1;
}
};
}
// ************************************************************************* //

4
tutorials/cfdemSolverPiso/ErgunTestCG/CFD/system/controlDict.foam
View File

@ -52,7 +52,7 @@ maxCo 0.1;
libs ("libOpenFOAM.so" "libgroovyBC.so");
functions
(
{
probes
{
@ -113,5 +113,5 @@ functions
);
factor 1;
}*/
);
}
// ************************************************************************* //

3
tutorials/cfdemSolverPiso/ErgunTestCG/DEM/in.liggghts_run
View File

@ -2,7 +2,8 @@
# tutorial case showing coarse graining functionality #
# Christoph Goniva 08.02.2013 #
#######################################################
echo both
log ../DEM/log.liggghts
thermo_log ../DEM/post/thermo.txt
#######################################################
# variables #

2
tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict
View File

@ -93,5 +93,5 @@ functions
outputInterval 1;
}
};
}
// ************************************************************************* //

4
tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict.foam
View File

@ -52,7 +52,7 @@ maxCo 0.1;
libs ("libOpenFOAM.so" "libgroovyBC.so");
functions
(
{
probes
{
@ -113,5 +113,5 @@ functions
);
factor 1;
}*/
);
}
// ************************************************************************* //

2
tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/system/controlDict
View File

@ -189,5 +189,5 @@ functions
outputControl timeStep;//outputTime;
outputInterval 1;
}
};
}
// ************************************************************************* //

4
tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/system/controlDict.foam
View File

@ -52,7 +52,7 @@ maxCo 0.1;
libs ("libOpenFOAM.so" "libgroovyBC.so");
functions
(
{
probes
{
@ -113,5 +113,5 @@ functions
);
factor 1;
}*/
);
}
// ************************************************************************* //

2
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/system/controlDict
View File

@ -112,5 +112,5 @@ functions
);
factor 1;
}*/
};
}
// ************************************************************************* //

4
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/system/controlDict.foam
View File

@ -52,7 +52,7 @@ maxCo 0.1;
libs ("libOpenFOAM.so" "libgroovyBC.so");
functions
(
{
probes
{
@ -113,5 +113,5 @@ functions
);
factor 1;
}*/
);
}
// ************************************************************************* //

2
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/system/controlDict_restart
View File

@ -112,5 +112,5 @@ functions
);
factor 1;
}*/
};
}
// ************************************************************************* //

2
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/system/controlDict_run
View File

@ -112,5 +112,5 @@ functions
);
factor 1;
}*/
};
}
// ************************************************************************* //

2
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/run.config
View File

@ -9,6 +9,7 @@
{
"name" : "cfdemrun",
"depends_on" : "liggghts-init",
"input_script" : "DEM/in.liggghts_run",
"solver" : "cfdemSolverPiso",
"type" : "CFDEMcoupling/mpi",
"nprocs" : 4,
@ -17,6 +18,7 @@
{
"name" : "cfdemrun-restart",
"depends_on" : "cfdemrun",
"input_script" : "DEM/in.liggghts_restart",
"solver" : "cfdemSolverPiso",
"type" : "CFDEMcoupling/mpi",
"nprocs" : 4,

2
tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/system/controlDict
View File

@ -92,5 +92,5 @@ functions
outputControl timeStep;//outputTime;
outputInterval 1;
}
};
}
// ************************************************************************* //

4
tutorials/cfdemSolverPisoMS/ErgunTestMPI/CFD/system/controlDict.foam
View File

@ -52,7 +52,7 @@ maxCo 0.1;
libs ("libOpenFOAM.so" "libgroovyBC.so");
functions
(
{
probes
{
@ -113,5 +113,5 @@ functions
);
factor 1;
}*/
);
}
// ************************************************************************* //

2
tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/controlDict
View File

@ -75,5 +75,5 @@ functions
outputControl timeStep;//outputTime;
outputInterval 1;
}
};
}
// ************************************************************************* //

2
tutorials/cfdemSolverRhoPimple/ErgunTestMPI/CFD/system/controlDict
View File

@ -93,5 +93,5 @@ functions
outputInterval 1;
}
};
}
// ************************************************************************* //

2
tutorials/cfdemSolverRhoPimple/ErgunTestMPI/run.config
View File

@ -9,7 +9,7 @@
{
"name" : "cfdemrun",
"depends_on" : "liggghts-init",
"solver" : "cfdemSolverPiso",
"solver" : "cfdemSolverRhoPimple",
"type" : "CFDEMcoupling/mpi",
"nprocs" : 4,
"pre_scripts" : ["prerun.sh"],