diff --git a/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/cfd_para.hypara b/D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/cfd_para.hypara similarity index 91% rename from TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/cfd_para.hypara rename to D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/cfd_para.hypara index f52cf866..df090b7a 100644 --- a/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/cfd_para.hypara +++ b/D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/cfd_para.hypara @@ -26,15 +26,7 @@ // multiblock: Multi-block grid or not, only for structured grid conversion. // 0 -- Not. // 1 -- Yes. -// grid_database_index: Case of typical case, only for gridobj=0. -// 1 -- Laminar flat plate of subsonic flow. -// 2 -- Laminar flat plate of supersonic flow. -// 3 -- Turbulent flat plate of subsonic flow. -// 4 -- Turbulent flat plate of supersonic flow. // iadapt: Adaptation number for unstructure grid. -// iovrlap: Overlapping(overset) grid or not. -// 0 -- NON-overlapping grid. -// 1 -- Overlapping grid. // SymmetryFaceVector: The vector of symmetry face. // 0 -- X axis. // 1 -- Y axis. @@ -42,9 +34,7 @@ int gridtype = 0; int gridobj = 1; int multiblock = 0; -int grid_database_index = 3; int iadapt = 0; -int iovrlap = 0; int SymmetryFaceVector = 1; // axisup: Type of Cartisien coordinates system, used in grid conversion. @@ -89,22 +79,18 @@ string out_gfile = "./grid/flat_laminr_133_85_2d.fts"; // iunsteady: The Grid is for unsteady simulation or not. int iunsteady = 0; int iale = 0; +int codeOfAleModel = 0; // fileformat: Ustar Grid file format. // 0 -- BINARY. // 1 -- ASCII. int fileformat = 0; -// .skl meaning skeleton. -string original_grid_info_file = "./grid/FLUENT_test.skl"; - // Parameters for hybrid solver. // mixgrid_uns: path of unstructure grid file for hybrid solver, *.fts type. // mixgrid_str: path of structure grid file for hybrid solver, *.fts type. -// mixgrid_str_bc: path of structure grid boundary condition file for hybrid solver. string mixgrid_uns = "./grid/rae2822_uns2d_4.fts"; string mixgrid_str = "./grid/flat_laminr_133_85_2d.fts"; -string mixgrid_str_bc = "./grid/flat_laminr_133_85_2d.inp"; // Some parameters for structured overlapping grid. int codeOfDigHoles = 1; @@ -176,6 +162,11 @@ int traceMark = 0; int blockIndexOfMark = 0; int cellIndexOfMark[] = [185,30,1]; +// parallel Strategy: +//! -# 0 : each zone is assigned to the one that defined in grid partition procedure. +//! -# 1 : random assigned for each zone or by some else ways. +int parallelStrategy = 1; + //----------------------------------------------------------------------- # File path # //----------------------------------------------------------------------- @@ -253,12 +244,6 @@ int compressible = 1; // refDimensionalPressure: Dimensional reference pressure, or the total pressure only for the experiment condition. // height: Fly height, unit of km. // wallTemperature: Temprature of the solid wall, minus value is for adiabatic boundary condition. -// dump_Q: Dump out thermal flux Q of solid wall. -// 0 -- no dump out. -// 1 -- dump out wall Q only. -// 2 -- dump out wall Q & the typical position Q of ball. -// 3 -- dump out wall Q & the typical position Q of cone. -// 4 -- dump out wall Q & the typical position Q of double sphere. // gridScaleFactor: The customizable unit of the grid, default value is 1.0 for meter.Common dimensions like: // 1 dm = 0.1 m. // 1 cm = 0.01 m. @@ -296,11 +281,11 @@ double freestream_vibration_temperature = 10000.00; //double refDimensionalPressure = 1.01313E05; double wallTemperature = -1.0; -int dump_Q = 0; double radiationCoef = 0.8; double gridScaleFactor = 1.0; +int numberOfAerodynamicForceComponents = 1; double forceRefenenceLengthSpanWise = 1.0; // unit of meter. double forceRefenenceLength = 1.0; // unit of meter. double forceRefenenceArea = 1.0; // unit of meter^2. @@ -410,7 +395,6 @@ double venkatCoeff = 5.0; int reconmeth = 1; int limitVariables = 0; int limitVector = 0; -double limit_angle = 0; double skewnessAngle = 60.0; int roeEntropyFixMethod = 3; @@ -454,7 +438,7 @@ double roeEntropyScale = 1.0; // 1 --Global. // visl_min: Minimum value of laminar viscosity coefficient. // turbCFLScale: Turbulence model cfl number factor. -// iale: Arbitrary Lagrangian-Eulerian method. +// codeOfAleModel: Arbitrary Lagrangian-Eulerian method. // 0 -- no ALE method. // 1 -- ALE method for non-moving grids. // 2 -- ALE method for moving grids. @@ -471,7 +455,9 @@ double physicalTimeStep = 0.01; int ifStartFromSteadyResults = 0; int ifStaticsFlowField = 0; int startStatisticStep = 800000; +int linearTwoStepMethods = 1; // 1--BDF1; 2--C-N; 3--BDF2; +int methodOfDualTime = 3; int min_sub_iter = 50; int max_sub_iter = 50; double tol_sub_iter = 0.01; @@ -493,14 +479,13 @@ int order = 2; double visl_min = 0.01; double turbCFLScale = 1.0; - +double csrv = 2.0; double timemax = 1.0e10; double dtsave = -1.0; -int iale = 0; -int ialetype = 2; +int codeOfAleModel = 0; +int aleStartStrategy = -1; int maxale = 10; double dtau = 0.001; -double dtau_max = 1E-01; int wallFunctionType = 0; @@ -522,7 +507,7 @@ double lamda[] = 0.5, 1.0; // IMPORTANT WARNING: The file index should be ignored, // e.g. if the partitioned grid is rae2822_hybrid2d__4_0.fts, // please use 'rae2822_hybrid2d__4.fts' here! -// isPlotVolumeField: If dump out the field results to visulization. +// plotFieldType: If dump out the field results to visulization. // walldistMethod: The method to compute wall distance. // 0 -- accurate but not fast enough. // 1 -- fast but not accurate enough. @@ -550,22 +535,18 @@ string restartNSFile = "results/flow.dat"; string turbfile = "results/turb.dat"; string visualfile = "results/tecflow.plt"; -string Qwall_file = "results/Qwall.dat"; string wall_aircoefile = "results/wall_aircoef.dat"; string probesflowfile = "results/sample.dat"; -string surfacefile = ""; -int nDumpSurfaceInfo = 0; +int nDumpSurfaceInfo = 0; string wall_varfile = ""; -string componentDefineFile = "bin/component.hypara"; -string jetDefineFile = "bin/jet.hypara"; +string jetDefineFile = "bin/jet.hypara"; -string componentforcefile = "results/component_aircoef.dat"; +string overset_gridfile = "results/iblank.ovs"; +string sixDofFileName = "results/sixDofInfo.dat"; -string overset_gridfile = "iblank.ovs"; - -int isPlotVolumeField = 0; +int plotFieldType = 0; // visualfileType: The file type of visualfile. // 0 -- Tecplot binary. @@ -600,7 +581,7 @@ double upperPlotFieldBox[] = [1.0 1.0 1.0]; // -- modeledTKE(18), modeleddissipationrate(19), SSTF1(20), SSTF2(21), // -- vibration temperature(Tv, 33), electron temperature(Te, 34), vibrational energy(Ev, 35), electric energy(Ee, 36), // -- number density of electron(Ne, 37), dimensioanl density(rho, 38), dimensioanl pressure(p, 39), dimensioanl temperature(T, 40), -// -- gradientUx(41), gradientUy(42), gradientVx(43), gradientVy(44). +// -- gradientUx(41), gradientUy(42), gradientVx(43), gradientVy(44), iblank(81). // Important Warning: Array size of visualVariables MUST be equal to nVisualVariables!!! // Variables order must from small to big. int nVisualVariables = 8; @@ -610,19 +591,48 @@ int visualVariables[] = [0, 1, 2, 3, 4, 5, 6, 15]; // 1 -- Turbulent flat plate. int dumpStandardModel = 0; -// ifSetProbesToMonitor: Set probes location to Monitor. -// 0 -- Do not monitor. -// 1 -- To monitor and save data to files. -// probesDefineFile: probes location information file. +// ifSetDataMonitor: Whether to set the data monitor. +// 0 -- No. +// 1 -- Yes. +// dataMonitorType: The type of data Monitor. +// 0 -- Probes data monitor. +// 1 -- Lines data monitor. +// 2 -- Surfaces data monitor. +// probesDefineFile: Probes location information file. +// nLines: The number of lines need to be monitored. +// linesDefineFile: Lines location information file. +// nSurfaces: The number of surfaces need to be monitored. +// surfacesDefineFile: Surfaces location information file. +// searchCellsMethod: method to search the cell of each probe. +// 0 -- Nearest cell to the probe. +// 1 -- Real cell where the probe is located. // nProbeVariables: Number of variables want to be dumped for probes monitered. // probeVariables : Variable types dumped, listed as following: -// -- density(0), u(1), v(2), w(3), pressure(4), temperature(5). +// -- density(0), u(1), v(2), w(3), pressure(4), temperature(5). // Important Warning: Array size of probeVariables MUST be equal to nProbeVariables!!! // probeVariables order must from small to big. -int ifSetProbesToMonitor = 0; -string probesDefineFile = "bin/probes_location.hypara"; +// probeVariablesInterpolationMethod: Interpolation method used to compute the probe variables. +// 0 -- Take the value of probe's cell as probe real value. +// 1 -- Interpolation from probe's and neighbouring cell to probe. +// 2 -- Interpolation from probe's cell nodes to probe. +int ifSetDataMonitor = 0; + +int dataMonitorType = 0; +string probesDefineFile = "bin/probes_XYZ.dat"; + +//int dataMonitorType = 1; +//int nLines = 1; +//string linesDefineFile = "bin/lines_XYZ.dat"; + +//int dataMonitorType = 2; +//int nSurfaces = 4; +//string surfacesDefineFile = "bin/surfaces_XYZ.dat"; + +int searchCellsMethod = 0; + int nProbeVariables = 6; int probeVariables[] = [0, 1, 2, 3, 4, 5]; +int probeVariablesInterpolationMethod = 0; //----------------------------------------------------------------------- # Turbulence Parameter # //----------------------------------------------------------------------- @@ -634,19 +644,17 @@ int probeVariables[] = [0, 1, 2, 3, 4, 5]; // mod_turb_res: If modify the residuals for the cells next to the wall or not, default is 0. int turbInterval = 1; -int turb_vis_kind = 2; int kindOfTurbSource = 0; int mod_turb_res = 0; double turb_relax = 1.0; -double turb_min_coef = 1.0e-1; double freeStreamViscosity = 1.0e-3; -double muoo = 1.0e-1; -double kwoo = 1.0; +double muoo = 3.0; +double kwoo = 5.0; +int transitionType = 0; +double turbIntensity = -1.0; # maximum eddy viscosity (myt/my) max. double eddyViscosityLimit = 1.0e10; -double sdilim = 1.0e20; -double coef_kvist = 1.0; int monitor_vistmax = 0; //----------------------------------------------------------------------- @@ -748,14 +756,9 @@ int monitorNegativeConstant = 0; int dg_high_order = 0; int iapplication = 0; -int iCodeBranch = 0; +int iCodeBranch = 0; int nm = 5; -// MHD -double bxoo = 0.0; -double byoo = 0.0; -double bzoo = 0.0; - double refGama = 1.4; double prl = 0.72; double prt = 0.90; @@ -878,6 +881,30 @@ double MUSCLCoefXk = -1; double MUSCLCoefXb = 1.0; int allReduceStep = 1; +// ----------------- overlap configuration ------------------------------ +// codeOfOversetGrid: Overlapping(overset) grid or not. +// 0 -- NON-overlapping grid. +// 1 -- Overlapping grid. +int codeOfOversetGrid = 0; +int codeOfOversetSlipGrid = 0; +int readOversetFileOrNot = 0; +int symetryOrNot = 0; +int readInAuxiliaryInnerGrid = 1; +int readInAuxiliaryOuterGrid = 0; +int readInSklFileOrNot = 0; +string auxiliaryInnerGrid0 = "./grid/aux-upper.fts"; +string auxiliaryInnerGrid1 = "./grid/aux-lower.fts"; +string auxiliaryInnerGrid2 = ""; +string oversetGridFileName = "./grid/overlap.ovs"; +double walldistMainZone = 1.0 +double toleranceForOversetSearch = 1.0e-3; +double toleranceForOversetBox = 1.0e-3; +int twoOrderInterpolationOrNot = 0; +int keyEnlargeOfActiveNodes = 0; +int outTecplotOverset = 0; + +int numberOfMovingBodies = 2; + // ---------------- ATP read -------------------------------------------- //@int inflowParaType = 0; //@double refReNumber = 2.329418E08; @@ -888,3 +915,9 @@ int allReduceStep = 1; //@int nsubsonicOutlet = 0; //@string inLetFileName = "./bin/subsonicInlet.hypara"; //@string outLetFileName = "./bin/subsonicOutlet.hypara"; + +######################################################################### +# Old Parameter # +######################################################################### +int isPlotVolumeField = 0; + diff --git a/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/cfd_para_hypersonic.hypara b/D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/cfd_para_hypersonic.hypara similarity index 94% rename from TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/cfd_para_hypersonic.hypara rename to D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/cfd_para_hypersonic.hypara index 5317d896..4b15238a 100644 --- a/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/cfd_para_hypersonic.hypara +++ b/D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/cfd_para_hypersonic.hypara @@ -21,12 +21,6 @@ int intervalStepRes = 10; // attackd: Angle of attack. // angleSlide: Angle of sideslip. // wallTemperature: Temprature of the solid wall, minus value is for adiabatic boundary condition. -// dump_Q: Dump out thermal flux Q of solid wall. -// 0 -- no dump out. -// 1 -- dump out wall Q only. -// 2 -- dump out wall Q & the typical position Q of ball. -// 3 -- dump out wall Q & the typical position Q of cone. -// 4 -- dump out wall Q & the typical position Q of double sphere. // inflowParaType: The type of inflow parameters. // 0 -- the nondimensional conditions. // 1 -- the flight conditions. @@ -52,12 +46,10 @@ double attackd = 0.00; double angleSlide = 0.00; double wallTemperature = 294.44; -int dump_Q = 1; int inflowParaType = 0; double refReNumber = 1.835e5; double refDimensionalTemperature = 124.94; -double freestream_vibration_temperature = 10000.0; //int inflowParaType = 1; //double height = 0.001; @@ -78,7 +70,7 @@ double TorqueRefZ = 0.0; // unit of meter. ######################################################################### # Physical models # ######################################################################### -// viscousType : Viscous model. +// viscousType: Viscous model. // 0 -- Euler. // 1 -- Lamilar. // 3 -- 1eq turbulent. @@ -154,9 +146,7 @@ double venkatCoeff = 0.5; int iunsteady = 0; double CFLEnd = 10.0; -int CFLVaryStep = 100; - -double ktmax = 1.0e10; +int CFLVaryStep = 100; int nLUSGSSweeps = 4; double LUSGSTolerance = 1.0e-20; @@ -169,10 +159,10 @@ double LUSGSTolerance = 1.0e-20; // IMPORTANT WARNING: The file index should be ignored, // e.g. if the partitioned grid is rae2822_hybrid2d__4_0.fts, // Please use 'rae2822_hybrid2d__4.fts' here! -// isPlotVolumeField: If dump out the whole field results to tecplot or not, 0 / 1. +// plotFieldType: If dump out the whole field results to tecplot or not, 0 / 1. string gridfile = "./grid/cylinder_str.fts"; -int isPlotVolumeField = 0; +int plotFieldType = 0; // ----------------- Advanced Parameters, DO NOT care it ---------------- // nVisualVariables: Number of variables want to be dumped for tecplot visualization. @@ -181,7 +171,9 @@ int isPlotVolumeField = 0; // -- viscosityLaminar(7), viscosityTurbulent(8), // -- vorticity_x(9), vorticity_y(10), vorticity_z(11), vorticityMagnitude(12), // -- strain_rate(13), Q_criteria(14), Cp(15), timeStep(16), volume(17), -// -- modeledTKE(18), modeleddissipationrate(19), SSTF1(20), SSTF2(21). +// -- modeledTKE(18), modeleddissipationrate(19), SSTF1(20), SSTF2(21), +// -- vibration temperature(Tv, 33), electron temperature(Te, 34), vibrational energy(Ev, 35), electric energy(Ee, 36), +// -- number density of electron(Ne, 37), dimensioanl density(rho, 38), dimensioanl pressure(p, 39), dimensioanl temperature(T, 40). // Important Warning: Array size of visualVariables MUST be equal to nVisualVariables!!! // Variables order must from small to big. @@ -230,6 +222,9 @@ string structhighordergradient = "conservation"; ######################################################################### # Non-equilibrium gas # ######################################################################### +// nGasModel: The type of gas. +// 0 -- Earth gas. +// 1 -- Mars gas. // nchem: // 0 -- without chemical reaction flow. // 1 -- the chemical reaction flow is considered. @@ -251,11 +246,13 @@ string structhighordergradient = "conservation"; // "Gu" -- indicates the Gupta Model, three-Type Models are embeded in the library, namely, the 5-species-6-reactions, the 7-species-9-reactions, the 11-species-20-reactions. // "Pa" -- indicates the Park Model, three-Type Models are embeded in the library, namely, the 5-species-17-reactions, the 7-species-22-reactions, the 11-species-48-reactions. // "DK" -- indicates the Dunn-Kang Model, three-Type Models are embeded in the library, namely, the 5-species-11-reactions, the 7-species-15-reactions, the 11-species-26-reactions. +// "Mars-Pa8" is for Park model of Mars gas, "Mars-Mc8" for McKenzie model of Mars gas. // For self-definition model, the gasfile is used to indicate the file path of the new gas model. // speciesName: Used to list the names of each species, while each species name is separated by the symbol of comma. // initMassFraction: Used to list the initial mass fractions of species in accordance with the sequence of names in the parameter speciesName. // ifStartFromPerfectGasResults: The chemical reaction simulation is start from perfect gas flowfield or not, 0 is for no and else is for yes. +int nGasModel = 0; int nchem = 0; int ntmodel = 1; int nchemsrc = 1; diff --git a/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/grid_para.hypara b/D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/grid_para.hypara similarity index 100% rename from TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/grid_para.hypara rename to D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/grid_para.hypara diff --git a/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/key.hypara b/D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/key.hypara similarity index 95% rename from TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/key.hypara rename to D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/key.hypara index 83d50411..91008f0a 100644 --- a/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/key.hypara +++ b/D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/bin/key.hypara @@ -40,11 +40,13 @@ string parafilename = "./bin/cfd_para_hypersonic.hypara"; //int nsimutask = 5; //string parafilename = "./bin/overset_grid_view.hypara"; +//int nsimutask = 14; +//string parafilename = "./bin/integrative_solver.hypara"; + //int nsimutask = 99; //string parafilename = "./bin/post_processing.hypara"; // ---------------- Advanced Parameters, DO NOT care it ---------------- -int iovrlap = 0; int numberOfGridProcessor = 0; // ATP read //@string parafilename1 = "" diff --git a/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/grid/cylinder_str.cgns b/D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/grid/cylinder_str.cgns similarity index 100% rename from TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/grid/cylinder_str.cgns rename to D01_TwoD_Cylinder_Laminar_HighOrder_Struct_1CPU/grid/cylinder_str.cgns diff --git a/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/partition.hypara b/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/partition.hypara deleted file mode 100644 index 105fa4fa..00000000 --- a/TwoD_Cylinder_Laminar_HighOrder_Struct/TwoD_Cylinder_Laminar_HighOrder_Struct/bin/partition.hypara +++ /dev/null @@ -1,21 +0,0 @@ -// pgridtype: The grid type. -// 0 -- unstruct grid. -// 1 -- struct grid. -// maxproc: The number of partition zones that want to be divided into, -// which is equal to the number of CPU processors you want. -// Usually, 50~100 thousands structured cells per CPU-Core is suggested. -// 30~70 thousands unstructured cells per CPU-Core is suggested. -// original_grid_file: Original grid file that want to be divided(PHengLEI type, *.fts). -// partition_grid_file: Target partition grid file(PHengLEI type, *.fts). - -int pgridtype = 1; -int maxproc = 4; - -string original_grid_file = "./grid/cylinder_str.fts"; -string partition_grid_file = "./grid/cylinder_str__4.fts"; - -// numberOfMultigrid: Number of multi-grid levels, ONLY used for structured grid. -// 1 -- single level. -// 2 -- 2 level. -// N -- N level,..., et al. -int numberOfMultigrid = 1;