From e447ca82db3f0f99b527c8aedc9eabd36ff826fc Mon Sep 17 00:00:00 2001 From: Thomas Lichtenegger Date: Mon, 29 Jan 2018 15:08:16 +0100 Subject: [PATCH 1/3] Allow to specify DEM dump interval to be read in from couplingProperties. --- applications/utilities/cfdemPostproc/cfdemPostproc.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/utilities/cfdemPostproc/cfdemPostproc.C b/applications/utilities/cfdemPostproc/cfdemPostproc.C index 90faf24e..58c3d86c 100644 --- a/applications/utilities/cfdemPostproc/cfdemPostproc.C +++ b/applications/utilities/cfdemPostproc/cfdemPostproc.C @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) Info<< "\nStarting time loop\n" << endl; int count=0; - int DEM_dump_Interval=1000; + int DEM_dump_Interval(particleCloud.couplingProperties().lookupOrDefault("dumpInterval",1000)); particleCloud.reAllocArrays(); double **positions_; From 424f21e734259ba8b6b6d05395bce85b4e138aee Mon Sep 17 00:00:00 2001 From: Thomas Lichtenegger Date: Tue, 30 Jan 2018 08:07:24 +0100 Subject: [PATCH 2/3] Data exchange model oneWayVTK can now take files from dump custom/vtk and from LPP. --- .../subModels/dataExchangeModel/oneWayVTK/oneWayVTK.C | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/oneWayVTK/oneWayVTK.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/oneWayVTK/oneWayVTK.C index 4a2774df..af104f38 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/oneWayVTK/oneWayVTK.C +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/oneWayVTK/oneWayVTK.C @@ -171,6 +171,12 @@ void oneWayVTK::getData string just_read; while (just_read.compare(name) != 0) input >> just_read; // read until we read "name" input >> just_read; // skip text for dataType + // need to distinguish between file formats from dump custom/vtk and from LPP + if(just_read.compare("3") == 0) + { + input >> just_read; + input >> just_read; + } for (int index = 0; index> field[index][0] >> field[index][1] >> field[index][2]; From 523156679383a19c122ff7c68f2373c6461d1153 Mon Sep 17 00:00:00 2001 From: Thomas Lichtenegger Date: Tue, 30 Jan 2018 08:20:45 +0100 Subject: [PATCH 3/3] Minor cleaning up of cfdemPostproc. --- applications/utilities/cfdemPostproc/cfdemPostproc.C | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applications/utilities/cfdemPostproc/cfdemPostproc.C b/applications/utilities/cfdemPostproc/cfdemPostproc.C index 58c3d86c..a832bacc 100644 --- a/applications/utilities/cfdemPostproc/cfdemPostproc.C +++ b/applications/utilities/cfdemPostproc/cfdemPostproc.C @@ -109,6 +109,7 @@ int main(int argc, char *argv[]) particleCloud.voidFractionM().setvoidFraction(NULL,voidfractions_,particleWeights_,particleVolumes_,particleV_); + // make sure coupling interval = 1, otherwise update of voidfractionPrev and UsPrev necessary voidfraction.ref() = particleCloud.voidFractionM().voidFractionInterp(); voidfraction.correctBoundaryConditions(); @@ -121,6 +122,9 @@ int main(int argc, char *argv[]) NULL ); + Us = particleCloud.averagingM().UsInterp(); + Us.correctBoundaryConditions(); + runTime.write(); particleCloud.IOM().dumpDEMdata();