diff --git a/.gitignore b/.gitignore index 682ba16..9b47481 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ log* .vscode platforms *~ -testCase +testCase* diff --git a/src/eulerian/fvOptionsCFDEM/sources/derived/meanSupVelocityForce/meanSupVelocityForce.C b/src/eulerian/fvOptionsCFDEM/sources/derived/meanSupVelocityForce/meanSupVelocityForce.C index 0746245..482fa50 100644 --- a/src/eulerian/fvOptionsCFDEM/sources/derived/meanSupVelocityForce/meanSupVelocityForce.C +++ b/src/eulerian/fvOptionsCFDEM/sources/derived/meanSupVelocityForce/meanSupVelocityForce.C @@ -103,13 +103,13 @@ void Foam::fv::meanSupVelocityForce::correct(volVectorField& U) { if (twoPhase_) { - word alphaName = coeffs_.lookup("alphaField"); + word alphaName = coeffs_.get("alphaField"); alpha_ = mesh_.lookupObject(alphaName); } if (coupled_) { - word voidfractionName = coeffs_.lookup("voidfractionField"); + word voidfractionName = coeffs_.get("voidfractionField"); voidfraction_ = mesh_.lookupObject(voidfractionName); } diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/couplingProperties index 7040315..29fdfdf 100644 --- a/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/couplingProperties +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/couplingProperties @@ -48,6 +48,8 @@ clockModel off;//standardClock;// smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; // +verbose on; + forceModels ( KochHillDrag diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/controlDict b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/controlDict index 43fdb11..7bde2ce 100644 --- a/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/controlDict +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/controlDict @@ -57,30 +57,27 @@ functions probes { type probes; - // Where to load it from - functionObjectLibs ( "libsampling.so" ); - // Name of the directory for probe data - name probes; + libs ( "libsampling.so" ); // Where to load it from + name probes; // Name of the directory for probe data probeLocations ( (0.00003 0.050001 0.050001) (0.39999 0.050001 0.050001) ); - // Fields to be probed - fields ( p U voidfraction ); + fields ( p U voidfraction ); // Fields to be probed // Write at same frequency as fields - outputControl timeStep;//outputTime; - outputInterval 1; + writeControl timeStep; + writeInterval 1; } volFlow_inlet { type surfaceFieldValue; - functionObjectLibs ("libfieldFunctionObjects.so"); - outputControl timeStep; - outputInterval 1; + libs ("libfieldFunctionObjects.so"); + writeControl timeStep; + writeInterval 1; log false; writeFields false; valueOutput false; @@ -96,9 +93,9 @@ functions volFlow_outlet { type surfaceFieldValue; - functionObjectLibs ("libfieldFunctionObjects.so"); - outputControl timeStep; - outputInterval 1; + libs ("libfieldFunctionObjects.so"); + writeControl timeStep; + writeInterval 1; log false; writeFields false; valueOutput false; @@ -114,9 +111,9 @@ functions volFlow_wall { type surfaceFieldValue; - functionObjectLibs ("libfieldFunctionObjects.so"); - outputControl timeStep; - outputInterval 1; + libs ("libfieldFunctionObjects.so"); + writeControl timeStep; + writeInterval 1; log false; writeFields false; valueOutput false; @@ -129,4 +126,3 @@ functions ); } } -// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/periodicChannel/parCFDDEMrun.sh index 7fdaab7..5f0d76b 100755 --- a/tutorials/cfdemSolverPiso/periodicChannel/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPiso/periodicChannel/parCFDDEMrun.sh @@ -23,9 +23,9 @@ nrProcs="4" machineFileName="none" # yourMachinefileName | none debugMode="off" # on | off| strict testHarnessPath="$CFDEM_TEST_HARNESS_PATH" -runOctave="true" +runOctave="false" postproc="false" -cleanCase="true" +cleanCase="false" #--------------------------------------------------------------------------------# #- call function to run a parallel CFD-DEM case diff --git a/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/couplingProperties index c6d2072..58e88c4 100755 --- a/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/couplingProperties +++ b/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/couplingProperties @@ -49,6 +49,8 @@ smoothingModel constDiffSmoothing; //off;// //useDDTvoidfraction; +verbose on; + forceModels ( DiFeliceDrag diff --git a/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh index 651cd62..fe45117 100644 --- a/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh @@ -23,8 +23,8 @@ nrProcs="2" machineFileName="none" # yourMachinefileName | none debugMode="off" # on | off| strict testHarnessPath="$CFDEM_TEST_HARNESS_PATH" -runOctave="true" -cleanUp="true" +runOctave="false" +cleanUp="false" postproc="false" #--------------------------------------------------------------------------------#