From 2230f514214a3ad5c8b78b7493d9ebbc4e12b15e Mon Sep 17 00:00:00 2001 From: Gerhard Holzinger Date: Mon, 24 Sep 2018 10:20:30 +0200 Subject: [PATCH] changed back the handling of verbose flag --- .../cfdemParticle/cfdemCloud/cfdemCloud.C | 11 +++++------ .../forceModel/KochHillRWDrag/KochHillRWDrag.C | 6 +++--- .../SchillerNaumannDrag/SchillerNaumannDrag.C | 2 +- .../forceModel/ShirgaonkarIB/ShirgaonkarIB.C | 4 ++-- .../subModels/forceModel/noDrag/noDrag.C | 6 +++--- .../particleCellVolume/particleCellVolume.C | 2 +- .../forceModel/virtualMassForce/virtualMassForce.C | 2 +- .../volWeightedAverage/volWeightedAverage.C | 2 +- .../liggghtsCommandModel/runLiggghts/runLiggghts.C | 14 +++++--------- .../writeLiggghts/writeLiggghts.C | 5 +---- .../probeModel/particleProbe/particleProbe.C | 10 +++++----- .../constDiffSmoothing/constDiffSmoothing.C | 2 +- .../dividedVoidFraction/dividedVoidFraction.C | 4 ++-- 13 files changed, 31 insertions(+), 39 deletions(-) diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C index 2c2af39c..25f63e48 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C @@ -78,11 +78,11 @@ cfdemCloud::cfdemCloud IOobject::NO_WRITE ) ), - solveFlow_(couplingProperties_.lookupOrDefault("solveFlow", true)), - verbose_(couplingProperties_.lookupOrDefault("verbose", false)), - ignore_(couplingProperties_.lookupOrDefault("ignore", false)), + solveFlow_(couplingProperties_.found("solveFlow")), + verbose_(couplingProperties_.found("verbose")), + ignore_(couplingProperties_.found("ignore")), allowCFDsubTimestep_(true), - limitDEMForces_(couplingProperties_.lookupOrDefault("limitDEMForces",false)), + limitDEMForces_(couplingProperties_.found("limitDEMForces")), maxDEMForce_(0.), modelType_(couplingProperties_.lookup("modelType")), positions_(NULL), @@ -224,8 +224,7 @@ cfdemCloud::cfdemCloud buildInfo.info(); Info << "If BC are important, please provide volScalarFields -imp/expParticleForces-" << endl; - /*if (couplingProperties_.found("solveFlow")) - solveFlow_=Switch(couplingProperties_.lookup("solveFlow"));*/ + if (couplingProperties_.found("imExSplitFactor")) imExSplitFactor_ = readScalar(couplingProperties_.lookup("imExSplitFactor")); diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C index 65c64856..015d3dba 100755 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C @@ -64,16 +64,16 @@ KochHillRWDrag::KochHillRWDrag : forceModel(dict,sm), propsDict_(dict.subDict(typeName + "Props")), - verbose_(propsDict_.lookupOrDefault("verbose", false)), + verbose_(propsDict_.found("verbose")), velFieldName_(propsDict_.lookup("velFieldName")), U_(sm.mesh().lookupObject (velFieldName_)), voidfractionFieldName_(propsDict_.lookup("voidfractionFieldName")), voidfraction_(sm.mesh().lookupObject (voidfractionFieldName_)), UsFieldName_(propsDict_.lookupOrDefault("granVelFieldName",word("Us"))), UsField_(sm.mesh().lookupObject (UsFieldName_)), - interpolation_(propsDict_.lookupOrDefault("interpolation", false)), + interpolation_(propsDict_.found("interpolation")), scale_(1.), - randomTauE_(propsDict_.lookupOrDefault("randomTauE", false)), + randomTauE_(propsDict_.found("randomTauE")), partTime_(NULL), partUfluct_(NULL), RanGen_(label(0)) diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C index 4d5f5f6e..afe0e546 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/SchillerNaumannDrag/SchillerNaumannDrag.C @@ -64,7 +64,7 @@ SchillerNaumannDrag::SchillerNaumannDrag : forceModel(dict,sm), propsDict_(dict.subDict(typeName + "Props")), - verbose_(propsDict_.lookupOrDefault("verbose", false)), + verbose_(propsDict_.found("verbose")), velFieldName_(propsDict_.lookup("velFieldName")), U_(sm.mesh().lookupObject (velFieldName_)) { diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/ShirgaonkarIB/ShirgaonkarIB.C b/src/lagrangian/cfdemParticle/subModels/forceModel/ShirgaonkarIB/ShirgaonkarIB.C index c8243c3c..5d2a77af 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/ShirgaonkarIB/ShirgaonkarIB.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/ShirgaonkarIB/ShirgaonkarIB.C @@ -63,8 +63,8 @@ ShirgaonkarIB::ShirgaonkarIB : forceModel(dict,sm), propsDict_(dict.subDict(typeName + "Props")), - verbose_(propsDict_.lookupOrDefault("verbose", false)), - twoDimensional_(propsDict_.lookupOrDefault("twoDimensional", false)), + verbose_(propsDict_.found("verbose")), + twoDimensional_(propsDict_.found("twoDimensional")), depth_(1), velFieldName_(propsDict_.lookup("velFieldName")), U_(sm.mesh().lookupObject (velFieldName_)), diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/noDrag/noDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/noDrag/noDrag.C index 2b52e567..9ba8ad27 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/noDrag/noDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/noDrag/noDrag.C @@ -62,9 +62,9 @@ noDrag::noDrag : forceModel(dict,sm), propsDict_(dict), - verbose_(propsDict_.lookupOrDefault("verbose", false)), - noDEMForce_(propsDict_.lookupOrDefault("noDEMForce", false)), - keepCFDForce_(propsDict_.lookupOrDefault("keepCFDForce", false)) + verbose_(propsDict_.found("verbose")), + noDEMForce_(propsDict_.found("noDEMForce")), + keepCFDForce_(propsDict_.found("keepCFDForce")) { if(dict.found(word(typeName + "Props"))) propsDict_=dictionary(dict.subDict(typeName + "Props")); diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C b/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C index f28a58f9..07e3d0f0 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C @@ -94,7 +94,7 @@ particleCellVolume::particleCellVolume ), upperThreshold_(readScalar(propsDict_.lookup("upperThreshold"))), lowerThreshold_(readScalar(propsDict_.lookup("lowerThreshold"))), - verbose_(propsDict_.lookupOrDefault("verbose", false)) + verbose_(propsDict_.found("verbose")) { } diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.C b/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.C index d39e0bb8..3af6f2da 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/virtualMassForce/virtualMassForce.C @@ -70,7 +70,7 @@ virtualMassForce::virtualMassForce phiFieldName_(propsDict_.lookup("phiFieldName")), phi_(sm.mesh().lookupObject (phiFieldName_)), UrelOld_(NULL), - splitUrelCalculation_(propsDict_.lookupOrDefault("splitUrelCalculation", false)), + splitUrelCalculation_(propsDict_.found("splitUrelCalculation")), Cadd_(0.5) { diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/volWeightedAverage/volWeightedAverage.C b/src/lagrangian/cfdemParticle/subModels/forceModel/volWeightedAverage/volWeightedAverage.C index 08df6ca8..c5cffe6f 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/volWeightedAverage/volWeightedAverage.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/volWeightedAverage/volWeightedAverage.C @@ -69,7 +69,7 @@ volWeightedAverage::volWeightedAverage vectorFieldNames_(propsDict_.lookup("vectorFieldNames")), upperThreshold_(readScalar(propsDict_.lookup("upperThreshold"))), lowerThreshold_(readScalar(propsDict_.lookup("lowerThreshold"))), - verbose_(propsDict_.lookupOrDefault("verbose", false)) + verbose_(propsDict_.found("verbose")) { // create vol weighted average scalar fields scalarFields_.setSize(scalarFieldNames_.size()); diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/runLiggghts/runLiggghts.C b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/runLiggghts/runLiggghts.C index c9c86b73..8b7f41b0 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/runLiggghts/runLiggghts.C +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/runLiggghts/runLiggghts.C @@ -66,10 +66,7 @@ runLiggghts::runLiggghts command_("run"), preNo_(propsDict_.lookupOrDefault("preNo", true)) { - if (propsDict_.found("verbose")) - { - verbose_ = propsDict_.lookup("verbose"); - } + verbose_ = propsDict_.found("verbose"); runEveryCouplingStep_ = true; @@ -94,11 +91,10 @@ const char* runLiggghts::command(int commandLine) string runLiggghts::createCommand( word command, int interval, word appendix, word appendix2, word appendix3, word appendix4) { - fileName add; - char h[50]; - sprintf(h, "%d", interval); - add = h; - command += " " + add + " " + appendix + " " + appendix2 + " " + appendix3 + " " + appendix4; + OStringStream oStrStream; + oStrStream << interval; + + command += " " + oStrStream.str() + " " + appendix + " " + appendix2 + " " + appendix3 + " " + appendix4; return string(command); } diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.C b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.C index 7d80e998..1e0bd5a0 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.C +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.C @@ -70,10 +70,7 @@ writeLiggghts::writeLiggghts overwrite_(false) { // check if verbose - if (propsDict_.found("verbose")) - { - verbose_ = propsDict_.lookup("verbose"); - } + verbose_ = propsDict_.found("verbose"); if (propsDict_.found("path")) { diff --git a/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C b/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C index 60b0ea54..5a0441d9 100644 --- a/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C +++ b/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C @@ -68,16 +68,16 @@ particleProbe::particleProbe propsDict_(dict.subDict(typeName + "Props")), name_(typeName), particleCloud_(sm), - verbose_(propsDict_.lookupOrDefault("verbose", false)), - verboseToFile_(propsDict_.lookupOrDefault("verboseToFile", false)), + verbose_(propsDict_.found("verbose")), + verboseToFile_(propsDict_.found("verboseToFile")), writePrecision_(propsDict_.lookupOrDefault("writePrecision", 3)), dirName_("particleProbes"), rank_(-1), sPtr(NULL), printEvery_(propsDict_.lookupOrDefault("printEvery", 1)), - sampleAll_(propsDict_.lookupOrDefault("sampleAll", false)), - probeDebug_(propsDict_.lookupOrDefault("probeDebug", false)), - includePosition_(propsDict_.lookupOrDefault("includePosition", false)), + sampleAll_(propsDict_.found("sampleAll")), + probeDebug_(propsDict_.found("probeDebug")), + includePosition_(propsDict_.found("includePosition")), particleIDsToSample_(propsDict_.lookup("particleIDsToSample")), itemCounter_(0), currItemId_(0), diff --git a/src/lagrangian/cfdemParticle/subModels/smoothingModel/constDiffSmoothing/constDiffSmoothing.C b/src/lagrangian/cfdemParticle/subModels/smoothingModel/constDiffSmoothing/constDiffSmoothing.C index f100e1c4..3f1f907e 100644 --- a/src/lagrangian/cfdemParticle/subModels/smoothingModel/constDiffSmoothing/constDiffSmoothing.C +++ b/src/lagrangian/cfdemParticle/subModels/smoothingModel/constDiffSmoothing/constDiffSmoothing.C @@ -68,7 +68,7 @@ constDiffSmoothing::constDiffSmoothing smoothingLength_(dimensionedScalar("smoothingLength", dimLength, readScalar(propsDict_.lookup("smoothingLength")))), smoothingLengthReferenceField_(dimensionedScalar("smoothingLengthReferenceField", dimLength, readScalar(propsDict_.lookup("smoothingLength")))), DT_("DT", dimensionSet(0,2,-1,0,0), 0.), - verbose_(propsDict_.lookupOrDefault("verbose", false)) + verbose_(propsDict_.found("verbose")) { if(propsDict_.found("smoothingLengthReferenceField")) { diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C index 0d9b6f6e..81a2e17c 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C @@ -64,12 +64,12 @@ dividedVoidFraction::dividedVoidFraction : voidFractionModel(dict,sm), propsDict_(dict.subDict(typeName + "Props")), - verbose_(propsDict_.lookupOrDefault("verbose", false)), + verbose_(propsDict_.found("verbose")), procBoundaryCorrection_(propsDict_.lookupOrDefault("procBoundaryCorrection", false)), alphaMin_(readScalar(propsDict_.lookup("alphaMin"))), alphaLimited_(0), tooMuch_(0.0), - interpolation_(propsDict_.lookupOrDefault("interpolation", false)), + interpolation_(propsDict_.found("interpolation")), cfdemUseOnly_(propsDict_.lookupOrDefault("cfdemUseOnly", false)) { maxCellsPerParticle_ = numberOfMarkerPoints;