ICODE-ADC/CFDEMcoupling-PUBLIC
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ICODE-ADC:3.5.0
Branches Tags
ICODE-ADC:master
ICODE-ADC:3.8.0 ICODE-ADC:3.7.0 ICODE-ADC:3.6.1 ICODE-ADC:3.6.0 ICODE-ADC:3.5.1 ICODE-ADC:3.5.0 ICODE-ADC:3.4.0
...
compare: ICODE-ADC:3.5.1
Branches Tags
ICODE-ADC:master
ICODE-ADC:3.8.0 ICODE-ADC:3.7.0 ICODE-ADC:3.6.1 ICODE-ADC:3.6.0 ICODE-ADC:3.5.1 ICODE-ADC:3.5.0 ICODE-ADC:3.4.0

5 Commits
3.5.0 ... 3.5.1

Author SHA1 Message Date
Christoph Goniva
66eb71e53d update make files, solver-list etc. 2016-09-06 15:31:47 +02:00
Christoph Goniva
dd85e9a32c release on 2016-09-06_15-30-51 2016-09-06 15:30:51 +02:00
Christoph Goniva
6c17991656 update make files, solver-list etc. 2016-09-06 11:39:00 +02:00
Christoph Goniva
e34a598fcc release on 2016-09-06_11-38-57 2016-09-06 11:38:57 +02:00
cgoniva
45a7c96dbb Update eulerian/scalarTransportModelsCFDEM/Make/files 2016-09-05 13:23:50 +02:00
9 changed files with 19 additions and 20 deletions
Expand all files Collapse all files

BIN
doc/_build/doctrees/environment.pickle vendored
View File

Binary file not shown.

1
src/eulerian/scalarTransportModelsCFDEM/Make/files
View File

@ -3,7 +3,6 @@ scalarTransportModel/newScalarTransportModel.C
/*Sub-Level*/
temperatureModel/temperatureModel.C
solidTemperatureModel/solidTemperatureModel.C
generalManual/generalManual.C
noTransport/noTransport.C
generalPhaseChange/generalPhaseChange.C

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

@ -33,7 +33,7 @@ Description
#ifndef versionInfo_H
#define versionInfo_H
word CFDEMversion="cfdem-3.5.0";
word CFDEMversion="cfdem-3.5.1";
word compatibleLIGGGHTSversion="3.5.0";
word OFversion="3.0.x-commit-ac3f6c67e02f0aac3777c27f9fb7558fc3536e37";

6
tutorials/cfdemSolverPiso/ErgunTestMPI/DEM/in.liggghts_init
View File

@ -40,10 +40,10 @@ fix cylwalls all wall/gran model hertz tangential history primitive type 1 z
# particle distributions and insertion
region bc cylinder z 0.0 0.0 0.012 0. 0.055 units box
fix pts1 all particletemplate/sphere 1 atom_type 1 density constant 2000 radius constant 0.0005
fix pdd1 all particledistribution/discrete 1 1 pts1 1.0
fix pts1 all particletemplate/sphere 15485863 atom_type 1 density constant 2000 radius constant 0.0005
fix pdd1 all particledistribution/discrete 15485867 1 pts1 1.0
fix ins all insert/pack seed 100001 distributiontemplate pdd1 vel constant 0. 0. -1. insert_every once overlapcheck yes all_in yes particles_in_region 10000 region bc
fix ins all insert/pack seed 32452843 distributiontemplate pdd1 vel constant 0. 0. -1. insert_every once overlapcheck yes all_in yes particles_in_region 10000 region bc
# apply nve integration to all particles that are inserted as single particles
fix integr all nve/sphere

6
tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/DEM/in.liggghts_init
View File

@ -38,10 +38,10 @@ fix cylwalls all wall/gran model hertz tangential history primitive type 1 z
# particle distributions and insertion
region bc cylinder z 0.0 0.0 1.2 0. 5.5 units box
fix pts1 all particletemplate/sphere 1 atom_type 1 density constant 2. radius constant 0.05
fix pdd1 all particledistribution/discrete 1 1 pts1 1.0
fix pts1 all particletemplate/sphere 15485863 atom_type 1 density constant 2. radius constant 0.05
fix pdd1 all particledistribution/discrete 15485867 1 pts1 1.0
fix ins all insert/pack seed 100001 distributiontemplate pdd1 vel constant 0. 0. -100. insert_every once overlapcheck yes all_in yes particles_in_region 10000 region bc
fix ins all insert/pack seed 32452843 distributiontemplate pdd1 vel constant 0. 0. -100. insert_every once overlapcheck yes all_in yes particles_in_region 10000 region bc
# apply nve integration to all particles that are inserted as single particles
fix integr all nve/sphere

