更新P02

P02_TwoD_TGV/bin/UserDefineInterface_para.hypara

@@ -0,0 +1,9 @@
+//! @file      UserDefineInterface_para.hypara
+//! @brief     This hypara file is controls UDF of flow.
+//! @author    Lei Yinghaonan.
+
+#########################################################################
+#                       user define parameter                           #
+#########################################################################
+int UDFInitFluid = 1;
+string UDFInitFluidType = "TGV";

P02_TwoD_TGV/bin/boundary_condition.hypara

@@ -1,26 +1,21 @@
+//! @file      boundary_condition.hypara
+//! @brief     This hypara file controls Global boundary condition in "Simulation::InitGlobalBoundaryCondition()".
+//! @author    Lei Yinghaonan.
+
 int nBoundaryConditons = 4;
-string bcName = "TGV_up1"
+string bcName = "TGV_up1";
 {
-    int bcType = 1009;
-    int bcParticleType = 1;
-    string periodicBC = "TGV_down1";
+  int bcType = 1009;
 }
 string bcName = "TGV_down1";
 {
-    int bcType = 1009;
-    int bcParticleType = 1;
-    string periodicBC = "TGV_up1";
+  int bcType = 1009;
 }
 string bcName = "TGV_up2";
 {
-    int bcType = 1009;
-    int bcParticleType = 1;
-    string periodicBC = "TGV_4";
+  int bcType = 1009;
 }
 string bcName = "TGV_down2";
 {
-    int bcType = 1009;
-    int bcParticleType = 1;
-    string periodicBC = "TGV_down2";
-}							
-						
+  int bcType = 1009;
+}

P02_TwoD_TGV/bin/key.hypara

@@ -46,6 +46,9 @@ string parafilename = "./bin/cfd_para_subsonic.hypara";
 //int    nsimutask    = 99;
 //string parafilename = "./bin/post_processing.hypara";
 
+int    nsimutask    = 100;
+string parafilename = "./bin/particle_analysis.hypara";
+
 // ---------------- Advanced Parameters, DO NOT care it ----------------
 int numberOfGridProcessor = 0;
 // ATP read

P02_TwoD_TGV/bin/particle_analysis.hypara

@@ -0,0 +1,5 @@
+//! @file      particle_analysis.hypara
+//! @brief     
+//! @author    Lei Yinghaonan.
+
+int particleTask = 1;

P02_TwoD_TGV/bin/particle_boundary_condition.hypara

@@ -0,0 +1,30 @@
+//! @file      particle_boundary_condition.hypara
+//! @brief     This hypara file controls Global boundary condition in "Simulation::InitGlobalBoundaryCondition()".
+//!            Here controls the boundary condition for particle.
+//! @author    Lei Yinghaonan.
+
+int nBoundaryConditons = 4;
+string bcName = "TGV_up1";
+{
+  int bcType = 1009;
+  int particleBCType= 1;
+  string periodicBC = "TGV_down1";
+}
+string bcName = "TGV_down1";
+{
+  int bcType = 1009;
+  int particleBCType= 1;
+  string periodicBC = "TGV_up1";
+}
+string bcName = "TGV_up2";
+{
+  int bcType = 1009;
+  int particleBCType= 1;
+  string periodicBC = "TGV_down2";
+}
+string bcName = "TGV_down2";
+{
+  int bcType = 1009;
+  int particleBCType= 1;
+  string periodicBC = "TGV_up2";
+}

P02_TwoD_TGV/bin/particle_para.hypara

@@ -1,39 +1,55 @@
-//! The paramter for partcie solver.
-#########################################################################
-#                       Particle controller                             #
-#########################################################################
-//! iParticleModel : The type of particle solver.
-//!                  0 -- do not use particle solver.
-//!                  1 -- particle point solver of Euler-Lagrangian plan.
+//! @file      particle_para.hypara
+//! @brief     This hypara file is for Param_ParticleSolver, 
+//!            which controls the IO of particle files.
+//! @author    Lei Yinghaonan.
+
+//! #########################################################################
+//! #                       Particle Solver module                          #
+//! #########################################################################
+//! iParticleModel : The Solver for particle.
+//!                  0 -- Do not use particle solver.
+//!                  1 -- Particle Point Solver.
+//!                  2 -- Particle Resolved Solver.
 int iParticleModel = 1;
 
-#########################################################################
-#                  The ghost plan of grid layer                         #
-#########################################################################
-//! UseNewGhostPointPlan : If use a new plan of ghost point for grid.
-//!                        0 -- do not use a new plan for ghost plan.
-//!                        1 -- use a new plan for ghost point.
+//! #########################################################################
+//! #                       Particle Interpolation                          #
+//! #########################################################################
+//! UseNewGhostPointPlan : If use a new plan for generating Ghost point of particle solver.
+//!                        0 -- Do not use new plan ,which use the default fluid solver scheme of ghost point.
+//!                        1 -- Use a new plan for particle solver ,which creat a new ghost point of grid.
+//! GhostGrid_struct/unstruct : The scheme of particle interpolation for struct/unstruct grid.
+//!                             OneLayerWithCorner -- One layer , ghost with corner point.
+//!                             UDF -- The interface of user define function.
 int UseNewGhostPointPlan = 1;
