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

- 修改配置文件，使不输出警告；

Browse Source 
- 测试案例默认不调用octave进行后处理，默认启用clean
This commit is contained in:
yangzhuo
2025-02-14 07:02:57 +00:00
parent 444bcec790
commit 24b52943b5
7 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
View File

@ -64,7 +64,7 @@ int main(int argc, char *argv[])
#include "createTime.H" // 定义Foam::Time runTime(Time::controlDictname, args) #include "createTime.H" // 定义Foam::Time runTime(Time::controlDictname, args)
#include "createMesh.H" // 定义Foam::FvMesh mesh #include "createMesh.H" // 定义Foam::FvMesh mesh
pisoControl piso(mesh); pisoControl piso(mesh);
#include "createTimeControls.H" // 读取adjustTimeStep, maxCo, maxDeltaT // #include "createTimeControls.H" // 读取adjustTimeStep, maxCo, maxDeltaT
#include "createFields.H" // 初始化物理场 #include "createFields.H" // 初始化物理场
#include "createFvOptions.H" // 定义fvOptions #include "createFvOptions.H" // 定义fvOptions
#include "initContinuityErrs.H" // 定义cumulativeContErr #include "initContinuityErrs.H" // 定义cumulativeContErr

4
src/lagrangian/cfdemParticle/etc/bashrc
View File

@ -358,10 +358,6 @@ elif [[ $WM_PROJECT_VERSION == v1706 ]]; then
sleep 1.5 sleep 1.5
elif [[ $WM_PROJECT_VERSION == v2406 ]]; then elif [[ $WM_PROJECT_VERSION == v2406 ]]; then
export CFDEM_WM_PROJECT_VERSION=2406 export CFDEM_WM_PROJECT_VERSION=2406
cfdemecho "************************************"
cfdemecho "WARNING from your CFDEM code!"
cfdemecho "WARNING: Coupling with your OpenFOAM(R) version is not officially supported!"
cfdemecho "************************************"
sleep 1.5 sleep 1.5
elif [[ $WM_PROJECT_VERSION == 2.4.* ]]; then elif [[ $WM_PROJECT_VERSION == 2.4.* ]]; then
export CFDEM_WM_PROJECT_VERSION=24 export CFDEM_WM_PROJECT_VERSION=24

2
tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh
View File

@ -23,7 +23,7 @@ nrProcs="4"
machineFileName="none" # yourMachinefileName | none machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off| strict | profile debugMode="off" # on | off| strict | profile
testHarnessPath="$CFDEM_TEST_HARNESS_PATH" testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
runOctave="true" runOctave="false"
postproc="false" postproc="false"
#--------------------------------------------------------------------------------# #--------------------------------------------------------------------------------#

2
tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/parCFDDEMrun.sh
View File

@ -23,7 +23,7 @@ nrProcs="4"
machineFileName="none" # yourMachinefileName | none machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off| strict debugMode="off" # on | off| strict
testHarnessPath="$CFDEM_TEST_HARNESS_PATH" testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
runOctave="true" runOctave="false"
postproc="false" postproc="false"
#--------------------------------------------------------------------------------# #--------------------------------------------------------------------------------#

2
tutorials/cfdemSolverPiso/periodicChannel/parCFDDEMrun.sh
View File

@ -25,7 +25,7 @@ debugMode="off" # on | off| strict
testHarnessPath="$CFDEM_TEST_HARNESS_PATH" testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
runOctave="false" runOctave="false"
postproc="false" postproc="false"
cleanCase="false" cleanCase="true"
#--------------------------------------------------------------------------------# #--------------------------------------------------------------------------------#
#- call function to run a parallel CFD-DEM case #- call function to run a parallel CFD-DEM case

2
tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh
View File

@ -24,7 +24,7 @@ machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off| strict debugMode="off" # on | off| strict
testHarnessPath="$CFDEM_TEST_HARNESS_PATH" testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
runOctave="false" runOctave="false"
cleanUp="false" cleanUp="true"
postproc="false" postproc="false"
#--------------------------------------------------------------------------------# #--------------------------------------------------------------------------------#

2
tutorials/cfdemSolverPiso/voidfractionTest/parCFDDEMrun.sh
View File

@ -24,7 +24,7 @@ machineFileName="none" # yourMachinefileName | none
debugMode="off" # on | off| strict debugMode="off" # on | off| strict
reconstuctCase="false" reconstuctCase="false"
testHarnessPath="$CFDEM_TEST_HARNESS_PATH" testHarnessPath="$CFDEM_TEST_HARNESS_PATH"
runOctave="true" runOctave="false"
cleanUp="true" cleanUp="true"
postproc="false" postproc="false"
#--------------------------------------------------------------------------------# #--------------------------------------------------------------------------------#