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

# Conflicts:
#	P01_Flate_Plate_1_Part/bin/GenerateGrid.hypara
#	P01_Flate_Plate_1_Part/grid/test_grid_0.fts

L01_Flat_Plate_1_Part/bin/GridDataBase_TaylorGreenVortex.hypara

@@ -0,0 +1,9 @@
+int nBlocks = 1;
+
+int nNodeX = 32;
+int nNodeY = 32;
+int nNodeZ = 1;
+
+double lengthX = 6.283185307179586476925286766559;
+double lengthY = 6.283185307179586476925286766559;
+double lengthZ = 6.283185307179586476925286766559;

L01_Flat_Plate_1_Part/bin/cfd_para.hypara

@@ -921,3 +921,4 @@ int     numberOfMovingBodies       = 2;
 #########################################################################
 int isPlotVolumeField = 0;
 
+

L01_Flat_Plate_1_Part/bin/cfd_para_subsonic.hypara

@@ -194,4 +194,5 @@ int reconmeth = 1;
 int limitVariables = 0;
 int limitVector = 0;
 
-double MUSCLCoefXk = 0.333333;
+double MUSCLCoefXk = 0.333333;
+

L01_Flat_Plate_1_Part/bin/key.hypara

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

L01_Flat_Plate_1_Part/bin/particle_para.hypara

@@ -0,0 +1,16 @@
+#########################################################################
+#                       Particle                                  #
+#########################################################################
+int iParticleModel = 0;
+
+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";

L02_Flat_Plate_2_Part/bin/GridDataBase_TaylorGreenVortex.hypara

@@ -0,0 +1,9 @@
+int nBlocks = 1;
+
+int nNodeX = 32;
+int nNodeY = 32;
+int nNodeZ = 1;
+
+double lengthX = 6.283185307179586476925286766559;
+double lengthY = 6.283185307179586476925286766559;
+double lengthZ = 6.283185307179586476925286766559;

L02_Flat_Plate_2_Part/bin/cfd_para.hypara

@@ -921,3 +921,4 @@ int     numberOfMovingBodies       = 2;
 #########################################################################
 int isPlotVolumeField = 0;
 
+

L02_Flat_Plate_2_Part/bin/key.hypara

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

L02_Flat_Plate_2_Part/bin/particle_para.hypara

@@ -0,0 +1,16 @@
+#########################################################################
+#                       Particle                                  #
+#########################################################################
+int iParticleModel = 0;
+
+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";

P01_Flate_Plate_1_Part/bin/GridDataBase_TaylorGreenVortex.hypara

@@ -5,8 +5,8 @@
 
 int nBlocks = 1;
 
-int nNodeX = 32;
-int nNodeY = 32;
+int nNodeX = 64;
+int nNodeY = 64;
 int nNodeZ = 1;
 
 double lengthX = 6.283185307179586476925286766559;

P01_Flate_Plate_1_Part/bin/cfd_para.hypara

@@ -921,4 +921,8 @@ int     numberOfMovingBodies       = 2;
 #########################################################################
 int isPlotVolumeField = 0;
 
-
+#########################################################################
+#                       user define parameter                           #
+#########################################################################
+int UDFInitFluid = 1;
+string UDFInitFluidType = "TGV";