Commit Graph

1052 Commits

Author SHA1 Message Date
bb4083f570 optional checkTimeStep & reading virtualTimeIndex in the solver 2020-08-13 15:48:12 +02:00
7dcb63f790 reading several recProperties 2020-08-13 15:44:29 +02:00
1fb208082b Obsolete code. Found better solution in steadyDEM. 2019-11-07 12:24:08 +01:00
29cc09a876 Removed double line break. 2019-11-07 12:23:19 +01:00
db465c334a Removed debugging info / moved it into verbose mode. 2019-11-07 12:22:49 +01:00
70a6c634d6 Removed obsolete code. 2019-11-07 07:41:44 +01:00
7399f4b929 Particle deformation model. Option to initialize particle temperatures from field values. 2019-10-31 13:50:28 +01:00
993593aa83 Merge branch 'develop' into feature/recurrenceLib
# Conflicts:
#	src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
#	src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
#	src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
2019-10-24 13:18:53 +02:00
31ba2f01fd add -Wno-unused-parameter compilation flag for twoWayMany2Many lib [ci skip]
silence warnings from (older) MPI lib
2019-10-24 10:55:34 +02:00
896f497323 add some comments [ci skip] 2019-10-24 10:51:17 +02:00
4cfce8bc6c Merge branch 'develop' into feature/adaptive_resolution_universe
# Conflicts:
#	src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
2019-10-23 20:11:49 +02:00
7854673f21 apply minor change of setCellIDs parameter
change originally made in branch feature/recurrenceLib
2019-10-23 19:47:28 +02:00
cab6b7e88f Merge branch 'develop' into feature/adaptive_resolution_universe
# Conflicts:
#	src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
2019-10-23 18:03:23 +02:00
7de941746f use LIGGGHTS memory namespace instead of memory class
resolve issue #95
2019-10-23 16:36:02 +02:00
fdb2748fbb clean up header file includes
* include only necessary files
* whenever possible, include headers in .C file not in .H file
2019-10-23 12:53:52 +02:00
4a328144ea fix memory issues in twoWayOne2One
fixes made in branch feature/recurrenceLib
2019-10-23 10:20:06 +02:00
96c621416d Merge branch 'develop' into feature/recurrenceLib
# Conflicts:
#	src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
#	src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
2019-10-22 19:44:00 +02:00
88bc5cbee9 Merge tag '19.02' into feature/recurrenceLib
# Conflicts:
#	applications/solvers/rcfdemSolverRhoSteadyPimple/EEqn.H
#	applications/solvers/rcfdemSolverRhoSteadyPimple/rcfdemSolverRhoSteadyPimple.C
#	doc/CFDEMcoupling_Manual.txt
#	src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
#	src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H
#	src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
#	src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.H
#	src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.H
#	src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.C
#	src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.H
#	src/lagrangian/cfdemParticle/subModels/thermCondModel/thermCondModel/thermCondModel.H
2019-10-22 17:24:33 +02:00
713677cd3c improve compatibility with newer OpenFOAM versions
use constructor that explicitly sets the list elements to zero, i.e.
List(const label, const zero);
available in OpenFOAM 4 and newer
2019-10-14 10:26:46 +02:00
69ec630051 Feature for calculation of spatial autocorrelation function. 2019-10-10 16:36:18 +02:00
7ce1c7d7be bump version number to 19.09 2019-09-20 13:22:45 +02:00
24f7273e75 Merge pull request #79 from ParticulateFlow/feature/cfdemSolverRhoPimple
feature/cfdemRhoPimpleChem
2019-09-19 17:02:04 +02:00
4b86d32807 Added error message if databases contain less than three times. 2019-09-19 10:29:38 +02:00
211a29bb0e Removed outdated force model from list. 2019-09-19 10:29:14 +02:00
2e10933575 clean up some formatting [ci skip] 2019-08-14 16:21:40 +02:00
3ce4d419ca remove superfluous semicolon 2019-08-14 16:09:07 +02:00
acfe33cc50 simplify construction of list 2019-08-14 16:08:22 +02:00
ad3ccf0359 eliminate temporary variables and fix interpolation_ branch
Xfluid_ was uninitialized with interpolation on
there is probably not much to be gained from temporary variables here
2019-08-14 16:07:29 +02:00
110fba695a remove unnecessary temporary variable
MixtureBinaryDiffusion_ is not used for anything else
2019-08-14 15:48:47 +02:00
704ac32a23 clean up some foramtting [ci skip] 2019-08-14 15:15:39 +02:00
c89d46f633 fix setting of molar fractions in species.C
Xfluid ended up uninitialized if interpolation was on (causing
molarFractions_ to receive uninitialzed values) or no particles were
found in partition (output to Info was uninitialzed)
2019-08-14 15:03:52 +02:00
89c6f87e0c display info only if verbose is true [ci skip] 2019-08-09 16:20:17 +02:00
b777ae6e9b clean up whitespaces and comments [ci skip] 2019-08-08 12:34:16 +02:00
85b116eeb2 remove unneeded creation of temporary string object [ci skip]
can be assigned as is
2019-08-08 10:41:27 +02:00
7bb266bc41 clamp tsf between 0 and 1
the time step fraction should never be outside these bounds since we
don't allow variable time steps; hence any value outside these bounds
must come from numerical rounding/precision issues;
by doing this we no longer need the check in cfdemCloud
2019-07-26 16:59:56 +02:00
d4bb711e9c replace time().deltaT().value() by time().deltaTValue()
avoid creation of temporary dimensionedScalar that is not needed
2019-07-26 16:31:54 +02:00
62489f3165 try to increase precision of tsf calculation
cf. CFDEMcoupling-PUBLIC
2019-07-26 16:29:22 +02:00
efec037d6b fix up comments [ci skip] 2019-07-26 16:17:38 +02:00
d3d7d07cdb increase precision of time step fraction output [ci skip] 2019-07-26 16:11:09 +02:00
b462327d2d apply some formatting changes [ci skip] 2019-07-26 15:59:04 +02:00
29b7ae5ff9 make typeCG mutable (b/c setForce is const). 2019-05-16 11:09:03 +02:00
b64dfacc33 fix problem introduced with e9a7a0f15a that causes drag to be severely underestimated when a cg factor directly from liggghts is used. 2019-05-16 10:15:23 +02:00
ce2646c400 Merge pull request #89 from ParticulateFlow/feature/recurrenceLib_fix_predefinedPath
minor fix in predefinedPath model
2019-04-25 11:06:11 +02:00
c878281031 minor fix in predefinedPath model
* change the default file name for the pre-defined recurrencePath

  The previous default 'recurrencePath' is used by the recModel class
  to record the recurrence-path of the simulation at run-time.
  Thus, the previous default value conflicts with the hard-coded file name
  of the recModel class.

  By changing the default, we can use this model with its default file name
2019-04-24 15:16:42 +02:00
2d4fc39eef Added missing files. 2019-04-24 13:25:30 +02:00
f87ad1d116 Make default setting for critical voidfraction such that empty regions can be recognized as such. 2019-04-15 14:34:02 +02:00
69b3c903b3 fix misleading argument type
using a reference indicates that the argument gets modified
which is not the case here
2019-04-09 17:26:17 +02:00
a4ba6750b0 remove friends from cfdemCloud
All my data are belong to me.
2019-04-09 16:12:42 +02:00
96508745fb move methods from dataExchangeModel to cfdemCloud
methods operate directly on data owned by cfdemCloud, thus
cfdemCloud should have the control over it
2019-04-09 15:49:36 +02:00
671d59d634 make cfdemCloud::setNumberOfParticles public
and remove dataExchangeModel::setNumberOfParticles as we don't
gain anything but another function call
2019-04-09 15:14:55 +02:00