6
tutorials/cfdemSolverPiso/ErgunTestMPI_restart/DEM/in.liggghts_init
View File

@ -38,10 +38,10 @@ fix cylwalls all wall/gran model hertz tangential history primitive type
# particle distributions and insertion
region bc cylinder z 0.0 0.0 0.012 0. 0.055 units box
fix pts1 all particletemplate/sphere 1 atom_type 1 density constant 2000 radius constant 0.0005
fix pdd1 all particledistribution/discrete 1 1 pts1 1.0
fix pts1 all particletemplate/sphere 15485863 atom_type 1 density constant 2000 radius constant 0.0005
fix pdd1 all particledistribution/discrete 15485867 1 pts1 1.0
fix ins all insert/pack seed 100001 distributiontemplate pdd1 vel constant 0. 0. -1. insert_every once overlapcheck yes all_in yes particles_in_region 10000 region bc
fix ins all insert/pack seed 32452843 distributiontemplate pdd1 vel constant 0. 0. -1. insert_every once overlapcheck yes all_in yes particles_in_region 10000 region bc
# apply nve integration to all particles that are inserted as single particles
fix integr all nve/sphere

6
tutorials/cfdemSolverPiso/voidfractionTest/DEM/in.liggghts_run
View File

@ -43,10 +43,10 @@ fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zp
# create single partciles
region bc block 0 0.1 0 0.1 0.53 1.0 units box
fix pts1 all particletemplate/sphere 1 atom_type 1 density constant 3000 radius constant 0.0015
fix pdd1 all particledistribution/discrete 1. 1 pts1 1.0
fix pts1 all particletemplate/sphere 15485863 atom_type 1 density constant 3000 radius constant 0.0015
fix pdd1 all particledistribution/discrete 15485867 1 pts1 1.0
fix ins all insert/pack seed 100001 distributiontemplate pdd1 vel constant 0. 0. -0.3 insert_every once overlapcheck yes all_in yes particles_in_region 1000 region bc
fix ins all insert/pack seed 32452843 distributiontemplate pdd1 vel constant 0. 0. -0.3 insert_every once overlapcheck yes all_in yes particles_in_region 1000 region bc
#create_atoms 1 single 0.00733 0.0517 0.6 units box
#set group all diameter 0.003 density 3000

6
tutorials/cfdemSolverPisoSTM/packedBedTemp/DEM/in.liggghts_init
View File

@ -48,10 +48,10 @@ fix heattransfer all heat/gran initial_temperature 263.
# particle distributions and insertion
region bc block 0. 0.1 0. 0.1 0. 1.1 units box
fix pts1 all particletemplate/sphere 1 atom_type 1 density constant 2500 radius constant 0.011
fix pdd1 all particledistribution/discrete 1 1 pts1 1.0
fix pts1 all particletemplate/sphere 15485863 atom_type 1 density constant 2500 radius constant 0.011
fix pdd1 all particledistribution/discrete 15485867 1 pts1 1.0
fix ins all insert/pack seed 100001 distributiontemplate pdd1 vel constant 0. 0. -3. insert_every 10000 overlapcheck yes all_in yes particles_in_region 1005 region bc
fix ins all insert/pack seed 32452843 distributiontemplate pdd1 vel constant 0. 0. -3. insert_every 10000 overlapcheck yes all_in yes particles_in_region 1005 region bc
# apply nve integration to all particles that are inserted as single particles
fix integr all nve/sphere

6
tutorials/cfdemSolverPisoScalar/packedBedTemp/DEM/in.liggghts_init
View File

@ -50,10 +50,10 @@ fix heattransfer all heat/gran initial_temperature 263.
# particle distributions and insertion
region bc block 0. 0.1 0. 0.1 0. 1.1 units box
fix pts1 all particletemplate/sphere 1 atom_type 1 density constant 2500 radius constant 0.011
fix pdd1 all particledistribution/discrete 1 1 pts1 1.0
fix pts1 all particletemplate/sphere 15485863 atom_type 1 density constant 2500 radius constant 0.011
fix pdd1 all particledistribution/discrete 15485867 1 pts1 1.0
fix ins all insert/pack seed 100001 distributiontemplate pdd1 vel constant 0. 0. -3. insert_every 10000 overlapcheck yes all_in yes particles_in_region 1005 region bc
fix ins all insert/pack seed 32452843 distributiontemplate pdd1 vel constant 0. 0. -3. insert_every 10000 overlapcheck yes all_in yes particles_in_region 1005 region bc
# apply nve integration to all particles that are inserted as single particles
fix integr all nve/sphere