diff --git a/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para.hypara b/A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para.hypara similarity index 91% rename from ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para.hypara rename to A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para.hypara index 2fe7891..df090b7 100644 --- a/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para.hypara +++ b/A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para.hypara @@ -27,9 +27,6 @@ // 0 -- Not. // 1 -- Yes. // 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. @@ -38,7 +35,6 @@ int gridtype = 0; int gridobj = 1; int multiblock = 0; int iadapt = 0; -int iovrlap = 0; int SymmetryFaceVector = 1; // axisup: Type of Cartisien coordinates system, used in grid conversion. @@ -83,6 +79,7 @@ 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. @@ -165,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 # //----------------------------------------------------------------------- @@ -283,6 +285,7 @@ double wallTemperature = -1.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. @@ -435,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. @@ -452,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; @@ -474,11 +479,11 @@ 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; @@ -502,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. @@ -536,11 +541,12 @@ string probesflowfile = "results/sample.dat"; int nDumpSurfaceInfo = 0; string wall_varfile = ""; -string jetDefineFile = "bin/jet.hypara"; +string jetDefineFile = "bin/jet.hypara"; -string overset_gridfile = "iblank.ovs"; +string overset_gridfile = "results/iblank.ovs"; +string sixDofFileName = "results/sixDofInfo.dat"; -int isPlotVolumeField = 0; +int plotFieldType = 0; // visualfileType: The file type of visualfile. // 0 -- Tecplot binary. @@ -575,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; @@ -585,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 # //----------------------------------------------------------------------- @@ -613,8 +648,10 @@ int kindOfTurbSource = 0; int mod_turb_res = 0; double turb_relax = 1.0; 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; @@ -844,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; @@ -854,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/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para_hypersonic.hypara b/A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para_hypersonic.hypara similarity index 98% rename from ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para_hypersonic.hypara rename to A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para_hypersonic.hypara index ce6036f..02de2ca 100644 --- a/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para_hypersonic.hypara +++ b/A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/cfd_para_hypersonic.hypara @@ -62,7 +62,7 @@ double freestream_vibration_temperature = 10000.0; double gridScaleFactor = 0.01; double forceRefenenceLengthSpanWise = 1.0; // unit of meter. -double forceRefenenceLength = 1.0; // unit of meter. +double forceRefenenceLength = 1.0; // unit of meter. double forceRefenenceArea = 1.0; // unit of meter^2. double TorqueRefX = 0.0; // unit of meter. double TorqueRefY = 0.0; // unit of meter. @@ -158,10 +158,10 @@ double ktmax = 1.0e10; // 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/DoubleEllipse__4.fts"; -int isPlotVolumeField = 0; +int plotFieldType = 0; // ----------------- Advanced Parameters, DO NOT care it ---------------- // nVisualVariables: Number of variables want to be dumped for tecplot visualization. diff --git a/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/grid_para.hypara b/A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/grid_para.hypara similarity index 100% rename from ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/grid_para.hypara rename to A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/grid_para.hypara diff --git a/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/key.hypara b/A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/key.hypara similarity index 98% rename from ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/key.hypara rename to A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/key.hypara index d5d88f1..1b2743f 100644 --- a/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/key.hypara +++ b/A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/key.hypara @@ -47,7 +47,6 @@ string parafilename = "./bin/cfd_para_hypersonic.hypara"; //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/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/partition.hypara b/A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/partition.hypara similarity index 100% rename from ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/partition.hypara rename to A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/partition.hypara diff --git a/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/grid/DoubleEllipse.grd b/A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/grid/DoubleEllipse.grd similarity index 100% rename from ThreeD_DoubleEllipse_Laminar_Struct_4CPU/grid/DoubleEllipse.grd rename to A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/grid/DoubleEllipse.grd diff --git a/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/grid/DoubleEllipse.inp b/A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/grid/DoubleEllipse.inp similarity index 100% rename from ThreeD_DoubleEllipse_Laminar_Struct_4CPU/grid/DoubleEllipse.inp rename to A12_ThreeD_DoubleEllipse_Laminar_Struct_4CPU/grid/DoubleEllipse.inp diff --git a/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/boundary_condition.hypara b/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/boundary_condition.hypara deleted file mode 100644 index 83bf696..0000000 --- a/ThreeD_DoubleEllipse_Laminar_Struct_4CPU/bin/boundary_condition.hypara +++ /dev/null @@ -1,48 +0,0 @@ -# nBoundaryConditons : number of global boundary conditions. -# bcName : Boundary Condition Name. -# bcType(in PHengLEI): Boundary Condition Type. - -# Account of how to set boundaryconditon. -# string bcName = "Farfield"; -# { -# int bcType = 4; -# int inflowParaType = 1; -# double attackd = 0; -# double refReNumber = 6.5e6; -# double refMachNumber = 3.5; -# double angleSlide = 0; -# } - -int nBoundaryConditons = 4; -string bcName = "SOLID_SURFACE"; -{ - int bcType = 2; -} -string bcName = "SYMMETRY"; -{ - int bcType = 3; -} -string bcName = "INFLOW"; -{ - int bcType = 5; -} -string bcName = "OUTFLOW"; -{ - int bcType = 6; -} - -# 'bcType' is defined as following: -# 99: PERIODIC -# -2: WAKE -# -1: INTERFACE -# 0 : NO_BOUNDARY_CONDITION -# 1 : EXTRAPOLATION -# 2 : SOLID_SURFACE -# 3 : SYMMETRY -# 4 : FARFIELD -# 5 : INFLOW -# 6 : OUTFLOW -# 52: PRESSURE_INLET -# 62: PRESSURE_OUTLET -# 61: OUTFLOW_CONFINED -# 7 : POLE