Merge branch 'Branch_LeiYinghaonan_TestCase' of https://git.osredm.com/p15932078/PHengLEI-TestCases into Branch_LeiYinghaonan_TestCase

This commit is contained in:
JokerRayL 2021-09-30 10:22:19 +08:00
commit 1a503d2c79
6 changed files with 22 additions and 18 deletions

View File

@ -921,7 +921,4 @@ int numberOfMovingBodies = 2;
######################################################################### #########################################################################
int isPlotVolumeField = 0; int isPlotVolumeField = 0;
#########################################################################
# Particle #
#########################################################################
int iParticleModel = 0;

View File

@ -134,7 +134,7 @@ double venkatCoeff = 50.0;
// 1 -- is recommended for structured solver. // 1 -- is recommended for structured solver.
// 1-3 -- is recommended for unstructured solver. // 1-3 -- is recommended for unstructured solver.
int iunsteady = 0; int iunsteady = 1;
double CFLEnd = 100.0; double CFLEnd = 100.0;
@ -196,7 +196,3 @@ int limitVector = 0;
double MUSCLCoefXk = 0.333333; double MUSCLCoefXk = 0.333333;
#########################################################################
# Particle #
#########################################################################
int iParticleModel = 1;

View File

@ -16,7 +16,7 @@ string defaultParaFile = "./bin/cfd_para.hypara";
// 3 -- Grid partition. // 3 -- Grid partition.
// 4 -- Knowledge repository / examples of PHengLEI-API. // 4 -- Knowledge repository / examples of PHengLEI-API.
int ndim = 2; int ndim = 2;
int nparafile = 1; int nparafile = 2;
int nsimutask = 0; int nsimutask = 0;
string parafilename = "./bin/cfd_para_subsonic.hypara"; string parafilename = "./bin/cfd_para_subsonic.hypara";
@ -51,3 +51,5 @@ int numberOfGridProcessor = 0;
// ATP read // ATP read
//@string parafilename1 = "" //@string parafilename1 = ""
//@string parafilename2 = ""; //@string parafilename2 = "";
string parafilename1 = "./bin/particle_para.hypara";

View File

@ -0,0 +1,16 @@
#########################################################################
# Particle #
#########################################################################
int iParticleModel = 1;
string particleInterpolation_struct = "TrilinearInterpolation";
//! #########################################################################
//! # File in and out #
//! #########################################################################
int ifInitParticle = 1;
int ifReadRestartParticle = 0;
int ifWirteRestartParticle = 1;
string initParticleFile = "./grid/particle_init.h5";
string restartParticleFile = "./grid/particle_restart.h5";

View File

@ -81,11 +81,4 @@ int forceBassetType = 1;
//! fileParticleOutputType: Control which variable need to output. //! fileParticleOutputType: Control which variable need to output.
//! 0 -- No output. //! 0 -- No output.
string fileParticleOutput = "./result/particleOutput.dat"; string fileParticleOutput = "./result/particleOutput.dat";
int fileParticleOutputType = 0; int fileParticleOutputType = 0;
//! #########################################################################
//! # File in and out #
//! #########################################################################
string initParticleFile = "./grid/particle_init.h5";
//string restartParticleFile = "./grid/particle_restart.h5";
string restartParticleFile = "";