+string GhostGrid_struct = "OneLayerWithCorner";
+string GhostGrid_unstruct = "";
 
-//! particleInterpolation_struct : The plan for ghost point of struct grid.
-//!     OneLayerWithCorner -- one layer of ghost point with corner point.
-//!     UDF -- Interface reserved for user customization.
-string particleInterpolation_struct = "OneLayerWithCorner";
+//! particleInterpolation_struct/unstruct : The scheme of particle interpolation for struct/unstruct grid.
+//!             TrilinearInterpolation -- Trilinear Interpolation,which only for orthogonal structural grid.
+//!             UDF -- The interface of user define function.
+string particleInterpolation_struct = "TrilinearInterpolation";
+string particleInterpolation_unstruct = "";
 
-#########################################################################
-#                            File in and out                            #
-#########################################################################
-//! ifInitParticle : If need to initial particle field.
-//! initParticleFile : The file path of initial particle field.
+//! #########################################################################
+//! #                          File in and out                              #
+//! #########################################################################
+//! ifInitParticle : If init particle field.
+//!                  0 -- do not init particle field.
+//!                  1 -- Init particle field by "initParticleFile".
+//! initParticleFile : If init particle field, the file path for init ,
+//!                    which is created by Matlab program.
 int ifInitParticle = 1;
 string initParticleFile = "./grid/particle_init.h5";
 
-//! ifReadRestartParticle : If need to read restart file of particle field.
-//! restartParticleFile : The file path of restart file of of particle field.
+//! ifReadRestartParticle : If read restart particle field.
+//!                         0 -- Do not read restart particle field.
+//!                         1 -- Read particle field by "restartParticleFile".
 int ifReadRestartParticle = 0;
 string restartParticleFile = "./grid/particle_restart.h5";
 
-//! ifWirteRestartParticle : If need to write restart file of particle field.
-//! intervalStepRestartParticle : The step intervals for restart file saved.
+//! ifWirteRestartParticle : If write restart particle file.
+//!                          0 -- Do not write restart particle file.
+//!                          1 -- Write restart particle file.
 int ifWirteRestartParticle = 1;
 int intervalStepRestartParticle = 100;

P02_TwoD_TGV/bin/particlepoint_para.hypara

@@ -3,7 +3,7 @@
 //! @author    Lei Yinghaonan.
 
 //! #########################################################################
-//! # General Global Control Parameter of Simulation                        #
+//! #             General Global Control Parameter of Simulation            #
 //! #########################################################################
 //! simulationDimensionType: The type of Dimensionless method.
 //!                          0 -- The parameter is nondimensional.
@@ -25,7 +25,7 @@ int simulationSplashFunction = 0;
 int simulationPointRotate = 0;
 
 //! #########################################################################
-//! # Pyhsical Parameter on Each Particle                                   #
+//! #                  Pyhsical Parameter on Each Particle                  #
 //! #########################################################################
 //! refDimensionedLength: Dimensioned length,L-(m).
 //! refDimensionedMass: Dimensioned mass,m-(kg).
@@ -47,7 +47,7 @@ double particleDensity = 1.0;
 double particleTemperature = 1.0;
 
 //! #########################################################################
-//! # Particle force model                                                  #
+//! #                       Particle force model                            #
 //! #########################################################################
 //! nParticleForce: The number of force on particle.
 //!                 See more on Maxey 1983.
@@ -75,7 +75,7 @@ int forceAddedMassType = 0;
 int forceBassetType = 0;
 
 //! #########################################################################
-//! # Output Variable                                                       #
+//! #                         Output Variable                               #
 //! #########################################################################
 //! fileParticleOutput: Output file for particle.
 //! fileParticleOutputType: Control which variable need to output.

P02_TwoD_TGV/bin/partition.hypara

@@ -9,10 +9,10 @@
 // partition_grid_file: Target partition grid file(PHengLEI type, *.fts).
 
 int pgridtype = 1;
-int maxproc   = 1;
+int maxproc   = 2;
 
-string original_grid_file  = "./grid/flat_laminar_73_81.fts";
-string partition_grid_file = "./grid/flat_laminar_73_81.fts";
+string original_grid_file  = "./grid/test_grid.fts";
+string partition_grid_file = "./grid/test_grid__2.fts";
 
 // numberOfMultigrid: Number of multi-grid levels, ONLY used for structured grid.
 //                    1 -- single level.