WIP: Pull Request for a complete Solver package #1
@ -39,7 +39,7 @@ $(BUILD_DIR)/%.s: %.c
|
|||||||
|
|
||||||
.PHONY: clean distclean tags info asm format
|
.PHONY: clean distclean tags info asm format
|
||||||
|
|
||||||
clean:
|
clean: vis
|
||||||
$(info ===> CLEAN)
|
$(info ===> CLEAN)
|
||||||
@rm -rf $(BUILD_DIR)
|
@rm -rf $(BUILD_DIR)
|
||||||
@rm -f tags
|
@rm -f tags
|
||||||
@ -54,6 +54,11 @@ info:
|
|||||||
|
|
||||||
asm: $(BUILD_DIR) $(ASM)
|
asm: $(BUILD_DIR) $(ASM)
|
||||||
|
|
||||||
|
vis:
|
||||||
|
$(info ===> REMOVING VIZUALISATION FILES)
|
||||||
|
@rm -f vtk_files/particle*.vtk
|
||||||
|
@rm -f vis_files/particle*.dat
|
||||||
|
|
||||||
tags:
|
tags:
|
||||||
$(info ===> GENERATE TAGS)
|
$(info ===> GENERATE TAGS)
|
||||||
$(Q)ctags -R
|
$(Q)ctags -R
|
||||||
|
|||||||
72
BasicSolver/2D-mpi-v3/backstep.par
Normal file
72
BasicSolver/2D-mpi-v3/backstep.par
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
#==============================================================================
|
||||||
|
# Laminar Canal Flow
|
||||||
|
#==============================================================================
|
||||||
|
|
||||||
|
# Problem specific Data:
|
||||||
|
# ---------------------
|
||||||
|
|
||||||
|
name backstep # name of flow setup
|
||||||
|
|
||||||
|
bcTop 1 # flags for boundary conditions
|
||||||
|
bcBottom 1 # 1 = no-slip 3 = outflow
|
||||||
|
bcLeft 3 # 2 = free-slip 4 = periodic
|
||||||
|
bcRight 3 #
|
||||||
|
|
||||||
|
gx 0.0 # Body forces (e.g. gravity)
|
||||||
|
gy 0.0 #
|
||||||
|
|
||||||
|
re 36500.0 # Reynolds number
|
||||||
|
|
||||||
|
u_init 1.0 # initial value for velocity in x-direction
|
||||||
|
v_init 0.0 # initial value for velocity in y-direction
|
||||||
|
p_init 1.0 # initial value for pressure
|
||||||
|
|
||||||
|
# Geometry Data:
|
||||||
|
# -------------
|
||||||
|
|
||||||
|
xlength 7.0 # domain size in x-direction
|
||||||
|
ylength 1.5 # domain size in y-direction
|
||||||
|
imax 210 # number of interior cells in x-direction
|
||||||
|
jmax 45 # number of interior cells in y-direction
|
||||||
|
|
||||||
|
# Time Data:
|
||||||
|
# ---------
|
||||||
|
|
||||||
|
te 60.0 # final time
|
||||||
|
dt 0.02 # time stepsize
|
||||||
|
tau 0.5 # safety factor for time stepsize control (<0 constant delt)
|
||||||
|
|
||||||
|
# Pressure Iteration Data:
|
||||||
|
# -----------------------
|
||||||
|
|
||||||
|
itermax 500 # maximal number of pressure iteration in one time step
|
||||||
|
eps 0.0001 # stopping tolerance for pressure iteration
|
||||||
|
rho 0.52
|
||||||
|
omg 1.8 # relaxation parameter for SOR iteration
|
||||||
|
gamma 0.9 # upwind differencing factor gamma
|
||||||
|
|
||||||
|
# Particle Tracing Data:
|
||||||
|
# -----------------------
|
||||||
|
|
||||||
|
numberOfParticles 200
|
||||||
|
startTime 0
|
||||||
|
injectTimePeriod 1.0
|
||||||
|
writeTimePeriod 0.5
|
||||||
|
|
||||||
|
x1 0.0
|
||||||
|
y1 0.5
|
||||||
|
x2 0.0
|
||||||
|
y2 1.5
|
||||||
|
|
||||||
|
# Obstacle Geometry Data:
|
||||||
|
# -----------------------
|
||||||
|
# Shape 0 disable, 1 Rectangle/Square, 2 Circle
|
||||||
|
|
||||||
|
shape 1
|
||||||
|
xCenter 0.0
|
||||||
|
yCenter 0.0
|
||||||
|
xRectLength 2.0
|
||||||
|
yRectLength 1.0
|
||||||
|
circleRadius 1.0
|
||||||
|
|
||||||
|
#===============================================================================
|
||||||
@ -19,7 +19,7 @@ re 100.0 # Reynolds number
|
|||||||
|
|
||||||
u_init 1.0 # initial value for velocity in x-direction
|
u_init 1.0 # initial value for velocity in x-direction
|
||||||
v_init 0.0 # initial value for velocity in y-direction
|
v_init 0.0 # initial value for velocity in y-direction
|
||||||
p_init 0.0 # initial value for pressure
|
p_init 1.0 # initial value for pressure
|
||||||
|
|
||||||
# Geometry Data:
|
# Geometry Data:
|
||||||
# -------------
|
# -------------
|
||||||
@ -40,22 +40,33 @@ tau 0.5 # safety factor for time stepsize control (<0 constant delt)
|
|||||||
# -----------------------
|
# -----------------------
|
||||||
|
|
||||||
itermax 500 # maximal number of pressure iteration in one time step
|
itermax 500 # maximal number of pressure iteration in one time step
|
||||||
eps 0.00001 # stopping tolerance for pressure iteration
|
eps 0.0001 # stopping tolerance for pressure iteration
|
||||||
rho 0.52 #
|
rho 0.52
|
||||||
omg 1.8 # relaxation parameter for SOR iteration
|
omg 1.8 # relaxation parameter for SOR iteration
|
||||||
gamma 0.9 # upwind differencing factor gamma
|
gamma 0.9 # upwind differencing factor gamma
|
||||||
|
|
||||||
|
|
||||||
# Particle Tracing Data:
|
# Particle Tracing Data:
|
||||||
# -----------------------
|
# -----------------------
|
||||||
|
|
||||||
numberOfParticles 30
|
numberOfParticles 60
|
||||||
startTime 10
|
startTime 500
|
||||||
injectTimePeriod 2.0
|
injectTimePeriod 2.0
|
||||||
writeTimePeriod 2.0
|
writeTimePeriod 0.5
|
||||||
|
|
||||||
x1 1.0
|
x1 1.0
|
||||||
y1 0.0
|
y1 0.0
|
||||||
x2 1.0
|
x2 1.0
|
||||||
y2 4.0
|
y2 4.0
|
||||||
|
|
||||||
|
# Obstacle Geometry Data:
|
||||||
|
# -----------------------
|
||||||
|
# Shape 0 disable, 1 Rectangle/Square, 2 Circle
|
||||||
|
|
||||||
|
shape 1
|
||||||
|
xCenter 10.0
|
||||||
|
yCenter 2
|
||||||
|
xRectLength 6.0
|
||||||
|
yRectLength 1.0
|
||||||
|
circleRadius 1.0
|
||||||
|
|
||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|||||||
72
BasicSolver/2D-mpi-v3/karman.par
Normal file
72
BasicSolver/2D-mpi-v3/karman.par
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
#==============================================================================
|
||||||
|
# Laminar Canal Flow
|
||||||
|
#==============================================================================
|
||||||
|
|
||||||
|
# Problem specific Data:
|
||||||
|
# ---------------------
|
||||||
|
|
||||||
|
name karman # name of flow setup
|
||||||
|
|
||||||
|
bcTop 1 # flags for boundary conditions
|
||||||
|
bcBottom 1 # 1 = no-slip 3 = outflow
|
||||||
|
bcLeft 3 # 2 = free-slip 4 = periodic
|
||||||
|
bcRight 3 #
|
||||||
|
|
||||||
|
gx 0.0 # Body forces (e.g. gravity)
|
||||||
|
gy 0.0 #
|
||||||
|
|
||||||
|
re 5050.0 # Reynolds number
|
||||||
|
|
||||||
|
u_init 1.0 # initial value for velocity in x-direction
|
||||||
|
v_init 0.0 # initial value for velocity in y-direction
|
||||||
|
p_init 0.0 # initial value for pressure
|
||||||
|
|
||||||
|
# Geometry Data:
|
||||||
|
# -------------
|
||||||
|
|
||||||
|
xlength 30.0 # domain size in x-direction
|
||||||
|
ylength 8.0 # domain size in y-direction
|
||||||
|
imax 400 # number of interior cells in x-direction
|
||||||
|
jmax 200 # number of interior cells in y-direction
|
||||||
|
|
||||||
|
# Time Data:
|
||||||
|
# ---------
|
||||||
|
|
||||||
|
te 150.0 # final time
|
||||||
|
dt 0.02 # time stepsize
|
||||||
|
tau 0.5 # safety factor for time stepsize control (<0 constant delt)
|
||||||
|
|
||||||
|
# Pressure Iteration Data:
|
||||||
|
# -----------------------
|
||||||
|
|
||||||
|
itermax 200 # maximal number of pressure iteration in one time step
|
||||||
|
eps 0.001 # stopping tolerance for pressure iteration
|
||||||
|
rho 0.52
|
||||||
|
omg 1.75 # relaxation parameter for SOR iteration
|
||||||
|
gamma 0.9 # upwind differencing factor gamma
|
||||||
|
|
||||||
|
# Particle Tracing Data:
|
||||||
|
# -----------------------
|
||||||
|
|
||||||
|
numberOfParticles 200
|
||||||
|
startTime 50
|
||||||
|
injectTimePeriod 1.0
|
||||||
|
writeTimePeriod 0.5
|
||||||
|
|
||||||
|
x1 0.0
|
||||||
|
y1 3.8
|
||||||
|
x2 0.0
|
||||||
|
y2 4.1
|
||||||
|
|
||||||
|
# Obstacle Geometry Data:
|
||||||
|
# -----------------------
|
||||||
|
# Shape 0 disable, 1 Rectangle/Square, 2 Circle
|
||||||
|
|
||||||
|
shape 2
|
||||||
|
xCenter 5.0
|
||||||
|
yCenter 4.0
|
||||||
|
xRectLength 2.0
|
||||||
|
yRectLength 1.0
|
||||||
|
circleRadius 1.0
|
||||||
|
|
||||||
|
#===============================================================================
|
||||||
File diff suppressed because it is too large
Load Diff
@ -11,18 +11,14 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "parameter.h"
|
#include "parameter.h"
|
||||||
#include "progress.h"
|
|
||||||
#include "solver.h"
|
|
||||||
#include "timing.h"
|
|
||||||
#include "particletracing.h"
|
#include "particletracing.h"
|
||||||
#include "vtkWriter.h"
|
#include "progress.h"
|
||||||
|
#include "timing.h"
|
||||||
#include <mpi.h>
|
#include <mpi.h>
|
||||||
|
|
||||||
|
|
||||||
enum VARIANT { SOR = 1, RB, RBA };
|
enum VARIANT { SOR = 1, RB, RBA };
|
||||||
|
|
||||||
int main (int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
int rank;
|
int rank;
|
||||||
int variant = RB;
|
int variant = RB;
|
||||||
@ -32,7 +28,6 @@ int main (int argc, char** argv)
|
|||||||
Solver solver;
|
Solver solver;
|
||||||
ParticleTracer particletracer;
|
ParticleTracer particletracer;
|
||||||
|
|
||||||
|
|
||||||
MPI_Init(&argc, &argv);
|
MPI_Init(&argc, &argv);
|
||||||
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
|
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
|
||||||
initParameter(¶ms);
|
initParameter(¶ms);
|
||||||
@ -43,15 +38,13 @@ int main (int argc, char** argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
readParameter(¶ms, argv[1]);
|
readParameter(¶ms, argv[1]);
|
||||||
if (argc == 3)
|
if (argc == 3) {
|
||||||
{
|
|
||||||
variant = atoi(argv[2]);
|
variant = atoi(argv[2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
initSolver(&solver, ¶ms);
|
initSolver(&solver, ¶ms);
|
||||||
initParticleTracer(&particletracer, ¶ms, &solver);
|
initParticleTracer(&particletracer, ¶ms, &solver);
|
||||||
if (rank == 0)
|
if (rank == 0) {
|
||||||
{
|
|
||||||
printParameter(¶ms);
|
printParameter(¶ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -62,29 +55,27 @@ int main (int argc, char** argv)
|
|||||||
double te = solver.te;
|
double te = solver.te;
|
||||||
double t = 0.0;
|
double t = 0.0;
|
||||||
|
|
||||||
int (*solver_generic[])() = {solve, solveRB, solveRBA};
|
int (*solver_generic[])() = { solve, solveRB, solveRBA };
|
||||||
|
|
||||||
|
|
||||||
S = getTimeStamp();
|
S = getTimeStamp();
|
||||||
|
|
||||||
while (t <= te)
|
while (t <= te) {
|
||||||
{
|
|
||||||
if (tau > 0.0) {
|
if (tau > 0.0) {
|
||||||
computeTimestep(&solver);
|
computeTimestep(&solver);
|
||||||
}
|
}
|
||||||
|
|
||||||
setBoundaryConditions(&solver);
|
setBoundaryConditions(&solver);
|
||||||
setSpecialBoundaryCondition(&solver);
|
setSpecialBoundaryCondition(&solver);
|
||||||
|
setObjectBoundaryCondition(&solver);
|
||||||
computeFG(&solver);
|
computeFG(&solver);
|
||||||
computeRHS(&solver);
|
computeRHS(&solver);
|
||||||
solver_generic[variant - 1](&solver);
|
solver_generic[variant - 1](&solver);
|
||||||
adaptUV(&solver);
|
adaptUV(&solver);
|
||||||
|
|
||||||
//trace(&particletracer, solver.u, solver.v, t);
|
trace(&particletracer, solver.u, solver.v, solver.s, t);
|
||||||
|
|
||||||
t += solver.dt;
|
t += solver.dt;
|
||||||
|
|
||||||
|
|
||||||
#ifdef VERBOSE
|
#ifdef VERBOSE
|
||||||
if (rank == 0) {
|
if (rank == 0) {
|
||||||
printf("TIME %f , TIMESTEP %f\n", t, solver.dt);
|
printf("TIME %f , TIMESTEP %f\n", t, solver.dt);
|
||||||
@ -102,7 +93,6 @@ int main (int argc, char** argv)
|
|||||||
collectResult(&solver);
|
collectResult(&solver);
|
||||||
freeParticles(&particletracer);
|
freeParticles(&particletracer);
|
||||||
|
|
||||||
|
|
||||||
MPI_Finalize();
|
MPI_Finalize();
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,7 +25,6 @@ void initParameter(Parameter* param)
|
|||||||
param->gamma = 0.9;
|
param->gamma = 0.9;
|
||||||
param->tau = 0.5;
|
param->tau = 0.5;
|
||||||
param->rho = 0.99;
|
param->rho = 0.99;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void readParameter(Parameter* param, const char* filename)
|
void readParameter(Parameter* param, const char* filename)
|
||||||
@ -82,7 +81,6 @@ void readParameter(Parameter* param, const char* filename)
|
|||||||
PARSE_REAL(p_init);
|
PARSE_REAL(p_init);
|
||||||
PARSE_REAL(rho);
|
PARSE_REAL(rho);
|
||||||
|
|
||||||
|
|
||||||
/* Added new particle tracing parameters */
|
/* Added new particle tracing parameters */
|
||||||
PARSE_INT(numberOfParticles);
|
PARSE_INT(numberOfParticles);
|
||||||
PARSE_REAL(startTime);
|
PARSE_REAL(startTime);
|
||||||
@ -92,6 +90,14 @@ void readParameter(Parameter* param, const char* filename)
|
|||||||
PARSE_REAL(y1);
|
PARSE_REAL(y1);
|
||||||
PARSE_REAL(x2);
|
PARSE_REAL(x2);
|
||||||
PARSE_REAL(y2);
|
PARSE_REAL(y2);
|
||||||
|
|
||||||
|
/* Added obstacle geometry parameters */
|
||||||
|
PARSE_INT(shape);
|
||||||
|
PARSE_REAL(xCenter);
|
||||||
|
PARSE_REAL(yCenter);
|
||||||
|
PARSE_REAL(xRectLength);
|
||||||
|
PARSE_REAL(yRectLength);
|
||||||
|
PARSE_REAL(circleRadius);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -23,6 +23,9 @@ typedef struct {
|
|||||||
double startTime, injectTimePeriod, writeTimePeriod;
|
double startTime, injectTimePeriod, writeTimePeriod;
|
||||||
|
|
||||||
double x1, y1, x2, y2;
|
double x1, y1, x2, y2;
|
||||||
|
|
||||||
|
int shape;
|
||||||
|
double xCenter, yCenter, xRectLength, yRectLength, circleRadius;
|
||||||
} Parameter;
|
} Parameter;
|
||||||
|
|
||||||
void initParameter(Parameter*);
|
void initParameter(Parameter*);
|
||||||
|
|||||||
@ -10,10 +10,11 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "vtkWriter.h"
|
#include "particletracing.h"
|
||||||
|
|
||||||
#define U(i, j) u[(j) * (imaxLocal + 2) + (i)]
|
#define U(i, j) u[(j) * (imaxLocal + 2) + (i)]
|
||||||
#define V(i, j) v[(j) * (imaxLocal + 2) + (i)]
|
#define V(i, j) v[(j) * (imaxLocal + 2) + (i)]
|
||||||
|
#define S(i, j) s[(j) * (imaxLocal + 2) + (i)]
|
||||||
|
|
||||||
static int ts = 0;
|
static int ts = 0;
|
||||||
|
|
||||||
@ -29,32 +30,7 @@ static double sum(int* sizes, int size)
|
|||||||
{
|
{
|
||||||
double sum = 0;
|
double sum = 0;
|
||||||
|
|
||||||
for (int i = 0; i < size; ++i)
|
for (int i = 0; i < size; ++i) {
|
||||||
{
|
|
||||||
sum += sizes[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
return sum;
|
|
||||||
}
|
|
||||||
|
|
||||||
static double sumX(double* sizes, int size, int offset, int coord, int init)
|
|
||||||
{
|
|
||||||
double sum = 0;
|
|
||||||
|
|
||||||
for (int i = init; i < size && coord > 0; i+=offset, --coord)
|
|
||||||
{
|
|
||||||
sum += sizes[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
return sum;
|
|
||||||
}
|
|
||||||
|
|
||||||
static double sumY(double* sizes, int size, int offset, int coord, int init)
|
|
||||||
{
|
|
||||||
double sum = 0;
|
|
||||||
|
|
||||||
for (int i = init * offset; i < size && coord > 0; ++i, --coord)
|
|
||||||
{
|
|
||||||
sum += sizes[i];
|
sum += sizes[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -95,30 +71,34 @@ void printUV(ParticleTracer* particletracer, double* u, double* v)
|
|||||||
|
|
||||||
void printParticles(ParticleTracer* particletracer)
|
void printParticles(ParticleTracer* particletracer)
|
||||||
{
|
{
|
||||||
for(int i = 0; i < particletracer->totalParticles; ++i)
|
for (int i = 0; i < particletracer->totalParticles; ++i) {
|
||||||
{
|
printf("Rank : %d Particle position X : %.2f, Y : %.2f, flag : %d, total pt : "
|
||||||
printf("Rank : %d Particle position X : %.2f, Y : %.2f, flag : %d, total pt : %d, pointer : %d, xOffset : %.2f, yOffset : %.2f, xOffsetEnd : %.2f, yOffsetEnd : %.2f\n",
|
"%d, pointer : %d, xOffset : %.2f, yOffset : %.2f, xOffsetEnd : %.2f, "
|
||||||
|
"yOffsetEnd : %.2f\n",
|
||||||
particletracer->rank,
|
particletracer->rank,
|
||||||
particletracer->particlePool[i].x,
|
particletracer->particlePool[i].x,
|
||||||
particletracer->particlePool[i].y,
|
particletracer->particlePool[i].y,
|
||||||
particletracer->particlePool[i].flag,
|
particletracer->particlePool[i].flag,
|
||||||
particletracer->totalParticles,
|
particletracer->totalParticles,
|
||||||
particletracer->pointer,
|
particletracer->pointer,
|
||||||
particletracer->xOffset, particletracer->yOffset,
|
particletracer->xOffset,
|
||||||
particletracer->xOffsetEnd, particletracer->yOffsetEnd);
|
particletracer->yOffset,
|
||||||
|
particletracer->xOffsetEnd,
|
||||||
|
particletracer->yOffsetEnd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void injectParticles(ParticleTracer* particletracer)
|
void injectParticles(ParticleTracer* particletracer)
|
||||||
{
|
{
|
||||||
double x, y;
|
double x, y;
|
||||||
for(int i = 0; i < particletracer->numberOfParticles; ++i)
|
for (int i = 0; i < particletracer->numberOfParticles; ++i) {
|
||||||
{
|
|
||||||
x = particletracer->linSpaceLine[i].x;
|
x = particletracer->linSpaceLine[i].x;
|
||||||
y = particletracer->linSpaceLine[i].y;
|
y = particletracer->linSpaceLine[i].y;
|
||||||
if(x >= particletracer->xOffset && y >= particletracer->yOffset && x <= particletracer->xOffsetEnd && y <= particletracer->yOffsetEnd )
|
if (x >= particletracer->xOffset && y >= particletracer->yOffset &&
|
||||||
{
|
x <= particletracer->xOffsetEnd && y <= particletracer->yOffsetEnd) {
|
||||||
// printf("\nRank : %d\n", particletracer->rank);
|
// printf("\nRank : %d\n", particletracer->rank);
|
||||||
// printf("\t%.2f >= %.2f && %.2f >= %.2f && %.2f <= %.2f && %.2f <= %.2f\n",x , particletracer->xOffset ,y , particletracer->yOffset, x , particletracer->xOffsetEnd ,y , particletracer->yOffsetEnd);
|
// printf("\t%.2f >= %.2f && %.2f >= %.2f && %.2f <= %.2f && %.2f <= %.2f\n",x
|
||||||
|
// , particletracer->xOffset ,y , particletracer->yOffset, x ,
|
||||||
|
// particletracer->xOffsetEnd ,y , particletracer->yOffsetEnd);
|
||||||
|
|
||||||
particletracer->particlePool[particletracer->pointer].x = x;
|
particletracer->particlePool[particletracer->pointer].x = x;
|
||||||
particletracer->particlePool[particletracer->pointer].y = y;
|
particletracer->particlePool[particletracer->pointer].y = y;
|
||||||
@ -129,7 +109,11 @@ void injectParticles(ParticleTracer* particletracer)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void advanceParticles(ParticleTracer* particletracer, double* restrict u, double* restrict v, double time)
|
void advanceParticles(ParticleTracer* particletracer,
|
||||||
|
double* restrict u,
|
||||||
|
double* restrict v,
|
||||||
|
int* restrict s,
|
||||||
|
double time)
|
||||||
{
|
{
|
||||||
int imax = particletracer->imax;
|
int imax = particletracer->imax;
|
||||||
int jmax = particletracer->jmax;
|
int jmax = particletracer->jmax;
|
||||||
@ -142,12 +126,10 @@ void advanceParticles(ParticleTracer* particletracer, double* restrict u, double
|
|||||||
double xlength = particletracer->xlength;
|
double xlength = particletracer->xlength;
|
||||||
double ylength = particletracer->ylength;
|
double ylength = particletracer->ylength;
|
||||||
|
|
||||||
Particle buff[particletracer->size][30];
|
Particle buff[particletracer->size][100];
|
||||||
|
|
||||||
for(int i = 0; i < particletracer->size; ++i)
|
for (int i = 0; i < particletracer->size; ++i) {
|
||||||
{
|
for (int j = 0; j < 100; ++j) {
|
||||||
for(int j = 0; j < 30; ++j)
|
|
||||||
{
|
|
||||||
buff[i][j].x = 0.0;
|
buff[i][j].x = 0.0;
|
||||||
buff[i][j].y = 0.0;
|
buff[i][j].y = 0.0;
|
||||||
buff[i][j].flag = false;
|
buff[i][j].flag = false;
|
||||||
@ -157,11 +139,8 @@ void advanceParticles(ParticleTracer* particletracer, double* restrict u, double
|
|||||||
|
|
||||||
memset(particleBufIndex, 0, sizeof(particleBufIndex));
|
memset(particleBufIndex, 0, sizeof(particleBufIndex));
|
||||||
|
|
||||||
|
for (int i = 0; i < particletracer->totalParticles; ++i) {
|
||||||
for(int i = 0; i < particletracer->totalParticles; ++i)
|
if (particletracer->particlePool[i].flag == true) {
|
||||||
{
|
|
||||||
if(particletracer->particlePool[i].flag == true)
|
|
||||||
{
|
|
||||||
double xTemp = particletracer->particlePool[i].x;
|
double xTemp = particletracer->particlePool[i].x;
|
||||||
double yTemp = particletracer->particlePool[i].y;
|
double yTemp = particletracer->particlePool[i].y;
|
||||||
|
|
||||||
@ -203,24 +182,35 @@ void advanceParticles(ParticleTracer* particletracer, double* restrict u, double
|
|||||||
particletracer->particlePool[i].y = new_y;
|
particletracer->particlePool[i].y = new_y;
|
||||||
|
|
||||||
// printf("Rank : %d\n", particletracer->rank);
|
// printf("Rank : %d\n", particletracer->rank);
|
||||||
// printf("\tOld X : %.2f, translated X : %.2f, xOffset : %.2f, New X : %.2f, iCoord : %d\n\tOld Y : %.2f, translated X : %.2f, yOffset : %.2f, New Y : %.2f, jCoord : %d\n\n",xTemp, x, particletracer->xOffset, new_x, iCoord, yTemp, y, particletracer->yOffset , new_y, jCoord);
|
// printf("\tOld X : %.2f, translated X : %.2f, xOffset : %.2f, New X : %.2f,
|
||||||
// printf("\tU(iCoord - 1, jCoord - 1) : %.2f, U(iCoord, jCoord - 1) : %.2f, U(iCoord - 1, jCoord) : %.2f, U(iCoord, jCoord) : %.2f\n", U(iCoord - 1, jCoord - 1), U(iCoord, jCoord - 1), U(iCoord - 1, jCoord), U(iCoord, jCoord));
|
// iCoord : %d\n\tOld Y : %.2f, translated X : %.2f, yOffset : %.2f, New Y :
|
||||||
// printf("\tV(iCoord - 1, jCoord - 1) : %.2f, V(iCoord, jCoord - 1) : %.2f, V(iCoord - 1, jCoord) : %.2f, V(iCoord, jCoord) : %.2f\n\n", V(iCoord - 1, jCoord - 1), V(iCoord, jCoord - 1), V(iCoord - 1, jCoord), V(iCoord, jCoord));
|
// %.2f, jCoord : %d\n\n",xTemp, x, particletracer->xOffset, new_x, iCoord,
|
||||||
//printf("\t U N : %.2f, V N : %.2f\n\n", u_n, v_n);
|
// yTemp, y, particletracer->yOffset , new_y, jCoord); printf("\tU(iCoord - 1,
|
||||||
|
// jCoord - 1) : %.2f, U(iCoord, jCoord - 1) : %.2f, U(iCoord - 1, jCoord) :
|
||||||
|
// %.2f, U(iCoord, jCoord) : %.2f\n", U(iCoord - 1, jCoord - 1), U(iCoord,
|
||||||
|
// jCoord - 1), U(iCoord - 1, jCoord), U(iCoord, jCoord)); printf("\tV(iCoord
|
||||||
|
// - 1, jCoord - 1) : %.2f, V(iCoord, jCoord - 1) : %.2f, V(iCoord - 1,
|
||||||
|
// jCoord) : %.2f, V(iCoord, jCoord) : %.2f\n\n", V(iCoord - 1, jCoord - 1),
|
||||||
|
// V(iCoord, jCoord - 1), V(iCoord - 1, jCoord), V(iCoord, jCoord));
|
||||||
|
// printf("\t U N : %.2f, V N : %.2f\n\n", u_n, v_n);
|
||||||
|
|
||||||
if (((new_x < particletracer->xOffset) || (new_x >= particletracer->xOffsetEnd) ||
|
if (((new_x < particletracer->xOffset) ||
|
||||||
(new_y < particletracer->yOffset) || (new_y >= particletracer->yOffsetEnd)))
|
(new_x >= particletracer->xOffsetEnd) ||
|
||||||
{
|
(new_y < particletracer->yOffset) ||
|
||||||
//New logic to transfer particles to neighbouring ranks or discard the particle.
|
(new_y >= particletracer->yOffsetEnd))) {
|
||||||
|
// New logic to transfer particles to neighbouring ranks or discard the
|
||||||
|
// particle.
|
||||||
|
|
||||||
for(int i = 0; i < particletracer->size; ++i)
|
for (int i = 0; i < particletracer->size; ++i) {
|
||||||
{
|
if ((new_x >=
|
||||||
if((new_x >= particletracer->offset[i + particletracer->size * XOFFSET]) &&
|
particletracer->offset[i + particletracer->size * XOFFSET]) &&
|
||||||
(new_x <= particletracer->offset[i + particletracer->size * XOFFSETEND]) &&
|
(new_x <= particletracer
|
||||||
(new_y >= particletracer->offset[i + particletracer->size * YOFFSET]) &&
|
->offset[i + particletracer->size * XOFFSETEND]) &&
|
||||||
(new_y <= particletracer->offset[i + particletracer->size * YOFFSETEND]) &&
|
(new_y >=
|
||||||
i != particletracer->rank)
|
particletracer->offset[i + particletracer->size * YOFFSET]) &&
|
||||||
{
|
(new_y <= particletracer
|
||||||
|
->offset[i + particletracer->size * YOFFSETEND]) &&
|
||||||
|
i != particletracer->rank) {
|
||||||
buff[i][particleBufIndex[i]].x = new_x;
|
buff[i][particleBufIndex[i]].x = new_x;
|
||||||
buff[i][particleBufIndex[i]].y = new_y;
|
buff[i][particleBufIndex[i]].y = new_y;
|
||||||
buff[i][particleBufIndex[i]].flag = true;
|
buff[i][particleBufIndex[i]].flag = true;
|
||||||
@ -229,33 +219,46 @@ void advanceParticles(ParticleTracer* particletracer, double* restrict u, double
|
|||||||
}
|
}
|
||||||
particletracer->particlePool[i].flag = false;
|
particletracer->particlePool[i].flag = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int i_new = new_x / dx, j_new = new_y / dy;
|
||||||
|
int iOffset = particletracer->xOffset / dx,
|
||||||
|
jOffset = particletracer->yOffset / dy;
|
||||||
|
|
||||||
|
if (S(i_new - iOffset, j_new - jOffset) != NONE) {
|
||||||
|
particletracer->particlePool[i].flag = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(int i = 0; i < particletracer->size; ++i)
|
for (int i = 0; i < particletracer->size; ++i) {
|
||||||
{
|
if (i != particletracer->rank) {
|
||||||
if(i != particletracer->rank)
|
MPI_Send(buff[i],
|
||||||
{
|
100,
|
||||||
MPI_Send(buff[i], 30, particletracer->mpi_particle, i, 0, particletracer->comm);
|
particletracer->mpi_particle,
|
||||||
|
i,
|
||||||
|
0,
|
||||||
|
particletracer->comm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for(int i = 0; i < particletracer->size; ++i)
|
for (int i = 0; i < particletracer->size; ++i) {
|
||||||
{
|
if (i != particletracer->rank) {
|
||||||
if(i != particletracer->rank)
|
MPI_Recv(buff[i],
|
||||||
{
|
100,
|
||||||
MPI_Recv(buff[i], 30, particletracer->mpi_particle, i, 0, particletracer->comm, MPI_STATUS_IGNORE);
|
particletracer->mpi_particle,
|
||||||
|
i,
|
||||||
|
0,
|
||||||
|
particletracer->comm,
|
||||||
|
MPI_STATUS_IGNORE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for(int i = 0; i < particletracer->size; ++i)
|
for (int i = 0; i < particletracer->size; ++i) {
|
||||||
{
|
if (i != particletracer->rank) {
|
||||||
if(i != particletracer->rank)
|
for (int j = 0; j < 100; ++j) {
|
||||||
{
|
if (buff[i][j].flag == true) {
|
||||||
for(int j = 0; j < 30; ++j)
|
particletracer->particlePool[particletracer->pointer].x = buff[i][j]
|
||||||
{
|
.x;
|
||||||
if(buff[i][j].flag == true)
|
particletracer->particlePool[particletracer->pointer].y = buff[i][j]
|
||||||
{
|
.y;
|
||||||
particletracer->particlePool[particletracer->pointer].x = buff[i][j].x;
|
|
||||||
particletracer->particlePool[particletracer->pointer].y = buff[i][j].y;
|
|
||||||
particletracer->particlePool[particletracer->pointer].flag = true;
|
particletracer->particlePool[particletracer->pointer].flag = true;
|
||||||
++(particletracer->pointer);
|
++(particletracer->pointer);
|
||||||
++(particletracer->totalParticles);
|
++(particletracer->totalParticles);
|
||||||
@ -276,87 +279,98 @@ void writeParticles(ParticleTracer* particletracer)
|
|||||||
{
|
{
|
||||||
int collectedBuffIndex[particletracer->size];
|
int collectedBuffIndex[particletracer->size];
|
||||||
|
|
||||||
MPI_Gather(&particletracer->totalParticles, 1, MPI_INT, collectedBuffIndex, 1, MPI_INT, 0, particletracer->comm);
|
MPI_Gather(&particletracer->totalParticles,
|
||||||
|
1,
|
||||||
|
MPI_INT,
|
||||||
|
collectedBuffIndex,
|
||||||
|
1,
|
||||||
|
MPI_INT,
|
||||||
|
0,
|
||||||
|
particletracer->comm);
|
||||||
|
|
||||||
if(particletracer->rank != 0)
|
if (particletracer->rank != 0) {
|
||||||
{
|
|
||||||
Particle buff[particletracer->totalParticles];
|
Particle buff[particletracer->totalParticles];
|
||||||
for(int i = 0; i < particletracer->totalParticles; ++i)
|
for (int i = 0; i < particletracer->totalParticles; ++i) {
|
||||||
{
|
|
||||||
buff[i].x = particletracer->particlePool[i].x;
|
buff[i].x = particletracer->particlePool[i].x;
|
||||||
buff[i].y = particletracer->particlePool[i].y;
|
buff[i].y = particletracer->particlePool[i].y;
|
||||||
buff[i].flag = particletracer->particlePool[i].flag;
|
buff[i].flag = particletracer->particlePool[i].flag;
|
||||||
//printf("Rank : %d sending to rank 0 X : %.2f, Y : %.2f with totalpt : %d\n", particletracer->rank, buff[i].x, buff[i].y, particletracer->totalParticles);
|
// printf("Rank : %d sending to rank 0 X : %.2f, Y : %.2f with totalpt :
|
||||||
|
// %d\n", particletracer->rank, buff[i].x, buff[i].y,
|
||||||
|
// particletracer->totalParticles);
|
||||||
}
|
}
|
||||||
MPI_Send(buff, particletracer->totalParticles, particletracer->mpi_particle, 0, 1, particletracer->comm);
|
MPI_Send(buff,
|
||||||
|
particletracer->totalParticles,
|
||||||
|
particletracer->mpi_particle,
|
||||||
|
0,
|
||||||
|
1,
|
||||||
|
particletracer->comm);
|
||||||
}
|
}
|
||||||
if(particletracer->rank == 0)
|
if (particletracer->rank == 0) {
|
||||||
{
|
|
||||||
char filename[50];
|
char filename[50];
|
||||||
FILE* fp;
|
FILE* fp;
|
||||||
|
|
||||||
snprintf(filename, 50, "vtk_files/particles_%d.vtk", ts);
|
snprintf(filename, 50, "vis_files/particles_%d.dat", ts);
|
||||||
fp = fopen(filename, "w");
|
fp = fopen(filename, "w");
|
||||||
|
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
printf("Error!\n");
|
printf("Error!\n");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
fprintf(fp, "# vtk DataFile Version 3.0\n");
|
// fprintf(fp, "# vtk DataFile Version 3.0\n");
|
||||||
fprintf(fp, "PAMPI cfd solver particle tracing file\n");
|
// fprintf(fp, "PAMPI cfd solver particle tracing file\n");
|
||||||
fprintf(fp, "ASCII\n");
|
// fprintf(fp, "ASCII\n");
|
||||||
|
|
||||||
|
// fprintf(fp, "DATASET UNSTRUCTURED_GRID\n");
|
||||||
fprintf(fp, "DATASET UNSTRUCTURED_GRID\n");
|
// fprintf(fp, "FIELD FieldData 2\n");
|
||||||
fprintf(fp, "FIELD FieldData 2\n");
|
// fprintf(fp, "TIME 1 1 double\n");
|
||||||
fprintf(fp, "TIME 1 1 double\n");
|
// fprintf(fp, "%d\n", ts);
|
||||||
fprintf(fp, "%d\n", ts);
|
// fprintf(fp, "CYCLE 1 1 int\n");
|
||||||
fprintf(fp, "CYCLE 1 1 int\n");
|
// fprintf(fp, "1\n");
|
||||||
fprintf(fp, "1\n");
|
|
||||||
|
|
||||||
int overallTotalParticles = sum(collectedBuffIndex, particletracer->size);
|
int overallTotalParticles = sum(collectedBuffIndex, particletracer->size);
|
||||||
|
|
||||||
fprintf(fp, "POINTS %d float\n", overallTotalParticles);
|
// fprintf(fp, "POINTS %d float\n", overallTotalParticles);
|
||||||
|
|
||||||
printf("Total particles : %d\n", overallTotalParticles);
|
// printf("Total particles : %d\n", overallTotalParticles);
|
||||||
|
|
||||||
for (int i = 1; i < particletracer->size; ++i)
|
for (int i = 1; i < particletracer->size; ++i) {
|
||||||
{
|
|
||||||
Particle recvBuff[collectedBuffIndex[i]];
|
Particle recvBuff[collectedBuffIndex[i]];
|
||||||
MPI_Recv(&recvBuff, collectedBuffIndex[i], particletracer->mpi_particle, i, 1, particletracer->comm, MPI_STATUS_IGNORE);
|
MPI_Recv(&recvBuff,
|
||||||
|
collectedBuffIndex[i],
|
||||||
|
particletracer->mpi_particle,
|
||||||
|
i,
|
||||||
|
1,
|
||||||
|
particletracer->comm,
|
||||||
|
MPI_STATUS_IGNORE);
|
||||||
|
|
||||||
for (int j = 0; j < collectedBuffIndex[i]; ++j)
|
for (int j = 0; j < collectedBuffIndex[i]; ++j) {
|
||||||
{
|
|
||||||
double x = recvBuff[j].x;
|
double x = recvBuff[j].x;
|
||||||
double y = recvBuff[j].y;
|
double y = recvBuff[j].y;
|
||||||
fprintf(fp, "%f %f 0\n", x, y);
|
fprintf(fp, "%f %f\n", x, y);
|
||||||
//printf("Rank : 0 receiving from rank %d X : %.2f, Y : %.2f with totalpt : %d\n", i, x, y, particletracer->totalParticles);
|
// printf("Rank : 0 receiving from rank %d X : %.2f, Y : %.2f with totalpt
|
||||||
|
// : %d\n", i, x, y, particletracer->totalParticles);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
for (int i = 0; i < particletracer->totalParticles; ++i) {
|
||||||
for (int i = 0; i < particletracer->totalParticles; ++i)
|
|
||||||
{
|
|
||||||
double x = particletracer->particlePool[i].x;
|
double x = particletracer->particlePool[i].x;
|
||||||
double y = particletracer->particlePool[i].y;
|
double y = particletracer->particlePool[i].y;
|
||||||
fprintf(fp, "%f %f 0\n", x, y);
|
fprintf(fp, "%f %f\n", x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(fp, "CELLS %d %d\n", overallTotalParticles, 2 * overallTotalParticles);
|
// fprintf(fp, "CELLS %d %d\n", overallTotalParticles, 2 * overallTotalParticles);
|
||||||
|
|
||||||
|
// for (int i = 0; i < overallTotalParticles; ++i)
|
||||||
|
// {
|
||||||
|
// fprintf(fp, "1 %d\n", i);
|
||||||
|
// }
|
||||||
|
|
||||||
for (int i = 0; i < overallTotalParticles; ++i)
|
// fprintf(fp, "CELL_TYPES %d\n", overallTotalParticles);
|
||||||
{
|
|
||||||
fprintf(fp, "1 %d\n", i);
|
|
||||||
}
|
|
||||||
|
|
||||||
fprintf(fp, "CELL_TYPES %d\n", overallTotalParticles);
|
// for (int i = 0; i < overallTotalParticles; ++i)
|
||||||
|
// {
|
||||||
|
// fprintf(fp, "1\n");
|
||||||
for (int i = 0; i < overallTotalParticles; ++i)
|
// }
|
||||||
{
|
|
||||||
fprintf(fp, "1\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
}
|
}
|
||||||
@ -401,18 +415,20 @@ void initParticleTracer(ParticleTracer* particletracer, Parameter* params, Solve
|
|||||||
particletracer->imaxLocal = solver->imaxLocal;
|
particletracer->imaxLocal = solver->imaxLocal;
|
||||||
particletracer->jmaxLocal = solver->jmaxLocal;
|
particletracer->jmaxLocal = solver->jmaxLocal;
|
||||||
|
|
||||||
particletracer->estimatedNumParticles = (particletracer->imaxLocal * particletracer->jmaxLocal);
|
particletracer->estimatedNumParticles = (particletracer->imaxLocal *
|
||||||
|
particletracer->jmaxLocal);
|
||||||
|
|
||||||
particletracer->particlePool = malloc(sizeof(Particle) * particletracer->estimatedNumParticles);
|
particletracer->particlePool = malloc(
|
||||||
|
sizeof(Particle) * particletracer->estimatedNumParticles);
|
||||||
|
|
||||||
for(int i = 0; i < particletracer->estimatedNumParticles; ++i)
|
for (int i = 0; i < particletracer->estimatedNumParticles; ++i) {
|
||||||
{
|
|
||||||
particletracer->particlePool[i].x = 0.0;
|
particletracer->particlePool[i].x = 0.0;
|
||||||
particletracer->particlePool[i].y = 0.0;
|
particletracer->particlePool[i].y = 0.0;
|
||||||
particletracer->particlePool[i].flag = false;
|
particletracer->particlePool[i].flag = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
particletracer->linSpaceLine = malloc(sizeof(Particle) * particletracer->numberOfParticles);
|
particletracer->linSpaceLine = malloc(
|
||||||
|
sizeof(Particle) * particletracer->numberOfParticles);
|
||||||
|
|
||||||
/* duplicating communication from solver */
|
/* duplicating communication from solver */
|
||||||
MPI_Comm_dup(solver->comm, &particletracer->comm);
|
MPI_Comm_dup(solver->comm, &particletracer->comm);
|
||||||
@ -420,8 +436,7 @@ void initParticleTracer(ParticleTracer* particletracer, Parameter* params, Solve
|
|||||||
particletracer->rank = solver->rank;
|
particletracer->rank = solver->rank;
|
||||||
particletracer->size = solver->size;
|
particletracer->size = solver->size;
|
||||||
|
|
||||||
particletracer->offset = (double *)malloc(sizeof(double) * 4 * particletracer->size);
|
particletracer->offset = (double*)malloc(sizeof(double) * 4 * particletracer->size);
|
||||||
|
|
||||||
|
|
||||||
memcpy(particletracer->dims, solver->dims, sizeof(solver->dims));
|
memcpy(particletracer->dims, solver->dims, sizeof(solver->dims));
|
||||||
|
|
||||||
@ -431,62 +446,81 @@ void initParticleTracer(ParticleTracer* particletracer, Parameter* params, Solve
|
|||||||
|
|
||||||
memcpy(particletracer->jNeighbours, solver->jNeighbours, sizeof(solver->jNeighbours));
|
memcpy(particletracer->jNeighbours, solver->jNeighbours, sizeof(solver->jNeighbours));
|
||||||
|
|
||||||
|
|
||||||
particletracer->xLocal = particletracer->imaxLocal * particletracer->dx;
|
particletracer->xLocal = particletracer->imaxLocal * particletracer->dx;
|
||||||
particletracer->yLocal = particletracer->jmaxLocal * particletracer->dy;
|
particletracer->yLocal = particletracer->jmaxLocal * particletracer->dy;
|
||||||
|
|
||||||
|
|
||||||
double xLocal[particletracer->size];
|
|
||||||
double yLocal[particletracer->size];
|
|
||||||
|
|
||||||
double offset[4][particletracer->size];
|
double offset[4][particletracer->size];
|
||||||
|
|
||||||
MPI_Allgather(&particletracer->xLocal, 1, MPI_DOUBLE, xLocal, 1, MPI_DOUBLE, particletracer->comm);
|
particletracer->xOffset = solver->xOffset;
|
||||||
MPI_Allgather(&particletracer->yLocal, 1, MPI_DOUBLE, yLocal, 1, MPI_DOUBLE, particletracer->comm);
|
particletracer->yOffset = solver->yOffset;
|
||||||
|
|
||||||
particletracer->xOffset = sumX(xLocal, particletracer->size, particletracer->dims[JDIM], particletracer->coords[IDIM], particletracer->coords[JDIM]);
|
|
||||||
particletracer->yOffset = sumY(yLocal, particletracer->size, particletracer->dims[JDIM], particletracer->coords[JDIM], particletracer->coords[IDIM]);
|
|
||||||
particletracer->xOffsetEnd = particletracer->xOffset + particletracer->xLocal;
|
particletracer->xOffsetEnd = particletracer->xOffset + particletracer->xLocal;
|
||||||
particletracer->yOffsetEnd = particletracer->yOffset + particletracer->yLocal;
|
particletracer->yOffsetEnd = particletracer->yOffset + particletracer->yLocal;
|
||||||
|
|
||||||
printf("Rank : %d, xOffset : %.2f, yOffset : %.2f, xOffsetEnd : %.2f, yOffsetEnd : %.2f\n", particletracer->rank, particletracer->xOffset, particletracer->yOffset, particletracer->xOffsetEnd, particletracer->yOffsetEnd);
|
printf("Rank : %d, xOffset : %.2f, yOffset : %.2f, xOffsetEnd : %.2f, yOffsetEnd : "
|
||||||
|
"%.2f\n",
|
||||||
|
particletracer->rank,
|
||||||
|
particletracer->xOffset,
|
||||||
|
particletracer->yOffset,
|
||||||
|
particletracer->xOffsetEnd,
|
||||||
|
particletracer->yOffsetEnd);
|
||||||
|
|
||||||
MPI_Allgather(&particletracer->xOffset, 1, MPI_DOUBLE, offset[0], 1, MPI_DOUBLE, particletracer->comm);
|
MPI_Allgather(&particletracer->xOffset,
|
||||||
MPI_Allgather(&particletracer->yOffset, 1, MPI_DOUBLE, offset[1], 1, MPI_DOUBLE, particletracer->comm);
|
1,
|
||||||
MPI_Allgather(&particletracer->xOffsetEnd, 1, MPI_DOUBLE, offset[2], 1, MPI_DOUBLE, particletracer->comm);
|
MPI_DOUBLE,
|
||||||
MPI_Allgather(&particletracer->yOffsetEnd, 1, MPI_DOUBLE, offset[3], 1, MPI_DOUBLE, particletracer->comm);
|
offset[0],
|
||||||
|
1,
|
||||||
|
MPI_DOUBLE,
|
||||||
|
particletracer->comm);
|
||||||
|
MPI_Allgather(&particletracer->yOffset,
|
||||||
|
1,
|
||||||
|
MPI_DOUBLE,
|
||||||
|
offset[1],
|
||||||
|
1,
|
||||||
|
MPI_DOUBLE,
|
||||||
|
particletracer->comm);
|
||||||
|
MPI_Allgather(&particletracer->xOffsetEnd,
|
||||||
|
1,
|
||||||
|
MPI_DOUBLE,
|
||||||
|
offset[2],
|
||||||
|
1,
|
||||||
|
MPI_DOUBLE,
|
||||||
|
particletracer->comm);
|
||||||
|
MPI_Allgather(&particletracer->yOffsetEnd,
|
||||||
|
1,
|
||||||
|
MPI_DOUBLE,
|
||||||
|
offset[3],
|
||||||
|
1,
|
||||||
|
MPI_DOUBLE,
|
||||||
|
particletracer->comm);
|
||||||
|
|
||||||
memcpy(particletracer->offset, offset, sizeof(offset));
|
memcpy(particletracer->offset, offset, sizeof(offset));
|
||||||
|
|
||||||
|
|
||||||
// if(particletracer->rank == 0)
|
// if(particletracer->rank == 0)
|
||||||
// {
|
// {
|
||||||
// for(int i = 0;i < particletracer->size; ++i)
|
// for(int i = 0;i < particletracer->size; ++i)
|
||||||
// {
|
// {
|
||||||
// printf("Rank : %d and its xOffset : %.2f, yOffset : %.2f, xLocal : %.2f, yLocal : %.2f, xOffsetEnd : %.2f, yOffsetEnd : %.2f\n",
|
// printf("Rank : %d and its xOffset : %.2f, yOffset : %.2f, xOffsetEnd :
|
||||||
// i, particletracer->offset[i + particletracer->size * XOFFSET],
|
// %.2f, yOffsetEnd : %.2f\n", i, particletracer->offset[i +
|
||||||
// particletracer->offset[i + particletracer->size * YOFFSET], xLocal[i], yLocal[i],
|
// particletracer->size * XOFFSET], particletracer->offset[i +
|
||||||
// particletracer->offset[i + particletracer->size * XOFFSETEND],
|
// particletracer->size * YOFFSET], particletracer->offset[i +
|
||||||
// particletracer->offset[i + particletracer->size * YOFFSETEND]);
|
// particletracer->size * XOFFSETEND], particletracer->offset[i +
|
||||||
|
// particletracer->size * YOFFSETEND]);
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
for (int i = 0; i < particletracer->numberOfParticles; ++i) {
|
||||||
|
|
||||||
for (int i = 0; i < particletracer->numberOfParticles; ++i)
|
|
||||||
{
|
|
||||||
double spacing = (double)i / (double)(particletracer->numberOfParticles - 1);
|
double spacing = (double)i / (double)(particletracer->numberOfParticles - 1);
|
||||||
particletracer->linSpaceLine[i].x = spacing * particletracer->x1 + (1.0 - spacing) * particletracer->x2;
|
particletracer->linSpaceLine[i].x = spacing * particletracer->x1 +
|
||||||
particletracer->linSpaceLine[i].y = spacing * particletracer->y1 + (1.0 - spacing) * particletracer->y2;
|
(1.0 - spacing) * particletracer->x2;
|
||||||
|
particletracer->linSpaceLine[i].y = spacing * particletracer->y1 +
|
||||||
|
(1.0 - spacing) * particletracer->y2;
|
||||||
particletracer->linSpaceLine[i].flag = true;
|
particletracer->linSpaceLine[i].flag = true;
|
||||||
|
|
||||||
//if(particletracer->rank == 1) printf("\nRank : %d, with linspace X : %.2f and linspace Y : %.2f\n", particletracer->rank, particletracer->linSpaceLine[i].x , particletracer->linSpaceLine[i].y);
|
// if(particletracer->rank == 1) printf("\nRank : %d, with linspace X : %.2f and
|
||||||
|
// linspace Y : %.2f\n", particletracer->rank, particletracer->linSpaceLine[i].x ,
|
||||||
|
// particletracer->linSpaceLine[i].y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Create the mpi_particle datatype
|
// Create the mpi_particle datatype
|
||||||
MPI_Datatype mpi_particle;
|
MPI_Datatype mpi_particle;
|
||||||
int lengths[3] = { 1, 1, 1 };
|
int lengths[3] = { 1, 1, 1 };
|
||||||
@ -503,41 +537,65 @@ void initParticleTracer(ParticleTracer* particletracer, Parameter* params, Solve
|
|||||||
displacements[2] = MPI_Aint_diff(displacements[2], base_address);
|
displacements[2] = MPI_Aint_diff(displacements[2], base_address);
|
||||||
|
|
||||||
MPI_Datatype types[3] = { MPI_DOUBLE, MPI_DOUBLE, MPI_C_BOOL };
|
MPI_Datatype types[3] = { MPI_DOUBLE, MPI_DOUBLE, MPI_C_BOOL };
|
||||||
MPI_Type_create_struct(3, lengths, displacements, types, &particletracer->mpi_particle);
|
MPI_Type_create_struct(3,
|
||||||
|
lengths,
|
||||||
|
displacements,
|
||||||
|
types,
|
||||||
|
&particletracer->mpi_particle);
|
||||||
MPI_Type_commit(&particletracer->mpi_particle);
|
MPI_Type_commit(&particletracer->mpi_particle);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void printParticleTracerParameters(ParticleTracer* particletracer)
|
void printParticleTracerParameters(ParticleTracer* particletracer)
|
||||||
{
|
{
|
||||||
printf("Particle Tracing data:\n");
|
printf("Particle Tracing data:\n");
|
||||||
printf("Rank : %d\n", particletracer->rank);
|
printf("Rank : %d\n", particletracer->rank);
|
||||||
printf("\tNumber of particles : %d being injected for every period of %.2f\n", particletracer->numberOfParticles, particletracer->injectTimePeriod);
|
printf("\tNumber of particles : %d being injected for every period of %.2f\n",
|
||||||
|
particletracer->numberOfParticles,
|
||||||
|
particletracer->injectTimePeriod);
|
||||||
printf("\tstartTime : %.2f\n", particletracer->startTime);
|
printf("\tstartTime : %.2f\n", particletracer->startTime);
|
||||||
printf("\t(Line along which the particles are to be injected) \n\tx1 : %.2f, y1 : %.2f, x2 : %.2f, y2 : %.2f\n", particletracer->x1, particletracer->y1, particletracer->x2, particletracer->y2);
|
printf("\t(Line along which the particles are to be injected) \n\tx1 : %.2f, y1 : "
|
||||||
printf("\tPointer : %d, TotalParticles : %d\n", particletracer->pointer, particletracer->totalParticles);
|
"%.2f, x2 : %.2f, y2 : %.2f\n",
|
||||||
printf("\tdt : %.2f, dx : %.2f, dy : %.2f\n", particletracer->dt, particletracer->dx, particletracer->dy);
|
particletracer->x1,
|
||||||
printf("\tcoord[0] : %d, coord[1] : %d\n", particletracer->coords[IDIM], particletracer->coords[JDIM]);
|
particletracer->y1,
|
||||||
printf("\txOffset : %.2f, yOffset : %.2f\n", particletracer->xOffset, particletracer->yOffset);
|
particletracer->x2,
|
||||||
printf("\txOffsetEnd : %.2f, yOffsetEnd : %.2f\n", particletracer->xOffsetEnd, particletracer->yOffsetEnd);
|
particletracer->y2);
|
||||||
printf("\txLocal : %.2f, yLocal : %.2f\n", particletracer->xLocal, particletracer->yLocal);
|
printf("\tPointer : %d, TotalParticles : %d\n",
|
||||||
|
particletracer->pointer,
|
||||||
|
particletracer->totalParticles);
|
||||||
|
printf("\tdt : %.2f, dx : %.2f, dy : %.2f\n",
|
||||||
|
particletracer->dt,
|
||||||
|
particletracer->dx,
|
||||||
|
particletracer->dy);
|
||||||
|
printf("\tcoord[0] : %d, coord[1] : %d\n",
|
||||||
|
particletracer->coords[IDIM],
|
||||||
|
particletracer->coords[JDIM]);
|
||||||
|
printf("\txOffset : %.2f, yOffset : %.2f\n",
|
||||||
|
particletracer->xOffset,
|
||||||
|
particletracer->yOffset);
|
||||||
|
printf("\txOffsetEnd : %.2f, yOffsetEnd : %.2f\n",
|
||||||
|
particletracer->xOffsetEnd,
|
||||||
|
particletracer->yOffsetEnd);
|
||||||
|
printf("\txLocal : %.2f, yLocal : %.2f\n",
|
||||||
|
particletracer->xLocal,
|
||||||
|
particletracer->yLocal);
|
||||||
}
|
}
|
||||||
|
|
||||||
void trace(ParticleTracer* particletracer, double* restrict u, double* restrict v, double time)
|
void trace(ParticleTracer* particletracer,
|
||||||
|
double* restrict u,
|
||||||
|
double* restrict v,
|
||||||
|
int* restrict s,
|
||||||
|
double time)
|
||||||
{
|
{
|
||||||
if (time >= particletracer->startTime)
|
if (time >= particletracer->startTime) {
|
||||||
{
|
if ((time - particletracer->lastInjectTime) >= particletracer->injectTimePeriod) {
|
||||||
if( (time - particletracer->lastInjectTime) >= particletracer->injectTimePeriod)
|
|
||||||
{
|
|
||||||
injectParticles(particletracer);
|
injectParticles(particletracer);
|
||||||
particletracer->lastInjectTime = time;
|
particletracer->lastInjectTime = time;
|
||||||
}
|
}
|
||||||
if( (time - particletracer->lastWriteTime) >= particletracer->writeTimePeriod)
|
if ((time - particletracer->lastWriteTime) >= particletracer->writeTimePeriod) {
|
||||||
{
|
|
||||||
writeParticles(particletracer);
|
writeParticles(particletracer);
|
||||||
particletracer->lastWriteTime = time;
|
particletracer->lastWriteTime = time;
|
||||||
}
|
}
|
||||||
advanceParticles(particletracer, u, v, time);
|
advanceParticles(particletracer, u, v, s, time);
|
||||||
compress(particletracer);
|
compress(particletracer);
|
||||||
particletracer->lastUpdateTime = time;
|
particletracer->lastUpdateTime = time;
|
||||||
}
|
}
|
||||||
@ -548,18 +606,15 @@ void compress(ParticleTracer* particletracer)
|
|||||||
Particle* memPool = particletracer->particlePool;
|
Particle* memPool = particletracer->particlePool;
|
||||||
Particle tempPool[particletracer->totalParticles];
|
Particle tempPool[particletracer->totalParticles];
|
||||||
|
|
||||||
for(int i = 0; i < particletracer->totalParticles; ++i)
|
for (int i = 0; i < particletracer->totalParticles; ++i) {
|
||||||
{
|
|
||||||
tempPool[i].x = 0.0;
|
tempPool[i].x = 0.0;
|
||||||
tempPool[i].y = 0.0;
|
tempPool[i].y = 0.0;
|
||||||
tempPool[i].flag = false;
|
tempPool[i].flag = false;
|
||||||
}
|
}
|
||||||
int totalParticles = 0;
|
int totalParticles = 0;
|
||||||
|
|
||||||
for(int i=0; i < particletracer->totalParticles; ++i)
|
for (int i = 0; i < particletracer->totalParticles; ++i) {
|
||||||
{
|
if (memPool[i].flag == true) {
|
||||||
if(memPool[i].flag == true)
|
|
||||||
{
|
|
||||||
tempPool[totalParticles].x = memPool[i].x;
|
tempPool[totalParticles].x = memPool[i].x;
|
||||||
tempPool[totalParticles].y = memPool[i].y;
|
tempPool[totalParticles].y = memPool[i].y;
|
||||||
tempPool[totalParticles].flag = memPool[i].flag;
|
tempPool[totalParticles].flag = memPool[i].flag;
|
||||||
|
|||||||
@ -8,23 +8,25 @@
|
|||||||
#define __PARTICLETRACING_H_
|
#define __PARTICLETRACING_H_
|
||||||
#include "allocate.h"
|
#include "allocate.h"
|
||||||
#include "parameter.h"
|
#include "parameter.h"
|
||||||
|
|
||||||
#include "solver.h"
|
#include "solver.h"
|
||||||
#include "particletracing.h"
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <mpi.h>
|
#include <mpi.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
#define NDIMS 2
|
#define NDIMS 2
|
||||||
|
|
||||||
typedef enum COORD { X = 0, Y, NCOORD } COORD;
|
typedef enum COORD { X = 0, Y, NCOORD } COORD;
|
||||||
typedef struct
|
|
||||||
{
|
typedef struct {
|
||||||
double x, y;
|
double x, y;
|
||||||
bool flag;
|
bool flag;
|
||||||
} Particle;
|
} Particle;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int numberOfParticles, totalParticles;
|
int numberOfParticles, totalParticles;
|
||||||
double startTime, injectTimePeriod, writeTimePeriod, lastInjectTime, lastUpdateTime, lastWriteTime;
|
double startTime, injectTimePeriod, writeTimePeriod, lastInjectTime, lastUpdateTime,
|
||||||
|
lastWriteTime;
|
||||||
|
|
||||||
int estimatedNumParticles;
|
int estimatedNumParticles;
|
||||||
|
|
||||||
@ -51,13 +53,13 @@ typedef struct {
|
|||||||
|
|
||||||
} ParticleTracer;
|
} ParticleTracer;
|
||||||
|
|
||||||
void initParticleTracer(ParticleTracer*, Parameter*, Solver* );
|
extern void initParticleTracer(ParticleTracer*, Parameter*, Solver*);
|
||||||
void injectParticles(ParticleTracer*);
|
extern void injectParticles(ParticleTracer*);
|
||||||
void advanceParticles(ParticleTracer*, double* , double*, double);
|
extern void advanceParticles(ParticleTracer*, double*, double*, int*, double);
|
||||||
void freeParticles(ParticleTracer*);
|
extern void freeParticles(ParticleTracer*);
|
||||||
void writeParticles(ParticleTracer*);
|
extern void writeParticles(ParticleTracer*);
|
||||||
void printParticleTracerParameters(ParticleTracer*);
|
extern void printParticleTracerParameters(ParticleTracer*);
|
||||||
void printParticles(ParticleTracer*);
|
extern void printParticles(ParticleTracer*);
|
||||||
void trace(ParticleTracer*, double* , double* , double );
|
extern void trace(ParticleTracer*, double*, double*, int*, double);
|
||||||
void compress(ParticleTracer* );
|
extern void compress(ParticleTracer*);
|
||||||
#endif
|
#endif
|
||||||
@ -14,6 +14,7 @@
|
|||||||
#include "allocate.h"
|
#include "allocate.h"
|
||||||
#include "parameter.h"
|
#include "parameter.h"
|
||||||
#include "solver.h"
|
#include "solver.h"
|
||||||
|
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
#define P(i, j) p[(j) * (imaxLocal + 2) + (i)]
|
#define P(i, j) p[(j) * (imaxLocal + 2) + (i)]
|
||||||
@ -21,16 +22,34 @@
|
|||||||
#define G(i, j) g[(j) * (imaxLocal + 2) + (i)]
|
#define G(i, j) g[(j) * (imaxLocal + 2) + (i)]
|
||||||
#define U(i, j) u[(j) * (imaxLocal + 2) + (i)]
|
#define U(i, j) u[(j) * (imaxLocal + 2) + (i)]
|
||||||
#define V(i, j) v[(j) * (imaxLocal + 2) + (i)]
|
#define V(i, j) v[(j) * (imaxLocal + 2) + (i)]
|
||||||
|
#define S(i, j) s[(j) * (imaxLocal + 2) + (i)]
|
||||||
|
|
||||||
#define RHS(i, j) rhs[(j) * (imaxLocal + 2) + (i)]
|
#define RHS(i, j) rhs[(j) * (imaxLocal + 2) + (i)]
|
||||||
|
|
||||||
#define IDIM 0
|
#define IDIM 0
|
||||||
#define JDIM 1
|
#define JDIM 1
|
||||||
|
|
||||||
|
static double sumOffset(double* sizes, int init, int offset, int coord)
|
||||||
|
{
|
||||||
|
double sum = 0;
|
||||||
|
|
||||||
|
for (int i = init - offset; coord > 0; i -= offset, --coord) {
|
||||||
|
sum += sizes[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
return sum;
|
||||||
|
}
|
||||||
|
|
||||||
static int sizeOfRank(int rank, int size, int N)
|
static int sizeOfRank(int rank, int size, int N)
|
||||||
{
|
{
|
||||||
return N / size + ((N % size > rank) ? 1 : 0);
|
return N / size + ((N % size > rank) ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static double distance(double i, double j, double iCenter, double jCenter)
|
||||||
|
{
|
||||||
|
return sqrt(pow(iCenter - i, 2) + pow(jCenter - j, 2) * 1.0);
|
||||||
|
}
|
||||||
|
|
||||||
void print(Solver* solver, double* grid)
|
void print(Solver* solver, double* grid)
|
||||||
{
|
{
|
||||||
int imaxLocal = solver->imaxLocal;
|
int imaxLocal = solver->imaxLocal;
|
||||||
@ -43,7 +62,29 @@ void print(Solver* solver, double* grid)
|
|||||||
for (int j = 0; j < solver->jmaxLocal + 2; j++) {
|
for (int j = 0; j < solver->jmaxLocal + 2; j++) {
|
||||||
printf("%02d: ", j);
|
printf("%02d: ", j);
|
||||||
for (int i = 0; i < solver->imaxLocal + 2; i++) {
|
for (int i = 0; i < solver->imaxLocal + 2; i++) {
|
||||||
printf("%12.8f ", grid[j * (imaxLocal + 2) + i]);
|
printf("%2.2f ", grid[j * (imaxLocal + 2) + i]);
|
||||||
|
}
|
||||||
|
printf("\n");
|
||||||
|
}
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
||||||
|
MPI_Barrier(MPI_COMM_WORLD);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void printInt(Solver* solver, int* grid)
|
||||||
|
{
|
||||||
|
int imaxLocal = solver->imaxLocal;
|
||||||
|
|
||||||
|
for (int i = 0; i < solver->size; i++) {
|
||||||
|
if (i == solver->rank) {
|
||||||
|
printf(
|
||||||
|
"### RANK %d #######################################################\n",
|
||||||
|
solver->rank);
|
||||||
|
for (int j = 0; j < solver->jmaxLocal + 2; j++) {
|
||||||
|
printf("%02d: ", j);
|
||||||
|
for (int i = 0; i < solver->imaxLocal + 2; i++) {
|
||||||
|
printf("%2d ", grid[j * (imaxLocal + 2) + i]);
|
||||||
}
|
}
|
||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
@ -68,6 +109,21 @@ static void exchange(Solver* solver, double* grid)
|
|||||||
solver->comm);
|
solver->comm);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void exchangeInt(Solver* solver, int* grid)
|
||||||
|
{
|
||||||
|
int counts[4] = { 1, 1, 1, 1 };
|
||||||
|
|
||||||
|
MPI_Neighbor_alltoallw(grid,
|
||||||
|
counts,
|
||||||
|
solver->sdisplsInt,
|
||||||
|
solver->bufferIntTypes,
|
||||||
|
grid,
|
||||||
|
counts,
|
||||||
|
solver->rdisplsInt,
|
||||||
|
solver->bufferIntTypes,
|
||||||
|
solver->comm);
|
||||||
|
}
|
||||||
|
|
||||||
static void shift(Solver* solver)
|
static void shift(Solver* solver)
|
||||||
{
|
{
|
||||||
MPI_Request requests[4] = { MPI_REQUEST_NULL,
|
MPI_Request requests[4] = { MPI_REQUEST_NULL,
|
||||||
@ -315,7 +371,6 @@ void initSolver(Solver* solver, Parameter* params)
|
|||||||
solver->gamma = params->gamma;
|
solver->gamma = params->gamma;
|
||||||
solver->rho = params->rho;
|
solver->rho = params->rho;
|
||||||
|
|
||||||
|
|
||||||
/* setup communication */
|
/* setup communication */
|
||||||
MPI_Comm_rank(MPI_COMM_WORLD, &(solver->rank));
|
MPI_Comm_rank(MPI_COMM_WORLD, &(solver->rank));
|
||||||
MPI_Comm_size(MPI_COMM_WORLD, &(solver->size));
|
MPI_Comm_size(MPI_COMM_WORLD, &(solver->size));
|
||||||
@ -350,26 +405,56 @@ void initSolver(Solver* solver, Parameter* params)
|
|||||||
&iBufferType);
|
&iBufferType);
|
||||||
MPI_Type_commit(&iBufferType);
|
MPI_Type_commit(&iBufferType);
|
||||||
|
|
||||||
|
MPI_Datatype jBufferIntType;
|
||||||
|
MPI_Type_contiguous(solver->imaxLocal, MPI_INT, &jBufferIntType);
|
||||||
|
MPI_Type_commit(&jBufferIntType);
|
||||||
|
|
||||||
|
MPI_Datatype iBufferIntType;
|
||||||
|
MPI_Type_vector(solver->jmaxLocal,
|
||||||
|
1,
|
||||||
|
solver->imaxLocal + 2,
|
||||||
|
MPI_INT,
|
||||||
|
&iBufferIntType);
|
||||||
|
MPI_Type_commit(&iBufferIntType);
|
||||||
|
|
||||||
// in the order of the dimensions i->0, j->1
|
// in the order of the dimensions i->0, j->1
|
||||||
// first negative direction, then positive direction
|
// first negative direction, then positive direction
|
||||||
size_t dblsize = sizeof(double);
|
size_t dblsize = sizeof(double);
|
||||||
|
size_t intsize = sizeof(int);
|
||||||
|
|
||||||
int imaxLocal = solver->imaxLocal;
|
int imaxLocal = solver->imaxLocal;
|
||||||
int jmaxLocal = solver->jmaxLocal;
|
int jmaxLocal = solver->jmaxLocal;
|
||||||
|
|
||||||
solver->bufferTypes[0] = iBufferType; // left
|
solver->bufferTypes[0] = iBufferType; // left
|
||||||
solver->bufferTypes[1] = iBufferType; // right
|
solver->bufferTypes[1] = iBufferType; // right
|
||||||
solver->bufferTypes[2] = jBufferType; // bottom
|
solver->bufferTypes[2] = jBufferType; // bottom
|
||||||
solver->bufferTypes[3] = jBufferType; // top
|
solver->bufferTypes[3] = jBufferType; // top
|
||||||
|
|
||||||
|
solver->bufferIntTypes[0] = iBufferIntType; // left
|
||||||
|
solver->bufferIntTypes[1] = iBufferIntType; // right
|
||||||
|
solver->bufferIntTypes[2] = jBufferIntType; // bottom
|
||||||
|
solver->bufferIntTypes[3] = jBufferIntType; // top
|
||||||
|
|
||||||
solver->sdispls[0] = ((imaxLocal + 2) + 1) * dblsize; // send left
|
solver->sdispls[0] = ((imaxLocal + 2) + 1) * dblsize; // send left
|
||||||
solver->sdispls[1] = ((imaxLocal + 2) + imaxLocal) * dblsize; // send right
|
solver->sdispls[1] = ((imaxLocal + 2) + imaxLocal) * dblsize; // send right
|
||||||
solver->sdispls[2] = ((imaxLocal + 2) + 1) * dblsize; // send bottom
|
solver->sdispls[2] = ((imaxLocal + 2) + 1) * dblsize; // send bottom
|
||||||
solver->sdispls[3] = ((jmaxLocal) * (imaxLocal + 2) + 1) * dblsize; // send top
|
solver->sdispls[3] = ((jmaxLocal) * (imaxLocal + 2) + 1) * dblsize; // send top
|
||||||
|
|
||||||
|
solver->sdisplsInt[0] = ((imaxLocal + 2) + 1) * intsize; // send left
|
||||||
|
solver->sdisplsInt[1] = ((imaxLocal + 2) + imaxLocal) * intsize; // send right
|
||||||
|
solver->sdisplsInt[2] = ((imaxLocal + 2) + 1) * intsize; // send bottom
|
||||||
|
solver->sdisplsInt[3] = ((jmaxLocal) * (imaxLocal + 2) + 1) * intsize; // send top
|
||||||
|
|
||||||
solver->rdispls[0] = (imaxLocal + 2) * dblsize; // recv left
|
solver->rdispls[0] = (imaxLocal + 2) * dblsize; // recv left
|
||||||
solver->rdispls[1] = ((imaxLocal + 2) + (imaxLocal + 1)) * dblsize; // recv right
|
solver->rdispls[1] = ((imaxLocal + 2) + (imaxLocal + 1)) * dblsize; // recv right
|
||||||
solver->rdispls[2] = 1 * dblsize; // recv bottom
|
solver->rdispls[2] = 1 * dblsize; // recv bottom
|
||||||
solver->rdispls[3] = ((jmaxLocal + 1) * (imaxLocal + 2) + 1) * dblsize; // recv top
|
solver->rdispls[3] = ((jmaxLocal + 1) * (imaxLocal + 2) + 1) * dblsize; // recv top
|
||||||
|
|
||||||
|
solver->rdisplsInt[0] = (imaxLocal + 2) * intsize; // recv left
|
||||||
|
solver->rdisplsInt[1] = ((imaxLocal + 2) + (imaxLocal + 1)) * intsize; // recv right
|
||||||
|
solver->rdisplsInt[2] = 1 * intsize; // recv bottom
|
||||||
|
solver->rdisplsInt[3] = ((jmaxLocal + 1) * (imaxLocal + 2) + 1) * intsize; // recv top
|
||||||
|
|
||||||
/* allocate arrays */
|
/* allocate arrays */
|
||||||
size_t bytesize = (imaxLocal + 2) * (jmaxLocal + 2) * sizeof(double);
|
size_t bytesize = (imaxLocal + 2) * (jmaxLocal + 2) * sizeof(double);
|
||||||
solver->u = allocate(64, bytesize);
|
solver->u = allocate(64, bytesize);
|
||||||
@ -378,6 +463,7 @@ void initSolver(Solver* solver, Parameter* params)
|
|||||||
solver->rhs = allocate(64, bytesize);
|
solver->rhs = allocate(64, bytesize);
|
||||||
solver->f = allocate(64, bytesize);
|
solver->f = allocate(64, bytesize);
|
||||||
solver->g = allocate(64, bytesize);
|
solver->g = allocate(64, bytesize);
|
||||||
|
solver->s = allocate(64, bytesize);
|
||||||
|
|
||||||
for (int i = 0; i < (imaxLocal + 2) * (jmaxLocal + 2); i++) {
|
for (int i = 0; i < (imaxLocal + 2) * (jmaxLocal + 2); i++) {
|
||||||
solver->u[i] = params->u_init;
|
solver->u[i] = params->u_init;
|
||||||
@ -386,12 +472,119 @@ void initSolver(Solver* solver, Parameter* params)
|
|||||||
solver->rhs[i] = 0.0;
|
solver->rhs[i] = 0.0;
|
||||||
solver->f[i] = 0.0;
|
solver->f[i] = 0.0;
|
||||||
solver->g[i] = 0.0;
|
solver->g[i] = 0.0;
|
||||||
|
solver->s[i] = NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
double dx = solver->dx;
|
double dx = solver->dx;
|
||||||
double dy = solver->dy;
|
double dy = solver->dy;
|
||||||
double inv_sqr_sum = 1.0 / (dx * dx) + 1.0 / (dy * dy);
|
double inv_sqr_sum = 1.0 / (dx * dx) + 1.0 / (dy * dy);
|
||||||
solver->dtBound = 0.5 * solver->re * 1.0 / inv_sqr_sum;
|
solver->dtBound = 0.5 * solver->re * 1.0 / inv_sqr_sum;
|
||||||
|
|
||||||
|
solver->xLocal = solver->imaxLocal * solver->dx;
|
||||||
|
solver->yLocal = solver->jmaxLocal * solver->dy;
|
||||||
|
|
||||||
|
double xLocal[solver->size];
|
||||||
|
double yLocal[solver->size];
|
||||||
|
|
||||||
|
MPI_Allgather(&solver->xLocal, 1, MPI_DOUBLE, xLocal, 1, MPI_DOUBLE, solver->comm);
|
||||||
|
MPI_Allgather(&solver->yLocal, 1, MPI_DOUBLE, yLocal, 1, MPI_DOUBLE, solver->comm);
|
||||||
|
|
||||||
|
solver->xOffset = sumOffset(xLocal, solver->rank, solver->dims[1], solver->coords[0]);
|
||||||
|
solver->yOffset = sumOffset(yLocal, solver->rank, 1, solver->coords[1]);
|
||||||
|
solver->xOffsetEnd = solver->xOffset + solver->xLocal;
|
||||||
|
solver->yOffsetEnd = solver->yOffset + solver->yLocal;
|
||||||
|
|
||||||
|
printf("Rank : %d, xOffset : %.2f, yOffset : %.2f, xOffsetEnd : %.2f, yOffsetEnd : "
|
||||||
|
"%.2f\n",
|
||||||
|
solver->rank,
|
||||||
|
solver->xOffset,
|
||||||
|
solver->yOffset,
|
||||||
|
solver->xOffsetEnd,
|
||||||
|
solver->yOffsetEnd);
|
||||||
|
|
||||||
|
int* s = solver->s;
|
||||||
|
int iOffset = 0, jOffset = 0;
|
||||||
|
|
||||||
|
double xCenter = 0, yCenter = 0, radius = 0;
|
||||||
|
double x1 = 0, x2 = 0, y1 = 0, y2 = 0;
|
||||||
|
|
||||||
|
switch (params->shape) {
|
||||||
|
case NOSHAPE:
|
||||||
|
break;
|
||||||
|
case RECT:
|
||||||
|
x1 = params->xCenter - params->xRectLength / 2;
|
||||||
|
x2 = params->xCenter + params->xRectLength / 2;
|
||||||
|
y1 = params->yCenter - params->yRectLength / 2;
|
||||||
|
y2 = params->yCenter + params->yRectLength / 2;
|
||||||
|
|
||||||
|
iOffset = solver->xOffset / dx;
|
||||||
|
jOffset = solver->yOffset / dy;
|
||||||
|
|
||||||
|
for (int j = 1; j < jmaxLocal + 1; ++j) {
|
||||||
|
for (int i = 1; i < imaxLocal + 1; ++i) {
|
||||||
|
if ((x1 <= ((i + iOffset) * dx)) && (((i + iOffset) * dx) <= x2) &&
|
||||||
|
(y1 <= ((j + jOffset) * dy)) && (((j + jOffset) * dy) <= y2)) {
|
||||||
|
S(i, j) = LOCAL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
case CIRCLE:
|
||||||
|
xCenter = params->xCenter;
|
||||||
|
yCenter = params->yCenter;
|
||||||
|
radius = params->circleRadius;
|
||||||
|
|
||||||
|
iOffset = solver->xOffset / dx;
|
||||||
|
jOffset = solver->yOffset / dy;
|
||||||
|
|
||||||
|
for (int j = 1; j < jmaxLocal + 1; j++) {
|
||||||
|
for (int i = 1; i < imaxLocal + 1; i++) {
|
||||||
|
if (distance(((i + iOffset) * dx),
|
||||||
|
((j + jOffset) * dy),
|
||||||
|
xCenter,
|
||||||
|
yCenter) <= radius) {
|
||||||
|
S(i, j) = LOCAL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
exchangeInt(solver, s);
|
||||||
|
|
||||||
|
for (int j = 1; j < jmaxLocal + 1; j++) {
|
||||||
|
for (int i = 1; i < imaxLocal + 1; i++) {
|
||||||
|
|
||||||
|
if (S(i, j - 1) == NONE && S(i, j + 1) == LOCAL && S(i, j) == LOCAL)
|
||||||
|
S(i, j) = BOTTOM; // BOTTOM
|
||||||
|
if (S(i - 1, j) == NONE && S(i + 1, j) == LOCAL && S(i, j) == LOCAL)
|
||||||
|
S(i, j) = LEFT; // LEFT
|
||||||
|
if (S(i + 1, j) == NONE && S(i - 1, j) == LOCAL && S(i, j) == LOCAL)
|
||||||
|
S(i, j) = RIGHT; // RIGHT
|
||||||
|
if (S(i, j + 1) == NONE && S(i, j - 1) == LOCAL && S(i, j) == LOCAL)
|
||||||
|
S(i, j) = TOP; // TOP
|
||||||
|
if (S(i - 1, j - 1) == NONE && S(i, j - 1) == NONE && S(i - 1, j) == NONE &&
|
||||||
|
S(i + 1, j + 1) == LOCAL &&
|
||||||
|
(S(i, j) == LOCAL || S(i, j) == LEFT || S(i, j) == BOTTOM))
|
||||||
|
S(i, j) = BOTTOMLEFT; // BOTTOMLEFT
|
||||||
|
if (S(i + 1, j - 1) == NONE && S(i, j - 1) == NONE && S(i + 1, j) == NONE &&
|
||||||
|
S(i - 1, j + 1) == LOCAL &&
|
||||||
|
(S(i, j) == LOCAL || S(i, j) == RIGHT || S(i, j) == BOTTOM))
|
||||||
|
S(i, j) = BOTTOMRIGHT; // BOTTOMRIGHT
|
||||||
|
if (S(i - 1, j + 1) == NONE && S(i - 1, j) == NONE && S(i, j + 1) == NONE &&
|
||||||
|
S(i + 1, j - 1) == LOCAL &&
|
||||||
|
(S(i, j) == LOCAL || S(i, j) == LEFT || S(i, j) == TOP))
|
||||||
|
S(i, j) = TOPLEFT; // TOPLEFT
|
||||||
|
if (S(i + 1, j + 1) == NONE && S(i + 1, j) == NONE && S(i, j + 1) == NONE &&
|
||||||
|
S(i - 1, j - 1) == LOCAL &&
|
||||||
|
(S(i, j) == LOCAL || S(i, j) == RIGHT || S(i, j) == TOP))
|
||||||
|
S(i, j) = TOPRIGHT; // TOPRIGHT
|
||||||
|
}
|
||||||
|
}
|
||||||
#ifdef VERBOSE
|
#ifdef VERBOSE
|
||||||
printConfig(solver);
|
printConfig(solver);
|
||||||
#endif
|
#endif
|
||||||
@ -613,7 +806,6 @@ int solveRBA(Solver* solver)
|
|||||||
|
|
||||||
int pass, jsw, isw;
|
int pass, jsw, isw;
|
||||||
|
|
||||||
|
|
||||||
while ((res >= epssq) && (it < itermax)) {
|
while ((res >= epssq) && (it < itermax)) {
|
||||||
res = 0.0;
|
res = 0.0;
|
||||||
jsw = 1;
|
jsw = 1;
|
||||||
@ -685,6 +877,66 @@ int solveRBA(Solver* solver)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setObjectBoundaryCondition(Solver* solver)
|
||||||
|
{
|
||||||
|
int imaxLocal = solver->imaxLocal;
|
||||||
|
int jmaxLocal = solver->jmaxLocal;
|
||||||
|
double* u = solver->u;
|
||||||
|
double* v = solver->v;
|
||||||
|
int* s = solver->s;
|
||||||
|
|
||||||
|
for (int j = 1; j < jmaxLocal + 1; j++) {
|
||||||
|
for (int i = 1; i < imaxLocal + 1; i++) {
|
||||||
|
switch (S(i, j)) {
|
||||||
|
case TOP:
|
||||||
|
U(i, j) = -U(i, j + 1);
|
||||||
|
U(i - 1, j) = -U(i - 1, j + 1);
|
||||||
|
V(i, j) = 0.0;
|
||||||
|
break;
|
||||||
|
case BOTTOM:
|
||||||
|
U(i, j) = -U(i, j - 1);
|
||||||
|
U(i - 1, j) = -U(i - 1, j - 1);
|
||||||
|
V(i, j) = 0.0;
|
||||||
|
break;
|
||||||
|
case LEFT:
|
||||||
|
U(i - 1, j) = 0.0;
|
||||||
|
V(i, j) = -V(i - 1, j);
|
||||||
|
V(i, j - 1) = -V(i - 1, j - 1);
|
||||||
|
break;
|
||||||
|
case RIGHT:
|
||||||
|
U(i, j) = 0.0;
|
||||||
|
V(i, j) = -V(i + 1, j);
|
||||||
|
V(i, j - 1) = -V(i + 1, j - 1);
|
||||||
|
break;
|
||||||
|
case TOPLEFT:
|
||||||
|
U(i, j) = -U(i, j + 1);
|
||||||
|
U(i - 1, j) = 0.0;
|
||||||
|
V(i, j) = 0.0;
|
||||||
|
V(i, j - 1) = -V(i - 1, j - 1);
|
||||||
|
break;
|
||||||
|
case TOPRIGHT:
|
||||||
|
U(i, j) = 0.0;
|
||||||
|
U(i - 1, j) = -U(i - 1, j + 1);
|
||||||
|
V(i, j) = 0.0;
|
||||||
|
V(i, j - 1) = -V(i + 1, j - 1);
|
||||||
|
break;
|
||||||
|
case BOTTOMLEFT:
|
||||||
|
U(i, j) = -U(i, j - 1);
|
||||||
|
U(i - 1, j) = 0.0;
|
||||||
|
V(i, j) = -V(i - 1, j);
|
||||||
|
V(i, j - 1) = 0.0;
|
||||||
|
break;
|
||||||
|
case BOTTOMRIGHT:
|
||||||
|
U(i, j) = 0.0;
|
||||||
|
U(i - 1, j) = -U(i - 1, j - 1);
|
||||||
|
V(i, j) = -V(i, j + 1);
|
||||||
|
V(i, j - 1) = 0.0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static double maxElement(Solver* solver, double* m)
|
static double maxElement(Solver* solver, double* m)
|
||||||
{
|
{
|
||||||
int size = (solver->imaxLocal + 2) * (solver->jmaxLocal + 2);
|
int size = (solver->imaxLocal + 2) * (solver->jmaxLocal + 2);
|
||||||
@ -833,6 +1085,7 @@ void setSpecialBoundaryCondition(Solver* solver)
|
|||||||
int imaxLocal = solver->imaxLocal;
|
int imaxLocal = solver->imaxLocal;
|
||||||
int jmaxLocal = solver->jmaxLocal;
|
int jmaxLocal = solver->jmaxLocal;
|
||||||
double* u = solver->u;
|
double* u = solver->u;
|
||||||
|
int* s = solver->s;
|
||||||
|
|
||||||
if (strcmp(solver->problem, "dcavity") == 0) {
|
if (strcmp(solver->problem, "dcavity") == 0) {
|
||||||
if (solver->coords[JDIM] == (solver->dims[JDIM] - 1)) { // set top bc
|
if (solver->coords[JDIM] == (solver->dims[JDIM] - 1)) { // set top bc
|
||||||
@ -844,21 +1097,31 @@ void setSpecialBoundaryCondition(Solver* solver)
|
|||||||
if (solver->coords[IDIM] == 0) { // set left bc
|
if (solver->coords[IDIM] == 0) { // set left bc
|
||||||
double ylength = solver->ylength;
|
double ylength = solver->ylength;
|
||||||
double dy = solver->dy;
|
double dy = solver->dy;
|
||||||
int rest = solver->jmax % solver->size;
|
|
||||||
int yc = solver->rank * (solver->jmax / solver->size) +
|
int jOffset = solver->yOffset / dy;
|
||||||
MIN(rest, solver->rank);
|
int jOffsetEnd = solver->yOffsetEnd / dy;
|
||||||
double ys = dy * (yc + 0.5);
|
|
||||||
double y;
|
double y;
|
||||||
|
|
||||||
/* printf("RANK %d yc: %d ys: %f\n", solver->rank, yc, ys); */
|
for (int j = 1, jVal = jOffset + 1; j < jmaxLocal + 1; ++jVal, j++) {
|
||||||
|
y = dy * (jVal - 0.5);
|
||||||
for (int j = 1; j < jmaxLocal + 1; j++) {
|
|
||||||
y = ys + dy * (j - 0.5);
|
|
||||||
U(0, j) = y * (ylength - y) * 4.0 / (ylength * ylength);
|
U(0, j) = y * (ylength - y) * 4.0 / (ylength * ylength);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (strcmp(solver->problem, "backstep") == 0) {
|
||||||
|
for (int j = 1; j < jmaxLocal + 1; j++) {
|
||||||
|
if (S(0, j) == NONE) U(0, j) = 1.0;
|
||||||
}
|
}
|
||||||
/* print(solver, solver->u); */
|
} else if (strcmp(solver->problem, "karman") == 0) {
|
||||||
|
for (int j = 1; j < jmaxLocal + 1; j++) {
|
||||||
|
U(0, j) = 1.0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// print(solver, solver->u);
|
||||||
|
|
||||||
|
// MPI_Barrier(solver->comm);
|
||||||
|
// exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void computeFG(Solver* solver)
|
void computeFG(Solver* solver)
|
||||||
@ -867,6 +1130,7 @@ void computeFG(Solver* solver)
|
|||||||
double* v = solver->v;
|
double* v = solver->v;
|
||||||
double* f = solver->f;
|
double* f = solver->f;
|
||||||
double* g = solver->g;
|
double* g = solver->g;
|
||||||
|
int* s = solver->s;
|
||||||
int imaxLocal = solver->imaxLocal;
|
int imaxLocal = solver->imaxLocal;
|
||||||
int jmaxLocal = solver->jmaxLocal;
|
int jmaxLocal = solver->jmaxLocal;
|
||||||
double gx = solver->gx;
|
double gx = solver->gx;
|
||||||
@ -884,6 +1148,7 @@ void computeFG(Solver* solver)
|
|||||||
|
|
||||||
for (int j = 1; j < jmaxLocal + 1; j++) {
|
for (int j = 1; j < jmaxLocal + 1; j++) {
|
||||||
for (int i = 1; i < imaxLocal + 1; i++) {
|
for (int i = 1; i < imaxLocal + 1; i++) {
|
||||||
|
if (S(i, j) == NONE) {
|
||||||
du2dx = inverseDx * 0.25 *
|
du2dx = inverseDx * 0.25 *
|
||||||
((U(i, j) + U(i + 1, j)) * (U(i, j) + U(i + 1, j)) -
|
((U(i, j) + U(i + 1, j)) * (U(i, j) + U(i + 1, j)) -
|
||||||
(U(i, j) + U(i - 1, j)) * (U(i, j) + U(i - 1, j))) +
|
(U(i, j) + U(i - 1, j)) * (U(i, j) + U(i - 1, j))) +
|
||||||
@ -893,19 +1158,24 @@ void computeFG(Solver* solver)
|
|||||||
|
|
||||||
duvdy = inverseDy * 0.25 *
|
duvdy = inverseDy * 0.25 *
|
||||||
((V(i, j) + V(i + 1, j)) * (U(i, j) + U(i, j + 1)) -
|
((V(i, j) + V(i + 1, j)) * (U(i, j) + U(i, j + 1)) -
|
||||||
(V(i, j - 1) + V(i + 1, j - 1)) * (U(i, j) + U(i, j - 1))) +
|
(V(i, j - 1) + V(i + 1, j - 1)) *
|
||||||
|
(U(i, j) + U(i, j - 1))) +
|
||||||
gamma * inverseDy * 0.25 *
|
gamma * inverseDy * 0.25 *
|
||||||
(fabs(V(i, j) + V(i + 1, j)) * (U(i, j) - U(i, j + 1)) +
|
(fabs(V(i, j) + V(i + 1, j)) * (U(i, j) - U(i, j + 1)) +
|
||||||
fabs(V(i, j - 1) + V(i + 1, j - 1)) *
|
fabs(V(i, j - 1) + V(i + 1, j - 1)) *
|
||||||
(U(i, j) - U(i, j - 1)));
|
(U(i, j) - U(i, j - 1)));
|
||||||
|
|
||||||
du2dx2 = inverseDx * inverseDx * (U(i + 1, j) - 2.0 * U(i, j) + U(i - 1, j));
|
du2dx2 = inverseDx * inverseDx *
|
||||||
du2dy2 = inverseDy * inverseDy * (U(i, j + 1) - 2.0 * U(i, j) + U(i, j - 1));
|
(U(i + 1, j) - 2.0 * U(i, j) + U(i - 1, j));
|
||||||
F(i, j) = U(i, j) + dt * (inverseRe * (du2dx2 + du2dy2) - du2dx - duvdy + gx);
|
du2dy2 = inverseDy * inverseDy *
|
||||||
|
(U(i, j + 1) - 2.0 * U(i, j) + U(i, j - 1));
|
||||||
|
F(i, j) = U(i, j) +
|
||||||
|
dt * (inverseRe * (du2dx2 + du2dy2) - du2dx - duvdy + gx);
|
||||||
|
|
||||||
duvdx = inverseDx * 0.25 *
|
duvdx = inverseDx * 0.25 *
|
||||||
((U(i, j) + U(i, j + 1)) * (V(i, j) + V(i + 1, j)) -
|
((U(i, j) + U(i, j + 1)) * (V(i, j) + V(i + 1, j)) -
|
||||||
(U(i - 1, j) + U(i - 1, j + 1)) * (V(i, j) + V(i - 1, j))) +
|
(U(i - 1, j) + U(i - 1, j + 1)) *
|
||||||
|
(V(i, j) + V(i - 1, j))) +
|
||||||
gamma * inverseDx * 0.25 *
|
gamma * inverseDx * 0.25 *
|
||||||
(fabs(U(i, j) + U(i, j + 1)) * (V(i, j) - V(i + 1, j)) +
|
(fabs(U(i, j) + U(i, j + 1)) * (V(i, j) - V(i + 1, j)) +
|
||||||
fabs(U(i - 1, j) + U(i - 1, j + 1)) *
|
fabs(U(i - 1, j) + U(i - 1, j + 1)) *
|
||||||
@ -918,9 +1188,44 @@ void computeFG(Solver* solver)
|
|||||||
(fabs(V(i, j) + V(i, j + 1)) * (V(i, j) - V(i, j + 1)) +
|
(fabs(V(i, j) + V(i, j + 1)) * (V(i, j) - V(i, j + 1)) +
|
||||||
fabs(V(i, j) + V(i, j - 1)) * (V(i, j) - V(i, j - 1)));
|
fabs(V(i, j) + V(i, j - 1)) * (V(i, j) - V(i, j - 1)));
|
||||||
|
|
||||||
dv2dx2 = inverseDx * inverseDx * (V(i + 1, j) - 2.0 * V(i, j) + V(i - 1, j));
|
dv2dx2 = inverseDx * inverseDx *
|
||||||
dv2dy2 = inverseDy * inverseDy * (V(i, j + 1) - 2.0 * V(i, j) + V(i, j - 1));
|
(V(i + 1, j) - 2.0 * V(i, j) + V(i - 1, j));
|
||||||
G(i, j) = V(i, j) + dt * (inverseRe * (dv2dx2 + dv2dy2) - duvdx - dv2dy + gy);
|
dv2dy2 = inverseDy * inverseDy *
|
||||||
|
(V(i, j + 1) - 2.0 * V(i, j) + V(i, j - 1));
|
||||||
|
G(i, j) = V(i, j) +
|
||||||
|
dt * (inverseRe * (dv2dx2 + dv2dy2) - duvdx - dv2dy + gy);
|
||||||
|
} else {
|
||||||
|
switch (S(i, j)) {
|
||||||
|
case TOP:
|
||||||
|
G(i, j) = V(i, j);
|
||||||
|
break;
|
||||||
|
case BOTTOM:
|
||||||
|
G(i, j - 1) = V(i, j - 1);
|
||||||
|
break;
|
||||||
|
case LEFT:
|
||||||
|
F(i - 1, j) = U(i - 1, j);
|
||||||
|
break;
|
||||||
|
case RIGHT:
|
||||||
|
F(i, j) = U(i, j);
|
||||||
|
break;
|
||||||
|
case TOPLEFT:
|
||||||
|
F(i - 1, j) = U(i - 1, j);
|
||||||
|
G(i, j) = V(i, j);
|
||||||
|
break;
|
||||||
|
case TOPRIGHT:
|
||||||
|
F(i, j) = U(i, j);
|
||||||
|
G(i, j) = V(i, j);
|
||||||
|
break;
|
||||||
|
case BOTTOMLEFT:
|
||||||
|
F(i - 1, j) = U(i - 1, j);
|
||||||
|
G(i, j - 1) = V(i, j - 1);
|
||||||
|
break;
|
||||||
|
case BOTTOMRIGHT:
|
||||||
|
F(i, j) = U(i, j);
|
||||||
|
G(i, j - 1) = V(i, j - 1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -7,11 +7,26 @@
|
|||||||
#ifndef __SOLVER_H_
|
#ifndef __SOLVER_H_
|
||||||
#define __SOLVER_H_
|
#define __SOLVER_H_
|
||||||
#include "parameter.h"
|
#include "parameter.h"
|
||||||
|
|
||||||
#include <mpi.h>
|
#include <mpi.h>
|
||||||
|
|
||||||
#define NDIMS 2
|
#define NDIMS 2
|
||||||
|
|
||||||
|
enum OBJECTBOUNDARY {
|
||||||
|
NONE = 0,
|
||||||
|
TOP,
|
||||||
|
BOTTOM,
|
||||||
|
LEFT,
|
||||||
|
RIGHT,
|
||||||
|
TOPLEFT,
|
||||||
|
BOTTOMLEFT,
|
||||||
|
TOPRIGHT,
|
||||||
|
BOTTOMRIGHT,
|
||||||
|
LOCAL
|
||||||
|
};
|
||||||
enum BC { NOSLIP = 1, SLIP, OUTFLOW, PERIODIC };
|
enum BC { NOSLIP = 1, SLIP, OUTFLOW, PERIODIC };
|
||||||
|
/// @brief
|
||||||
|
enum SHAPE { NOSHAPE = 0, RECT, CIRCLE };
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
/* geometry and grid information */
|
/* geometry and grid information */
|
||||||
@ -22,6 +37,8 @@ typedef struct {
|
|||||||
double *p, *rhs;
|
double *p, *rhs;
|
||||||
double *f, *g;
|
double *f, *g;
|
||||||
double *u, *v;
|
double *u, *v;
|
||||||
|
int* s;
|
||||||
|
|
||||||
/* parameters */
|
/* parameters */
|
||||||
double eps, omega, rho;
|
double eps, omega, rho;
|
||||||
double re, tau, gamma;
|
double re, tau, gamma;
|
||||||
@ -38,23 +55,32 @@ typedef struct {
|
|||||||
MPI_Comm comm;
|
MPI_Comm comm;
|
||||||
MPI_Datatype bufferTypes[NDIMS * 2];
|
MPI_Datatype bufferTypes[NDIMS * 2];
|
||||||
MPI_Aint sdispls[NDIMS * 2], rdispls[NDIMS * 2];
|
MPI_Aint sdispls[NDIMS * 2], rdispls[NDIMS * 2];
|
||||||
|
|
||||||
|
MPI_Datatype bufferIntTypes[NDIMS * 2];
|
||||||
|
MPI_Aint sdisplsInt[NDIMS * 2], rdisplsInt[NDIMS * 2];
|
||||||
int iNeighbours[NDIMS], jNeighbours[NDIMS];
|
int iNeighbours[NDIMS], jNeighbours[NDIMS];
|
||||||
int coords[NDIMS], dims[NDIMS];
|
int coords[NDIMS], dims[NDIMS];
|
||||||
int imaxLocal, jmaxLocal;
|
int imaxLocal, jmaxLocal;
|
||||||
|
|
||||||
|
double xLocal, yLocal, xOffset, yOffset, xOffsetEnd, yOffsetEnd;
|
||||||
|
|
||||||
} Solver;
|
} Solver;
|
||||||
|
|
||||||
void initSolver(Solver*, Parameter*);
|
extern void initSolver(Solver*, Parameter*);
|
||||||
void computeRHS(Solver*);
|
extern void computeRHS(Solver*);
|
||||||
int solve(Solver*);
|
extern int solve(Solver*);
|
||||||
int solveRB(Solver*);
|
extern int solveRB(Solver*);
|
||||||
int solveRBA(Solver*);
|
extern int solveRBA(Solver*);
|
||||||
void computeTimestep(Solver*);
|
extern void computeTimestep(Solver*);
|
||||||
void setBoundaryConditions(Solver*);
|
extern void setBoundaryConditions(Solver*);
|
||||||
void setSpecialBoundaryCondition(Solver*);
|
extern void setSpecialBoundaryCondition(Solver*);
|
||||||
void computeFG(Solver*);
|
extern void setObjectBoundaryCondition(Solver*);
|
||||||
void adaptUV(Solver*);
|
extern void computeFG(Solver*);
|
||||||
void collectResult(Solver*);
|
extern void adaptUV(Solver*);
|
||||||
void writeResult(Solver*, double*, double*, double*);
|
extern void collectResult(Solver*);
|
||||||
void debugExchange(Solver*);
|
extern void writeResult(Solver*, double*, double*, double*);
|
||||||
void print(Solver*, double*);
|
extern void debugExchange(Solver*);
|
||||||
|
extern void print(Solver*, double*);
|
||||||
|
extern void printInt(Solver*, int*);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,126 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg.
|
|
||||||
* All rights reserved. This file is part of nusif-solver.
|
|
||||||
* Use of this source code is governed by a MIT style
|
|
||||||
* license that can be found in the LICENSE file.
|
|
||||||
*/
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "vtkWriter.h"
|
|
||||||
|
|
||||||
static float floatSwap(float f)
|
|
||||||
{
|
|
||||||
union {
|
|
||||||
float f;
|
|
||||||
char b[4];
|
|
||||||
} dat1, dat2;
|
|
||||||
|
|
||||||
dat1.f = f;
|
|
||||||
dat2.b[0] = dat1.b[3];
|
|
||||||
dat2.b[1] = dat1.b[2];
|
|
||||||
dat2.b[2] = dat1.b[1];
|
|
||||||
dat2.b[3] = dat1.b[0];
|
|
||||||
return dat2.f;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void writeHeader(VtkOptions* o, int ts)
|
|
||||||
{
|
|
||||||
fprintf(o->fh, "# vtk DataFile Version 3.0\n");
|
|
||||||
fprintf(o->fh, "PAMPI cfd solver particle tracing file\n");
|
|
||||||
if (o->fmt == ASCII) {
|
|
||||||
fprintf(o->fh, "ASCII\n");
|
|
||||||
} else if (o->fmt == BINARY) {
|
|
||||||
fprintf(o->fh, "BINARY\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
fprintf(o->fh, "DATASET UNSTRUCTURED_GRID\n");
|
|
||||||
fprintf(o->fh, "FIELD FieldData 2\n");
|
|
||||||
fprintf(o->fh, "TIME 1 1 double\n");
|
|
||||||
fprintf(o->fh, "%d\n", ts);
|
|
||||||
fprintf(o->fh, "CYCLE 1 1 int\n");
|
|
||||||
fprintf(o->fh, "1\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
void vtkOpen(VtkOptions* o, char* problem, int ts)
|
|
||||||
{
|
|
||||||
o->fh = fopen(problem, "w");
|
|
||||||
|
|
||||||
if (o->fh == NULL) {
|
|
||||||
printf("vtkWriter not initialize! Call vtkOpen first!\n");
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
writeHeader(o, ts);
|
|
||||||
|
|
||||||
printf("Writing VTK output for %s\n", problem);
|
|
||||||
}
|
|
||||||
|
|
||||||
void vtkParticle(VtkOptions* o, char* name)
|
|
||||||
{
|
|
||||||
Particle* particlePool = o->particletracer->particlePool;
|
|
||||||
|
|
||||||
if (o->fh == NULL) {
|
|
||||||
printf("vtkWriter not initialize! Call vtkOpen first!\n");
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
fprintf(o->fh, "POINTS %d float\n", o->overallTotalParticles);
|
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < o->particletracer->size; ++i)
|
|
||||||
{
|
|
||||||
|
|
||||||
double x = particlePool[i].x;
|
|
||||||
double y = particlePool[i].y;
|
|
||||||
fprintf(o->fh, "%.2f %.2f 0.0\n", x, y);
|
|
||||||
}
|
|
||||||
|
|
||||||
fprintf(o->fh, "CELLS %d %d\n", o->particletracer->totalParticles, 2 * o->particletracer->totalParticles);
|
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < o->particletracer->totalParticles; ++i)
|
|
||||||
{
|
|
||||||
fprintf(o->fh, "1 %d\n", i);
|
|
||||||
}
|
|
||||||
|
|
||||||
fprintf(o->fh, "CELL_TYPES %d\n", o->particletracer->totalParticles);
|
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < o->particletracer->totalParticles; ++i)
|
|
||||||
{
|
|
||||||
fprintf(o->fh, "1\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
for (int k = 0; k < kmax; k++) {
|
|
||||||
for (int j = 0; j < jmax; j++) {
|
|
||||||
for (int i = 0; i < imax; i++) {
|
|
||||||
if (o->fmt == ASCII) {
|
|
||||||
fprintf(o->fh,
|
|
||||||
"%f %f %f\n",
|
|
||||||
G(vec.u, i, j, k),
|
|
||||||
G(vec.v, i, j, k),
|
|
||||||
G(vec.w, i, j, k));
|
|
||||||
} else if (o->fmt == BINARY) {
|
|
||||||
fwrite((float[3]) { floatSwap(G(vec.u, i, j, k)),
|
|
||||||
floatSwap(G(vec.v, i, j, k)),
|
|
||||||
floatSwap(G(vec.w, i, j, k)) },
|
|
||||||
sizeof(float),
|
|
||||||
3,
|
|
||||||
o->fh);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (o->fmt == BINARY) fprintf(o->fh, "\n");
|
|
||||||
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
void vtkClose(VtkOptions* o)
|
|
||||||
{
|
|
||||||
fclose(o->fh);
|
|
||||||
o->fh = NULL;
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2022 NHR@FAU, University Erlangen-Nuremberg.
|
|
||||||
* All rights reserved. This file is part of nusif-solver.
|
|
||||||
* Use of this source code is governed by a MIT style
|
|
||||||
* license that can be found in the LICENSE file.
|
|
||||||
*/
|
|
||||||
#ifndef __VTKWRITER_H_
|
|
||||||
#define __VTKWRITER_H_
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#include "particletracing.h"
|
|
||||||
#include "solver.h"
|
|
||||||
|
|
||||||
typedef enum VtkFormat { ASCII = 0, BINARY } VtkFormat;
|
|
||||||
|
|
||||||
typedef struct VtkOptions {
|
|
||||||
VtkFormat fmt;
|
|
||||||
FILE* fh;
|
|
||||||
int overallTotalParticles;
|
|
||||||
ParticleTracer* particletracer;
|
|
||||||
} VtkOptions;
|
|
||||||
|
|
||||||
extern void vtkOpen(VtkOptions* opts, char* filename, int ts);
|
|
||||||
extern void vtkParticle(VtkOptions* opts, char* name);
|
|
||||||
extern void vtkClose(VtkOptions* opts);
|
|
||||||
#endif // __VTKWRITER_H_
|
|
||||||
@ -1,5 +1,8 @@
|
|||||||
set terminal png size 1800,768 enhanced font ,12
|
set terminal png size 3600,768 enhanced font ,28
|
||||||
set output 'velocity.png'
|
set output 'velocity.png'
|
||||||
|
set xrange[0:7]
|
||||||
|
set yrange[0:1.5]
|
||||||
|
set size ratio -1
|
||||||
set datafile separator whitespace
|
set datafile separator whitespace
|
||||||
|
|
||||||
plot 'velocity.dat' using 1:2:3:4:5 with vectors filled head size 0.01,20,60 lc palette
|
plot 'velocity.dat' using 1:2:3:4:5 with vectors filled head size 0.01,20,60 lc palette
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 188 KiB |
@ -3,7 +3,8 @@ set term gif animate delay 50
|
|||||||
set output "trace.gif"
|
set output "trace.gif"
|
||||||
set xrange [0:30]
|
set xrange [0:30]
|
||||||
set yrange [0:4]
|
set yrange [0:4]
|
||||||
do for [ts=0:200] {
|
|
||||||
|
do for [ts=0:120] {
|
||||||
plot "particles_".ts.".dat" with points pointtype 7
|
plot "particles_".ts.".dat" with points pointtype 7
|
||||||
}
|
}
|
||||||
unset output
|
unset output
|
||||||
|
|||||||
12
BasicSolver/2D-mpi-v3/vis_files/backstep_animate.plot
Normal file
12
BasicSolver/2D-mpi-v3/vis_files/backstep_animate.plot
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
unset border; unset tics; unset key;
|
||||||
|
set term gif animate delay 10
|
||||||
|
set output "trace.gif"
|
||||||
|
set xrange [0:7]
|
||||||
|
set yrange [0:1.5]
|
||||||
|
set object 1 rect from 0.0,0.0 to 1.0,0.5 lw 2
|
||||||
|
|
||||||
|
|
||||||
|
do for [ts=0:300] {
|
||||||
|
plot "particles_".ts.".dat" with points pointtype 7
|
||||||
|
}
|
||||||
|
unset output
|
||||||
13
BasicSolver/2D-mpi-v3/vis_files/karman_animate.plot
Normal file
13
BasicSolver/2D-mpi-v3/vis_files/karman_animate.plot
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
unset border; unset tics; unset key;
|
||||||
|
set term gif animate delay 10
|
||||||
|
set output "trace.gif"
|
||||||
|
set xrange [0:30]
|
||||||
|
set yrange [0:8]
|
||||||
|
set size ratio -1
|
||||||
|
set object 1 circle front at 5.0,4.0 size 1.0 fillcolor rgb "black" lw 2
|
||||||
|
|
||||||
|
|
||||||
|
do for [ts=0:500] {
|
||||||
|
plot "particles_".ts.".dat" with points pointtype 7 pointsize 0.3
|
||||||
|
}
|
||||||
|
unset output
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 751 KiB |
@ -1,530 +1,423 @@
|
|||||||
0.07 0.04 -nan
|
0.07 0.04 0.000000
|
||||||
0.22 0.04 -nan
|
0.22 0.04 0.000000
|
||||||
0.38 0.04 -nan
|
0.38 0.04 0.000000
|
||||||
0.53 0.04 -nan
|
0.53 0.04 0.000000
|
||||||
0.67 0.04 -nan
|
0.67 0.04 0.000000
|
||||||
0.82 0.04 -nan
|
0.82 0.04 0.000000
|
||||||
0.97 0.04 -nan
|
0.97 0.04 0.000000
|
||||||
1.12 0.04 -nan
|
1.12 0.04 0.000000
|
||||||
1.27 0.04 -nan
|
1.27 0.04 0.000000
|
||||||
1.43 0.04 -nan
|
1.43 0.04 0.000000
|
||||||
1.57 0.04 -nan
|
1.57 0.04 0.000000
|
||||||
1.72 0.04 -nan
|
1.72 0.04 0.000000
|
||||||
1.88 0.04 -nan
|
1.88 0.04 0.000000
|
||||||
2.02 0.04 -nan
|
2.02 0.04 0.000000
|
||||||
2.17 0.04 -nan
|
2.17 0.04 0.000000
|
||||||
2.32 0.04 -nan
|
2.32 0.04 0.000000
|
||||||
2.48 0.04 -nan
|
2.48 0.04 0.000000
|
||||||
2.62 0.04 -nan
|
2.62 0.04 0.000000
|
||||||
2.77 0.04 -nan
|
2.77 0.04 0.000000
|
||||||
2.92 0.04 -nan
|
2.92 0.04 0.000000
|
||||||
3.07 0.04 -nan
|
3.07 0.04 0.000000
|
||||||
3.23 0.04 -nan
|
3.23 0.04 0.000000
|
||||||
3.38 0.04 -nan
|
3.38 0.04 0.000000
|
||||||
3.52 0.04 -nan
|
3.52 0.04 0.000000
|
||||||
3.67 0.04 -nan
|
3.67 0.04 0.000000
|
||||||
3.82 0.04 -nan
|
3.82 0.04 0.000000
|
||||||
3.97 0.04 -nan
|
3.97 0.04 0.000000
|
||||||
4.12 0.04 -nan
|
4.12 0.04 0.000000
|
||||||
4.27 0.04 -nan
|
4.27 0.04 0.000000
|
||||||
4.42 0.04 -nan
|
4.42 0.04 0.000000
|
||||||
4.58 0.04 -nan
|
4.58 0.04 0.000000
|
||||||
4.72 0.04 -nan
|
4.72 0.04 0.000000
|
||||||
4.88 0.04 -nan
|
4.88 0.04 0.000000
|
||||||
5.02 0.04 -nan
|
5.02 0.04 0.000000
|
||||||
5.17 0.04 -nan
|
5.17 0.04 0.000000
|
||||||
5.33 0.04 -nan
|
5.33 0.04 0.000000
|
||||||
5.47 0.04 -nan
|
5.47 0.04 0.000000
|
||||||
5.62 0.04 -nan
|
5.62 0.04 0.000000
|
||||||
5.77 0.04 -nan
|
5.77 0.04 0.000000
|
||||||
5.92 0.04 -nan
|
5.92 0.04 0.000000
|
||||||
6.08 0.04 -nan
|
6.08 0.04 0.000000
|
||||||
6.22 0.04 -nan
|
6.22 0.04 0.000000
|
||||||
6.38 0.04 -nan
|
6.38 0.04 0.000000
|
||||||
6.52 0.04 -nan
|
6.52 0.04 0.000000
|
||||||
6.67 0.04 -nan
|
6.67 0.04 0.000000
|
||||||
6.83 0.04 -nan
|
6.83 0.04 0.000000
|
||||||
6.97 0.04 -nan
|
6.97 0.04 0.000000
|
||||||
7.12 0.04 -nan
|
7.12 0.04 0.000000
|
||||||
7.27 0.04 -nan
|
7.27 0.04 0.000000
|
||||||
7.42 0.04 -nan
|
7.42 0.04 0.000000
|
||||||
7.57 0.04 -nan
|
7.57 0.04 0.000000
|
||||||
7.72 0.04 -nan
|
7.72 0.04 0.000000
|
||||||
7.88 0.04 -nan
|
7.88 0.04 0.000000
|
||||||
8.03 0.04 -nan
|
8.03 0.04 0.000000
|
||||||
8.17 0.04 -nan
|
8.17 0.04 0.000000
|
||||||
8.32 0.04 -nan
|
8.32 0.04 0.000000
|
||||||
8.47 0.04 -nan
|
8.47 0.04 0.000000
|
||||||
8.62 0.04 -nan
|
8.62 0.04 0.000000
|
||||||
8.78 0.04 -nan
|
8.78 0.04 0.000000
|
||||||
8.92 0.04 -nan
|
8.92 0.04 0.000000
|
||||||
9.07 0.04 -nan
|
9.07 0.04 0.000000
|
||||||
9.22 0.04 -nan
|
9.22 0.04 0.000000
|
||||||
9.38 0.04 -nan
|
9.38 0.04 0.000000
|
||||||
9.53 0.04 -nan
|
9.53 0.04 0.000000
|
||||||
9.67 0.04 -nan
|
9.67 0.04 0.000000
|
||||||
9.82 0.04 -nan
|
9.82 0.04 0.000000
|
||||||
9.97 0.04 -nan
|
9.97 0.04 0.000000
|
||||||
10.12 0.04 -nan
|
10.12 0.04 0.000000
|
||||||
10.28 0.04 -nan
|
10.28 0.04 0.000000
|
||||||
10.42 0.04 -nan
|
10.42 0.04 0.000000
|
||||||
10.57 0.04 -nan
|
10.57 0.04 0.000000
|
||||||
10.72 0.04 -nan
|
10.72 0.04 0.000000
|
||||||
10.88 0.04 -nan
|
10.88 0.04 0.000000
|
||||||
11.03 0.04 -nan
|
11.03 0.04 0.000000
|
||||||
11.17 0.04 -nan
|
11.17 0.04 0.000000
|
||||||
11.32 0.04 -nan
|
11.32 0.04 0.000000
|
||||||
11.47 0.04 -nan
|
11.47 0.04 0.000000
|
||||||
11.62 0.04 -nan
|
11.62 0.04 0.000000
|
||||||
11.78 0.04 -nan
|
11.78 0.04 0.000000
|
||||||
11.92 0.04 -nan
|
11.92 0.04 0.000000
|
||||||
12.07 0.04 -nan
|
12.07 0.04 0.000000
|
||||||
12.22 0.04 -nan
|
12.22 0.04 0.000000
|
||||||
12.38 0.04 -nan
|
12.38 0.04 0.000000
|
||||||
12.53 0.04 -nan
|
12.53 0.04 0.000000
|
||||||
12.67 0.04 -nan
|
12.67 0.04 0.000000
|
||||||
12.82 0.04 -nan
|
12.82 0.04 0.000000
|
||||||
12.97 0.04 -nan
|
12.97 0.04 0.000000
|
||||||
13.12 0.04 -nan
|
13.12 0.04 0.000000
|
||||||
13.28 0.04 -nan
|
13.28 0.04 0.000000
|
||||||
13.42 0.04 -nan
|
13.42 0.04 0.000000
|
||||||
13.57 0.04 -nan
|
13.57 0.04 0.000000
|
||||||
13.72 0.04 -nan
|
13.72 0.04 0.000000
|
||||||
13.88 0.04 -nan
|
13.88 0.04 0.000000
|
||||||
14.03 0.04 -nan
|
14.03 0.04 0.000000
|
||||||
14.17 0.04 -nan
|
14.17 0.04 0.000000
|
||||||
14.32 0.04 -nan
|
14.32 0.04 0.000000
|
||||||
14.47 0.04 -nan
|
14.47 0.04 0.000000
|
||||||
14.62 0.04 -nan
|
14.62 0.04 0.000000
|
||||||
14.77 0.04 -nan
|
14.77 0.04 0.000000
|
||||||
14.92 0.04 nan
|
14.92 0.04 0.000000
|
||||||
15.07 0.04 -nan
|
15.07 0.04 0.000000
|
||||||
15.22 0.04 -nan
|
15.22 0.04 0.000000
|
||||||
15.38 0.04 -nan
|
15.38 0.04 0.000000
|
||||||
15.52 0.04 -nan
|
15.52 0.04 0.000000
|
||||||
15.67 0.04 -nan
|
15.67 0.04 0.000000
|
||||||
15.82 0.04 -nan
|
15.82 0.04 0.000000
|
||||||
15.97 0.04 -nan
|
15.97 0.04 0.000000
|
||||||
16.12 0.04 -nan
|
16.12 0.04 0.000000
|
||||||
16.27 0.04 -nan
|
16.27 0.04 0.000000
|
||||||
16.43 0.04 -nan
|
16.43 0.04 0.000000
|
||||||
16.57 0.04 -nan
|
16.57 0.04 0.000000
|
||||||
16.72 0.04 -nan
|
16.72 0.04 0.000000
|
||||||
16.88 0.04 -nan
|
16.88 0.04 0.000000
|
||||||
17.02 0.04 -nan
|
17.02 0.04 0.000000
|
||||||
17.18 0.04 -nan
|
17.18 0.04 0.000000
|
||||||
17.32 0.04 -nan
|
17.32 0.04 0.000000
|
||||||
17.47 0.04 -nan
|
17.47 0.04 0.000000
|
||||||
17.62 0.04 -nan
|
17.62 0.04 0.000000
|
||||||
17.77 0.04 -nan
|
17.77 0.04 0.000000
|
||||||
17.93 0.04 -nan
|
17.93 0.04 0.000000
|
||||||
18.07 0.04 -nan
|
18.07 0.04 0.000000
|
||||||
18.22 0.04 -nan
|
18.22 0.04 0.000000
|
||||||
18.38 0.04 -nan
|
18.38 0.04 0.000000
|
||||||
18.52 0.04 -nan
|
18.52 0.04 0.000000
|
||||||
18.68 0.04 -nan
|
18.68 0.04 0.000000
|
||||||
18.82 0.04 -nan
|
18.82 0.04 0.000000
|
||||||
18.97 0.04 -nan
|
18.97 0.04 0.000000
|
||||||
19.12 0.04 -nan
|
19.12 0.04 0.000000
|
||||||
19.27 0.04 -nan
|
19.27 0.04 0.000000
|
||||||
19.43 0.04 -nan
|
19.43 0.04 0.000000
|
||||||
19.57 0.04 -nan
|
19.57 0.04 0.000000
|
||||||
19.72 0.04 -nan
|
19.72 0.04 0.000000
|
||||||
19.88 0.04 -nan
|
19.88 0.04 0.000000
|
||||||
20.02 0.04 -nan
|
20.02 0.04 0.000000
|
||||||
20.18 0.04 -nan
|
20.18 0.04 0.000000
|
||||||
20.32 0.04 -nan
|
20.32 0.04 0.000000
|
||||||
20.47 0.04 -nan
|
20.47 0.04 0.000000
|
||||||
20.62 0.04 -nan
|
20.62 0.04 0.000000
|
||||||
20.77 0.04 -nan
|
20.77 0.04 0.000000
|
||||||
20.93 0.04 -nan
|
20.93 0.04 0.000000
|
||||||
21.07 0.04 -nan
|
21.07 0.04 0.000000
|
||||||
21.22 0.04 -nan
|
21.22 0.04 0.000000
|
||||||
21.38 0.04 -nan
|
21.38 0.04 0.000000
|
||||||
21.52 0.04 -nan
|
21.52 0.04 0.000000
|
||||||
21.68 0.04 -nan
|
21.68 0.04 0.000000
|
||||||
21.82 0.04 -nan
|
21.82 0.04 0.000000
|
||||||
21.97 0.04 -nan
|
21.97 0.04 0.000000
|
||||||
22.12 0.04 -nan
|
22.12 0.04 0.000000
|
||||||
22.27 0.04 -nan
|
22.27 0.04 0.000000
|
||||||
22.43 0.04 -nan
|
22.43 0.04 0.000000
|
||||||
22.57 0.04 -nan
|
22.57 0.04 0.000000
|
||||||
22.72 0.04 -nan
|
22.72 0.04 0.000000
|
||||||
22.88 0.04 -nan
|
22.88 0.04 0.000000
|
||||||
23.02 0.04 -nan
|
23.02 0.04 0.000000
|
||||||
23.18 0.04 -nan
|
23.18 0.04 0.000000
|
||||||
23.32 0.04 -nan
|
23.32 0.04 0.000000
|
||||||
23.47 0.04 -nan
|
23.47 0.04 0.000000
|
||||||
23.62 0.04 -nan
|
23.62 0.04 0.000000
|
||||||
23.77 0.04 -nan
|
23.77 0.04 0.000000
|
||||||
23.93 0.04 -nan
|
23.93 0.04 0.000000
|
||||||
24.07 0.04 -nan
|
24.07 0.04 0.000000
|
||||||
24.22 0.04 -nan
|
24.22 0.04 0.000000
|
||||||
24.38 0.04 -nan
|
24.38 0.04 0.000000
|
||||||
24.52 0.04 -nan
|
24.52 0.04 0.000000
|
||||||
24.68 0.04 -nan
|
24.68 0.04 0.000000
|
||||||
24.82 0.04 -nan
|
24.82 0.04 0.000000
|
||||||
24.97 0.04 -nan
|
24.97 0.04 0.000000
|
||||||
25.12 0.04 -nan
|
25.12 0.04 0.000000
|
||||||
25.27 0.04 -nan
|
25.27 0.04 0.000000
|
||||||
25.43 0.04 -nan
|
25.43 0.04 0.000000
|
||||||
25.57 0.04 -nan
|
25.57 0.04 0.000000
|
||||||
25.72 0.04 -nan
|
25.72 0.04 0.000000
|
||||||
25.88 0.04 -nan
|
25.88 0.04 0.000000
|
||||||
26.02 0.04 -nan
|
26.02 0.04 0.000000
|
||||||
26.18 0.04 -nan
|
26.18 0.04 0.000000
|
||||||
26.32 0.04 -nan
|
26.32 0.04 0.000000
|
||||||
26.47 0.04 -nan
|
26.47 0.04 0.000000
|
||||||
26.62 0.04 -nan
|
26.62 0.04 0.000000
|
||||||
26.77 0.04 -nan
|
26.77 0.04 0.000000
|
||||||
26.93 0.04 -nan
|
26.93 0.04 0.000000
|
||||||
27.07 0.04 -nan
|
27.07 0.04 0.000000
|
||||||
27.22 0.04 -nan
|
27.22 0.04 0.000000
|
||||||
27.38 0.04 -nan
|
27.38 0.04 0.000000
|
||||||
27.52 0.04 -nan
|
27.52 0.04 0.000000
|
||||||
27.68 0.04 -nan
|
27.68 0.04 0.000000
|
||||||
27.82 0.04 -nan
|
27.82 0.04 0.000000
|
||||||
27.97 0.04 -nan
|
27.97 0.04 0.000000
|
||||||
28.12 0.04 -nan
|
28.12 0.04 0.000000
|
||||||
28.27 0.04 -nan
|
28.27 0.04 0.000000
|
||||||
28.43 0.04 -nan
|
28.43 0.04 0.000000
|
||||||
28.57 0.04 -nan
|
28.57 0.04 0.000000
|
||||||
28.72 0.04 -nan
|
28.72 0.04 0.000000
|
||||||
28.88 0.04 -nan
|
28.88 0.04 0.000000
|
||||||
29.02 0.04 -nan
|
29.02 0.04 0.000000
|
||||||
29.17 0.04 -nan
|
29.17 0.04 0.000000
|
||||||
29.32 0.04 -nan
|
29.32 0.04 0.000000
|
||||||
29.47 0.04 -nan
|
29.47 0.04 0.000000
|
||||||
29.62 0.04 -nan
|
29.62 0.04 0.000000
|
||||||
29.77 0.04 -nan
|
29.77 0.04 0.000000
|
||||||
|
|
||||||
0.07 0.12 -nan
|
0.07 0.12 0.000000
|
||||||
0.22 0.12 -nan
|
0.22 0.12 0.000000
|
||||||
0.38 0.12 -nan
|
0.38 0.12 0.000000
|
||||||
0.53 0.12 -nan
|
0.53 0.12 0.000000
|
||||||
0.67 0.12 -nan
|
0.67 0.12 0.000000
|
||||||
0.82 0.12 -nan
|
0.82 0.12 0.000000
|
||||||
0.97 0.12 -nan
|
0.97 0.12 0.000000
|
||||||
1.12 0.12 -nan
|
1.12 0.12 0.000000
|
||||||
1.27 0.12 -nan
|
1.27 0.12 0.000000
|
||||||
1.43 0.12 -nan
|
1.43 0.12 0.000000
|
||||||
1.57 0.12 -nan
|
1.57 0.12 0.000000
|
||||||
1.72 0.12 -nan
|
1.72 0.12 0.000000
|
||||||
1.88 0.12 -nan
|
1.88 0.12 0.000000
|
||||||
2.02 0.12 -nan
|
2.02 0.12 0.000000
|
||||||
2.17 0.12 -nan
|
2.17 0.12 0.000000
|
||||||
2.32 0.12 -nan
|
2.32 0.12 0.000000
|
||||||
2.48 0.12 -nan
|
2.48 0.12 0.000000
|
||||||
2.62 0.12 -nan
|
2.62 0.12 0.000000
|
||||||
2.77 0.12 -nan
|
2.77 0.12 0.000000
|
||||||
2.92 0.12 -nan
|
2.92 0.12 0.000000
|
||||||
3.07 0.12 -nan
|
3.07 0.12 0.000000
|
||||||
3.23 0.12 -nan
|
3.23 0.12 0.000000
|
||||||
3.38 0.12 -nan
|
3.38 0.12 0.000000
|
||||||
3.52 0.12 -nan
|
3.52 0.12 0.000000
|
||||||
3.67 0.12 -nan
|
3.67 0.12 0.000000
|
||||||
3.82 0.12 -nan
|
3.82 0.12 0.000000
|
||||||
3.97 0.12 -nan
|
3.97 0.12 0.000000
|
||||||
4.12 0.12 -nan
|
4.12 0.12 0.000000
|
||||||
4.27 0.12 -nan
|
4.27 0.12 0.000000
|
||||||
4.42 0.12 -nan
|
4.42 0.12 0.000000
|
||||||
4.58 0.12 -nan
|
4.58 0.12 0.000000
|
||||||
4.72 0.12 -nan
|
4.72 0.12 0.000000
|
||||||
4.88 0.12 -nan
|
4.88 0.12 0.000000
|
||||||
5.02 0.12 -nan
|
5.02 0.12 0.000000
|
||||||
5.17 0.12 -nan
|
5.17 0.12 0.000000
|
||||||
5.33 0.12 -nan
|
5.33 0.12 0.000000
|
||||||
5.47 0.12 -nan
|
5.47 0.12 0.000000
|
||||||
5.62 0.12 -nan
|
5.62 0.12 0.000000
|
||||||
5.77 0.12 -nan
|
5.77 0.12 0.000000
|
||||||
5.92 0.12 -nan
|
5.92 0.12 0.000000
|
||||||
6.08 0.12 -nan
|
6.08 0.12 0.000000
|
||||||
6.22 0.12 -nan
|
6.22 0.12 0.000000
|
||||||
6.38 0.12 -nan
|
6.38 0.12 0.000000
|
||||||
6.52 0.12 -nan
|
6.52 0.12 0.000000
|
||||||
6.67 0.12 -nan
|
6.67 0.12 0.000000
|
||||||
6.83 0.12 -nan
|
6.83 0.12 0.000000
|
||||||
6.97 0.12 -nan
|
6.97 0.12 0.000000
|
||||||
7.12 0.12 -nan
|
7.12 0.12 0.000000
|
||||||
7.27 0.12 -nan
|
7.27 0.12 0.000000
|
||||||
7.42 0.12 -nan
|
7.42 0.12 0.000000
|
||||||
7.57 0.12 -nan
|
7.57 0.12 0.000000
|
||||||
7.72 0.12 -nan
|
7.72 0.12 0.000000
|
||||||
7.88 0.12 -nan
|
7.88 0.12 0.000000
|
||||||
8.03 0.12 -nan
|
8.03 0.12 0.000000
|
||||||
8.17 0.12 -nan
|
8.17 0.12 0.000000
|
||||||
8.32 0.12 -nan
|
8.32 0.12 0.000000
|
||||||
8.47 0.12 -nan
|
8.47 0.12 0.000000
|
||||||
8.62 0.12 -nan
|
8.62 0.12 0.000000
|
||||||
8.78 0.12 -nan
|
8.78 0.12 0.000000
|
||||||
8.92 0.12 -nan
|
8.92 0.12 0.000000
|
||||||
9.07 0.12 -nan
|
9.07 0.12 0.000000
|
||||||
9.22 0.12 -nan
|
9.22 0.12 0.000000
|
||||||
9.38 0.12 -nan
|
9.38 0.12 0.000000
|
||||||
9.53 0.12 -nan
|
9.53 0.12 0.000000
|
||||||
9.67 0.12 -nan
|
9.67 0.12 0.000000
|
||||||
9.82 0.12 -nan
|
9.82 0.12 0.000000
|
||||||
9.97 0.12 -nan
|
9.97 0.12 0.000000
|
||||||
10.12 0.12 -nan
|
10.12 0.12 0.000000
|
||||||
10.28 0.12 -nan
|
10.28 0.12 0.000000
|
||||||
10.42 0.12 -nan
|
10.42 0.12 0.000000
|
||||||
10.57 0.12 -nan
|
10.57 0.12 0.000000
|
||||||
10.72 0.12 -nan
|
10.72 0.12 0.000000
|
||||||
10.88 0.12 -nan
|
10.88 0.12 0.000000
|
||||||
11.03 0.12 -nan
|
11.03 0.12 0.000000
|
||||||
11.17 0.12 -nan
|
11.17 0.12 0.000000
|
||||||
11.32 0.12 -nan
|
11.32 0.12 0.000000
|
||||||
11.47 0.12 -nan
|
11.47 0.12 0.000000
|
||||||
11.62 0.12 -nan
|
11.62 0.12 0.000000
|
||||||
11.78 0.12 -nan
|
11.78 0.12 0.000000
|
||||||
11.92 0.12 -nan
|
11.92 0.12 0.000000
|
||||||
12.07 0.12 -nan
|
12.07 0.12 0.000000
|
||||||
12.22 0.12 -nan
|
12.22 0.12 0.000000
|
||||||
12.38 0.12 -nan
|
12.38 0.12 0.000000
|
||||||
12.53 0.12 -nan
|
12.53 0.12 0.000000
|
||||||
12.67 0.12 -nan
|
12.67 0.12 0.000000
|
||||||
12.82 0.12 -nan
|
12.82 0.12 0.000000
|
||||||
12.97 0.12 -nan
|
12.97 0.12 0.000000
|
||||||
13.12 0.12 -nan
|
13.12 0.12 0.000000
|
||||||
13.28 0.12 -nan
|
13.28 0.12 0.000000
|
||||||
13.42 0.12 -nan
|
13.42 0.12 0.000000
|
||||||
13.57 0.12 -nan
|
13.57 0.12 0.000000
|
||||||
13.72 0.12 -nan
|
13.72 0.12 0.000000
|
||||||
13.88 0.12 -nan
|
13.88 0.12 0.000000
|
||||||
14.03 0.12 -nan
|
14.03 0.12 0.000000
|
||||||
14.17 0.12 -nan
|
14.17 0.12 0.000000
|
||||||
14.32 0.12 -nan
|
14.32 0.12 0.000000
|
||||||
14.47 0.12 -nan
|
14.47 0.12 0.000000
|
||||||
14.62 0.12 -nan
|
14.62 0.12 0.000000
|
||||||
14.77 0.12 -nan
|
14.77 0.12 0.000000
|
||||||
14.92 0.12 nan
|
14.92 0.12 0.000000
|
||||||
15.07 0.12 -nan
|
15.07 0.12 0.000000
|
||||||
15.22 0.12 -nan
|
15.22 0.12 0.000000
|
||||||
15.38 0.12 -nan
|
15.38 0.12 0.000000
|
||||||
15.52 0.12 -nan
|
15.52 0.12 0.000000
|
||||||
15.67 0.12 -nan
|
15.67 0.12 0.000000
|
||||||
15.82 0.12 -nan
|
15.82 0.12 0.000000
|
||||||
15.97 0.12 -nan
|
15.97 0.12 0.000000
|
||||||
16.12 0.12 -nan
|
16.12 0.12 0.000000
|
||||||
16.27 0.12 -nan
|
16.27 0.12 0.000000
|
||||||
16.43 0.12 -nan
|
16.43 0.12 0.000000
|
||||||
16.57 0.12 -nan
|
16.57 0.12 0.000000
|
||||||
16.72 0.12 -nan
|
16.72 0.12 0.000000
|
||||||
16.88 0.12 -nan
|
16.88 0.12 0.000000
|
||||||
17.02 0.12 -nan
|
17.02 0.12 0.000000
|
||||||
17.18 0.12 -nan
|
17.18 0.12 0.000000
|
||||||
17.32 0.12 -nan
|
17.32 0.12 0.000000
|
||||||
17.47 0.12 -nan
|
17.47 0.12 0.000000
|
||||||
17.62 0.12 -nan
|
17.62 0.12 0.000000
|
||||||
17.77 0.12 -nan
|
17.77 0.12 0.000000
|
||||||
17.93 0.12 -nan
|
17.93 0.12 0.000000
|
||||||
18.07 0.12 -nan
|
18.07 0.12 0.000000
|
||||||
18.22 0.12 -nan
|
18.22 0.12 0.000000
|
||||||
18.38 0.12 -nan
|
18.38 0.12 0.000000
|
||||||
18.52 0.12 -nan
|
18.52 0.12 0.000000
|
||||||
18.68 0.12 -nan
|
18.68 0.12 0.000000
|
||||||
18.82 0.12 -nan
|
18.82 0.12 0.000000
|
||||||
18.97 0.12 -nan
|
18.97 0.12 0.000000
|
||||||
19.12 0.12 -nan
|
19.12 0.12 0.000000
|
||||||
19.27 0.12 -nan
|
19.27 0.12 0.000000
|
||||||
19.43 0.12 -nan
|
19.43 0.12 0.000000
|
||||||
19.57 0.12 -nan
|
19.57 0.12 0.000000
|
||||||
19.72 0.12 -nan
|
19.72 0.12 0.000000
|
||||||
19.88 0.12 -nan
|
19.88 0.12 0.000000
|
||||||
20.02 0.12 -nan
|
20.02 0.12 0.000000
|
||||||
20.18 0.12 -nan
|
20.18 0.12 0.000000
|
||||||
20.32 0.12 -nan
|
20.32 0.12 0.000000
|
||||||
20.47 0.12 -nan
|
20.47 0.12 0.000000
|
||||||
20.62 0.12 -nan
|
20.62 0.12 0.000000
|
||||||
20.77 0.12 -nan
|
20.77 0.12 0.000000
|
||||||
20.93 0.12 -nan
|
20.93 0.12 0.000000
|
||||||
21.07 0.12 -nan
|
21.07 0.12 0.000000
|
||||||
21.22 0.12 -nan
|
21.22 0.12 0.000000
|
||||||
21.38 0.12 -nan
|
21.38 0.12 0.000000
|
||||||
21.52 0.12 -nan
|
21.52 0.12 0.000000
|
||||||
21.68 0.12 -nan
|
21.68 0.12 0.000000
|
||||||
21.82 0.12 -nan
|
21.82 0.12 0.000000
|
||||||
21.97 0.12 -nan
|
21.97 0.12 0.000000
|
||||||
22.12 0.12 -nan
|
22.12 0.12 0.000000
|
||||||
22.27 0.12 -nan
|
22.27 0.12 0.000000
|
||||||
22.43 0.12 -nan
|
22.43 0.12 0.000000
|
||||||
22.57 0.12 -nan
|
22.57 0.12 0.000000
|
||||||
22.72 0.12 -nan
|
22.72 0.12 0.000000
|
||||||
22.88 0.12 -nan
|
22.88 0.12 0.000000
|
||||||
23.02 0.12 -nan
|
23.02 0.12 0.000000
|
||||||
23.18 0.12 -nan
|
23.18 0.12 0.000000
|
||||||
23.32 0.12 -nan
|
23.32 0.12 0.000000
|
||||||
23.47 0.12 -nan
|
23.47 0.12 0.000000
|
||||||
23.62 0.12 -nan
|
23.62 0.12 0.000000
|
||||||
23.77 0.12 -nan
|
23.77 0.12 0.000000
|
||||||
23.93 0.12 -nan
|
23.93 0.12 0.000000
|
||||||
24.07 0.12 -nan
|
24.07 0.12 0.000000
|
||||||
24.22 0.12 -nan
|
24.22 0.12 0.000000
|
||||||
24.38 0.12 -nan
|
24.38 0.12 0.000000
|
||||||
24.52 0.12 -nan
|
24.52 0.12 0.000000
|
||||||
24.68 0.12 -nan
|
24.68 0.12 0.000000
|
||||||
24.82 0.12 -nan
|
24.82 0.12 0.000000
|
||||||
24.97 0.12 -nan
|
24.97 0.12 0.000000
|
||||||
25.12 0.12 -nan
|
25.12 0.12 0.000000
|
||||||
25.27 0.12 -nan
|
25.27 0.12 0.000000
|
||||||
25.43 0.12 -nan
|
25.43 0.12 0.000000
|
||||||
25.57 0.12 -nan
|
25.57 0.12 0.000000
|
||||||
25.72 0.12 -nan
|
25.72 0.12 0.000000
|
||||||
25.88 0.12 -nan
|
25.88 0.12 0.000000
|
||||||
26.02 0.12 -nan
|
26.02 0.12 0.000000
|
||||||
26.18 0.12 -nan
|
26.18 0.12 0.000000
|
||||||
26.32 0.12 -nan
|
26.32 0.12 0.000000
|
||||||
26.47 0.12 -nan
|
26.47 0.12 0.000000
|
||||||
26.62 0.12 -nan
|
26.62 0.12 0.000000
|
||||||
26.77 0.12 -nan
|
26.77 0.12 0.000000
|
||||||
26.93 0.12 -nan
|
26.93 0.12 0.000000
|
||||||
27.07 0.12 -nan
|
27.07 0.12 0.000000
|
||||||
27.22 0.12 -nan
|
27.22 0.12 0.000000
|
||||||
27.38 0.12 -nan
|
27.38 0.12 0.000000
|
||||||
27.52 0.12 -nan
|
27.52 0.12 0.000000
|
||||||
27.68 0.12 -nan
|
27.68 0.12 0.000000
|
||||||
27.82 0.12 -nan
|
27.82 0.12 0.000000
|
||||||
27.97 0.12 -nan
|
27.97 0.12 0.000000
|
||||||
28.12 0.12 -nan
|
28.12 0.12 0.000000
|
||||||
28.27 0.12 -nan
|
28.27 0.12 0.000000
|
||||||
28.43 0.12 -nan
|
28.43 0.12 0.000000
|
||||||
28.57 0.12 -nan
|
28.57 0.12 0.000000
|
||||||
28.72 0.12 -nan
|
28.72 0.12 0.000000
|
||||||
28.88 0.12 -nan
|
28.88 0.12 0.000000
|
||||||
29.02 0.12 -nan
|
29.02 0.12 0.000000
|
||||||
29.17 0.12 -nan
|
29.17 0.12 0.000000
|
||||||
29.32 0.12 -nan
|
29.32 0.12 0.000000
|
||||||
29.47 0.12 -nan
|
29.47 0.12 0.000000
|
||||||
29.62 0.12 -nan
|
29.62 0.12 0.000000
|
||||||
29.77 0.12 -nan
|
29.77 0.12 0.000000
|
||||||
|
|
||||||
0.07 0.20 -nan
|
0.07 0.20 0.000000
|
||||||
0.22 0.20 -nan
|
0.22 0.20 0.000000
|
||||||
0.38 0.20 -nan
|
0.38 0.20 0.000000
|
||||||
0.53 0.20 -nan
|
0.53 0.20 0.000000
|
||||||
0.67 0.20 -nan
|
0.67 0.20 0.000000
|
||||||
0.82 0.20 -nan
|
0.82 0.20 0.000000
|
||||||
0.97 0.20 -nan
|
0.97 0.20 0.000000
|
||||||
1.12 0.20 -nan
|
1.12 0.20 0.000000
|
||||||
1.27 0.20 -nan
|
1.27 0.20 0.000000
|
||||||
1.43 0.20 -nan
|
1.43 0.20 0.000000
|
||||||
1.57 0.20 -nan
|
1.57 0.20 0.000000
|
||||||
1.72 0.20 -nan
|
1.72 0.20 0.000000
|
||||||
1.88 0.20 -nan
|
1.88 0.20 0.000000
|
||||||
2.02 0.20 -nan
|
2.02 0.20 0.000000
|
||||||
2.17 0.20 -nan
|
2.17 0.20 0.000000
|
||||||
2.32 0.20 -nan
|
2.32 0.20 0.000000
|
||||||
2.48 0.20 -nan
|
2.48 0.20 0.000000
|
||||||
2.62 0.20 -nan
|
2.62 0.20 0.000000
|
||||||
2.77 0.20 -nan
|
2.77 0.20 0.000000
|
||||||
2.92 0.20 -nan
|
2.92 0.20 0.000000
|
||||||
3.07 0.20 -nan
|
|
||||||
3.23 0.20 -nan
|
|
||||||
3.38 0.20 -nan
|
|
||||||
3.52 0.20 -nan
|
|
||||||
3.67 0.20 -nan
|
|
||||||
3.82 0.20 -nan
|
|
||||||
3.97 0.20 -nan
|
|
||||||
4.12 0.20 -nan
|
|
||||||
4.27 0.20 -nan
|
|
||||||
4.42 0.20 -nan
|
|
||||||
4.58 0.20 -nan
|
|
||||||
4.72 0.20 -nan
|
|
||||||
4.88 0.20 -nan
|
|
||||||
5.02 0.20 -nan
|
|
||||||
5.17 0.20 -nan
|
|
||||||
5.33 0.20 -nan
|
|
||||||
5.47 0.20 -nan
|
|
||||||
5.62 0.20 -nan
|
|
||||||
5.77 0.20 -nan
|
|
||||||
5.92 0.20 -nan
|
|
||||||
6.08 0.20 -nan
|
|
||||||
6.22 0.20 -nan
|
|
||||||
6.38 0.20 -nan
|
|
||||||
6.52 0.20 -nan
|
|
||||||
6.67 0.20 -nan
|
|
||||||
6.83 0.20 -nan
|
|
||||||
6.97 0.20 -nan
|
|
||||||
7.12 0.20 -nan
|
|
||||||
7.27 0.20 -nan
|
|
||||||
7.42 0.20 -nan
|
|
||||||
7.57 0.20 -nan
|
|
||||||
7.72 0.20 -nan
|
|
||||||
7.88 0.20 -nan
|
|
||||||
8.03 0.20 -nan
|
|
||||||
8.17 0.20 -nan
|
|
||||||
8.32 0.20 -nan
|
|
||||||
8.47 0.20 -nan
|
|
||||||
8.62 0.20 -nan
|
|
||||||
8.78 0.20 -nan
|
|
||||||
8.92 0.20 -nan
|
|
||||||
9.07 0.20 -nan
|
|
||||||
9.22 0.20 -nan
|
|
||||||
9.38 0.20 -nan
|
|
||||||
9.53 0.20 -nan
|
|
||||||
9.67 0.20 -nan
|
|
||||||
9.82 0.20 -nan
|
|
||||||
9.97 0.20 -nan
|
|
||||||
10.12 0.20 -nan
|
|
||||||
10.28 0.20 -nan
|
|
||||||
10.42 0.20 -nan
|
|
||||||
10.57 0.20 -nan
|
|
||||||
10.72 0.20 -nan
|
|
||||||
10.88 0.20 -nan
|
|
||||||
11.03 0.20 -nan
|
|
||||||
11.17 0.20 -nan
|
|
||||||
11.32 0.20 -nan
|
|
||||||
11.47 0.20 -nan
|
|
||||||
11.62 0.20 -nan
|
|
||||||
11.78 0.20 -nan
|
|
||||||
11.92 0.20 -nan
|
|
||||||
12.07 0.20 -nan
|
|
||||||
12.22 0.20 -nan
|
|
||||||
12.38 0.20 -nan
|
|
||||||
12.53 0.20 -nan
|
|
||||||
12.67 0.20 -nan
|
|
||||||
12.82 0.20 -nan
|
|
||||||
12.97 0.20 -nan
|
|
||||||
13.12 0.20 -nan
|
|
||||||
13.28 0.20 -nan
|
|
||||||
13.42 0.20 -nan
|
|
||||||
13.57 0.20 -nan
|
|
||||||
13.72 0.20 -nan
|
|
||||||
13.88 0.20 -nan
|
|
||||||
14.03 0.20 -nan
|
|
||||||
14.17 0.20 -nan
|
|
||||||
14.32 0.20 -nan
|
|
||||||
14.47 0.20 -nan
|
|
||||||
14.62 0.20 -nan
|
|
||||||
14.77 0.20 -nan
|
|
||||||
14.92 0.20 nan
|
|
||||||
15.07 0.20 -nan
|
|
||||||
15.22 0.20 -nan
|
|
||||||
15.38 0.20 -nan
|
|
||||||
15.52 0.20 -nan
|
|
||||||
15.67 0.20 -nan
|
|
||||||
15.82 0.20 -nan
|
|
||||||
15.97 0.20 -nan
|
|
||||||
16.12 0.20 -nan
|
|
||||||
16.27 0.20 -nan
|
|
||||||
16.43 0.20 -nan
|
|
||||||
16.57 0.20 -nan
|
|
||||||
16.72 0.20 -nan
|
|
||||||
16.88 0.20 -nan
|
|
||||||
17.02 0.20 -nan
|
|
||||||
17.18 0.20 -nan
|
|
||||||
17.32 0.20 -nan
|
|
||||||
17.47 0.20 -nan
|
|
||||||
17.62 0.20 -nan
|
|
||||||
17.77 0.20 -nan
|
|
||||||
17.93 0.20 -nan
|
|
||||||
18.07 0.20 -nan
|
|
||||||
18.22 0.20 -nan
|
|
||||||
18.38 0.20 -nan
|
|
||||||
18.52 0.20 -nan
|
|
||||||
18.68 0.20 -nan
|
|
||||||
18.82 0.20 -nan
|
|
||||||
18.97 0.202 0.20 0.000000
|
|
||||||
3.07 0.20 0.000000
|
3.07 0.20 0.000000
|
||||||
3.23 0.20 0.000000
|
3.23 0.20 0.000000
|
||||||
3.38 0.20 0.000000
|
3.38 0.20 0.000000
|
||||||
|
|||||||
@ -39,7 +39,7 @@ $(BUILD_DIR)/%.s: %.c
|
|||||||
|
|
||||||
.PHONY: clean distclean tags info asm format
|
.PHONY: clean distclean tags info asm format
|
||||||
|
|
||||||
clean: viz
|
clean: vis
|
||||||
$(info ===> CLEAN)
|
$(info ===> CLEAN)
|
||||||
@rm -rf $(BUILD_DIR)
|
@rm -rf $(BUILD_DIR)
|
||||||
@rm -f tags
|
@rm -f tags
|
||||||
@ -48,7 +48,7 @@ distclean: clean
|
|||||||
$(info ===> DIST CLEAN)
|
$(info ===> DIST CLEAN)
|
||||||
@rm -f $(TARGET)
|
@rm -f $(TARGET)
|
||||||
|
|
||||||
viz:
|
vis:
|
||||||
$(info ===> REMOVING VIZUALISATION FILES)
|
$(info ===> REMOVING VIZUALISATION FILES)
|
||||||
@rm -f vtk_files/particle*.vtk
|
@rm -f vtk_files/particle*.vtk
|
||||||
@rm -f vis_files/particle*.dat
|
@rm -f vis_files/particle*.dat
|
||||||
|
|||||||
@ -15,7 +15,7 @@ bcRight 3 #
|
|||||||
gx 0.0 # Body forces (e.g. gravity)
|
gx 0.0 # Body forces (e.g. gravity)
|
||||||
gy 0.0 #
|
gy 0.0 #
|
||||||
|
|
||||||
re 16500.0 # Reynolds number
|
re 36500.0 # Reynolds number
|
||||||
|
|
||||||
u_init 1.0 # initial value for velocity in x-direction
|
u_init 1.0 # initial value for velocity in x-direction
|
||||||
v_init 0.0 # initial value for velocity in y-direction
|
v_init 0.0 # initial value for velocity in y-direction
|
||||||
@ -48,10 +48,10 @@ gamma 0.9 # upwind differencing factor gamma
|
|||||||
# Particle Tracing Data:
|
# Particle Tracing Data:
|
||||||
# -----------------------
|
# -----------------------
|
||||||
|
|
||||||
numberOfParticles 60
|
numberOfParticles 200
|
||||||
startTime 100.0
|
startTime 0
|
||||||
injectTimePeriod 0.5
|
injectTimePeriod 1.0
|
||||||
writeTimePeriod 0.2
|
writeTimePeriod 0.5
|
||||||
|
|
||||||
x1 0.0
|
x1 0.0
|
||||||
y1 0.5
|
y1 0.5
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -25,8 +25,7 @@
|
|||||||
|
|
||||||
static double distance(double i, double j, double iCenter, double jCenter)
|
static double distance(double i, double j, double iCenter, double jCenter)
|
||||||
{
|
{
|
||||||
return sqrt(pow(iCenter - i, 2)
|
return sqrt(pow(iCenter - i, 2) + pow(jCenter - j, 2) * 1.0);
|
||||||
+ pow(jCenter - j, 2) * 1.0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void print(Solver* solver, double* grid)
|
void print(Solver* solver, double* grid)
|
||||||
@ -106,7 +105,6 @@ void initSolver(Solver* solver, Parameter* params)
|
|||||||
solver->gamma = params->gamma;
|
solver->gamma = params->gamma;
|
||||||
solver->rho = params->rho;
|
solver->rho = params->rho;
|
||||||
|
|
||||||
|
|
||||||
int imax = solver->imax;
|
int imax = solver->imax;
|
||||||
int jmax = solver->jmax;
|
int jmax = solver->jmax;
|
||||||
size_t size = (imax + 2) * (jmax + 2) * sizeof(double);
|
size_t size = (imax + 2) * (jmax + 2) * sizeof(double);
|
||||||
@ -134,27 +132,23 @@ void initSolver(Solver* solver, Parameter* params)
|
|||||||
solver->dtBound = 0.5 * solver->re * 1.0 / invSqrSum;
|
solver->dtBound = 0.5 * solver->re * 1.0 / invSqrSum;
|
||||||
|
|
||||||
double xCenter = 0, yCenter = 0, radius = 0;
|
double xCenter = 0, yCenter = 0, radius = 0;
|
||||||
double x1=0, x2=0, y1=0, y2=0;
|
double x1 = 0, x2 = 0, y1 = 0, y2 = 0;
|
||||||
|
|
||||||
int* s = solver->s;
|
int* s = solver->s;
|
||||||
|
|
||||||
|
switch (params->shape) {
|
||||||
switch(params->shape)
|
|
||||||
{
|
|
||||||
case NOSHAPE:
|
case NOSHAPE:
|
||||||
break;
|
break;
|
||||||
case RECT:
|
case RECT:
|
||||||
x1 = params->xCenter - params->xRectLength/2;
|
x1 = params->xCenter - params->xRectLength / 2;
|
||||||
x2 = params->xCenter + params->xRectLength/2;
|
x2 = params->xCenter + params->xRectLength / 2;
|
||||||
y1 = params->yCenter - params->yRectLength/2;
|
y1 = params->yCenter - params->yRectLength / 2;
|
||||||
y2 = params->yCenter + params->yRectLength/2;
|
y2 = params->yCenter + params->yRectLength / 2;
|
||||||
|
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
{
|
for (int i = 1; i < imax + 1; i++) {
|
||||||
for (int i = 1; i < imax + 1; i++)
|
if ((x1 <= (i * dx)) && ((i * dx) <= x2) && (y1 <= (j * dy)) &&
|
||||||
{
|
((j * dy) <= y2)) {
|
||||||
if((x1 <= (i*dx)) && ((i*dx) <= x2) && (y1 <= (j*dy)) && ((j*dy) <= y2))
|
|
||||||
{
|
|
||||||
S(i, j) = LOCAL;
|
S(i, j) = LOCAL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -166,12 +160,9 @@ void initSolver(Solver* solver, Parameter* params)
|
|||||||
yCenter = params->yCenter;
|
yCenter = params->yCenter;
|
||||||
radius = params->circleRadius;
|
radius = params->circleRadius;
|
||||||
|
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
{
|
for (int i = 1; i < imax + 1; i++) {
|
||||||
for (int i = 1; i < imax + 1; i++)
|
if (distance((i * dx), (j * dy), xCenter, yCenter) <= radius) {
|
||||||
{
|
|
||||||
if(distance((i*dx), (j*dy), xCenter, yCenter) <= radius)
|
|
||||||
{
|
|
||||||
S(i, j) = LOCAL;
|
S(i, j) = LOCAL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -182,27 +173,45 @@ void initSolver(Solver* solver, Parameter* params)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
{
|
for (int i = 1; i < imax + 1; i++) {
|
||||||
for (int i = 1; i < imax + 1; i++)
|
// if( S(i+1,j+1) == NONE && S(i+1,j) == NONE && S(i,j+1) == NONE &&
|
||||||
{
|
// S(i-1,j-1) == LOCAL && S(i,j) == LOCAL ) S(i,j) = BOTTOMRIGHT; else if(
|
||||||
// if( S(i+1,j+1) == NONE && S(i+1,j) == NONE && S(i,j+1) == NONE && S(i-1,j-1) == LOCAL && S(i,j) == LOCAL ) S(i,j) = BOTTOMRIGHT;
|
// S(i-1,j+1) == NONE && S(i-1,j) == NONE && S(i,j+1) == NONE && S(i+1,j-1) ==
|
||||||
// else if( S(i-1,j+1) == NONE && S(i-1,j) == NONE && S(i,j+1) == NONE && S(i+1,j-1) == LOCAL && S(i,j) == LOCAL ) S(i,j) = BOTTOMLEFT;
|
// LOCAL && S(i,j) == LOCAL ) S(i,j) = BOTTOMLEFT; else if( S(i+1,j-1) == NONE
|
||||||
// else if( S(i+1,j-1) == NONE && S(i,j-1) == NONE && S(i+1,j) == NONE && S(i-1,j+1) == LOCAL && S(i,j) == LOCAL ) S(i,j) = TOPRIGHT;
|
// && S(i,j-1) == NONE && S(i+1,j) == NONE && S(i-1,j+1) == LOCAL && S(i,j) ==
|
||||||
// else if( S(i-1,j-1) == NONE && S(i,j-1) == NONE && S(i-1,j) == NONE && S(i+1,j+1) == LOCAL && S(i,j) == LOCAL ) S(i,j) = TOPLEFT;
|
// LOCAL ) S(i,j) = TOPRIGHT; else if( S(i-1,j-1) == NONE && S(i,j-1) == NONE
|
||||||
// else if( S(i+1,j) == NONE && S(i-1,j) == LOCAL && S(i,j) == LOCAL ) S(i,j) = RIGHT;
|
// && S(i-1,j) == NONE && S(i+1,j+1) == LOCAL && S(i,j) == LOCAL ) S(i,j) =
|
||||||
// else if( S(i,j+1) == NONE && S(i,j-1) == LOCAL && S(i,j) == LOCAL ) S(i,j) = BOTTOM;
|
// TOPLEFT; else if( S(i+1,j) == NONE && S(i-1,j) == LOCAL && S(i,j) == LOCAL
|
||||||
// else if( S(i-1,j) == NONE && S(i+1,j) == LOCAL && S(i,j) == LOCAL ) S(i,j) = LEFT;
|
// ) S(i,j) = RIGHT; else if( S(i,j+1) == NONE && S(i,j-1) == LOCAL && S(i,j)
|
||||||
// else if( S(i,j-1) == NONE && S(i,j+1) == LOCAL && S(i,j) == LOCAL ) S(i,j) = TOP;
|
// == LOCAL ) S(i,j) = BOTTOM; else if( S(i-1,j) == NONE && S(i+1,j) == LOCAL
|
||||||
|
// && S(i,j) == LOCAL ) S(i,j) = LEFT; else if( S(i,j-1) == NONE && S(i,j+1)
|
||||||
|
// == LOCAL && S(i,j) == LOCAL ) S(i,j) = TOP;
|
||||||
|
|
||||||
if( S(i,j-1) == NONE && S(i,j+1) == LOCAL && S(i,j) == LOCAL ) S(i,j) = BOTTOM; //TOP
|
if (S(i, j - 1) == NONE && S(i, j + 1) == LOCAL && S(i, j) == LOCAL)
|
||||||
if( S(i-1,j) == NONE && S(i+1,j) == LOCAL && S(i,j) == LOCAL ) S(i,j) = LEFT; //LEFT
|
S(i, j) = BOTTOM; // TOP
|
||||||
if( S(i+1,j) == NONE && S(i-1,j) == LOCAL && S(i,j) == LOCAL ) S(i,j) = RIGHT; //RIGHT
|
if (S(i - 1, j) == NONE && S(i + 1, j) == LOCAL && S(i, j) == LOCAL)
|
||||||
if( S(i,j+1) == NONE && S(i,j-1) == LOCAL && S(i,j) == LOCAL ) S(i,j) = TOP; //BOTTOM
|
S(i, j) = LEFT; // LEFT
|
||||||
if( S(i-1,j-1) == NONE && S(i,j-1) == NONE && S(i-1,j) == NONE && S(i+1,j+1) == LOCAL && (S(i,j) == LOCAL || S(i,j) == LEFT || S(i,j) == BOTTOM ) ) S(i,j) = BOTTOMLEFT; //TOPLEFT
|
if (S(i + 1, j) == NONE && S(i - 1, j) == LOCAL && S(i, j) == LOCAL)
|
||||||
if( S(i+1,j-1) == NONE && S(i,j-1) == NONE && S(i+1,j) == NONE && S(i-1,j+1) == LOCAL && (S(i,j) == LOCAL || S(i,j) == RIGHT || S(i,j) == BOTTOM ) ) S(i,j) = BOTTOMRIGHT; //TOPRIGHT
|
S(i, j) = RIGHT; // RIGHT
|
||||||
if( S(i-1,j+1) == NONE && S(i-1,j) == NONE && S(i,j+1) == NONE && S(i+1,j-1) == LOCAL && (S(i,j) == LOCAL || S(i,j) == LEFT || S(i,j) == TOP )) S(i,j) = TOPLEFT; //BOTTOMLEFT
|
if (S(i, j + 1) == NONE && S(i, j - 1) == LOCAL && S(i, j) == LOCAL)
|
||||||
if( S(i+1,j+1) == NONE && S(i+1,j) == NONE && S(i,j+1) == NONE && S(i-1,j-1) == LOCAL && (S(i,j) == LOCAL || S(i,j) == RIGHT || S(i,j) == TOP ) ) S(i,j) = TOPRIGHT; //BOTTOMRIGHT
|
S(i, j) = TOP; // BOTTOM
|
||||||
|
if (S(i - 1, j - 1) == NONE && S(i, j - 1) == NONE && S(i - 1, j) == NONE &&
|
||||||
|
S(i + 1, j + 1) == LOCAL &&
|
||||||
|
(S(i, j) == LOCAL || S(i, j) == LEFT || S(i, j) == BOTTOM))
|
||||||
|
S(i, j) = BOTTOMLEFT; // TOPLEFT
|
||||||
|
if (S(i + 1, j - 1) == NONE && S(i, j - 1) == NONE && S(i + 1, j) == NONE &&
|
||||||
|
S(i - 1, j + 1) == LOCAL &&
|
||||||
|
(S(i, j) == LOCAL || S(i, j) == RIGHT || S(i, j) == BOTTOM))
|
||||||
|
S(i, j) = BOTTOMRIGHT; // TOPRIGHT
|
||||||
|
if (S(i - 1, j + 1) == NONE && S(i - 1, j) == NONE && S(i, j + 1) == NONE &&
|
||||||
|
S(i + 1, j - 1) == LOCAL &&
|
||||||
|
(S(i, j) == LOCAL || S(i, j) == LEFT || S(i, j) == TOP))
|
||||||
|
S(i, j) = TOPLEFT; // BOTTOMLEFT
|
||||||
|
if (S(i + 1, j + 1) == NONE && S(i + 1, j) == NONE && S(i, j + 1) == NONE &&
|
||||||
|
S(i - 1, j - 1) == LOCAL &&
|
||||||
|
(S(i, j) == LOCAL || S(i, j) == RIGHT || S(i, j) == TOP))
|
||||||
|
S(i, j) = TOPRIGHT; // BOTTOMRIGHT
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -223,12 +232,11 @@ void computeRHS(Solver* solver)
|
|||||||
double* g = solver->g;
|
double* g = solver->g;
|
||||||
int* s = solver->s;
|
int* s = solver->s;
|
||||||
|
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
{
|
for (int i = 1; i < imax + 1; i++) {
|
||||||
for (int i = 1; i < imax + 1; i++)
|
|
||||||
{
|
|
||||||
// if(S(i,j) == NONE)
|
// if(S(i,j) == NONE)
|
||||||
RHS(i, j) = idt * ((F(i, j) - F(i - 1, j)) * idx + (G(i, j) - G(i, j - 1)) * idy);
|
RHS(i, j) = idt *
|
||||||
|
((F(i, j) - F(i - 1, j)) * idx + (G(i, j) - G(i, j - 1)) * idy);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -311,7 +319,6 @@ void solveRB(Solver* solver)
|
|||||||
res = 0.0;
|
res = 0.0;
|
||||||
jsw = 1;
|
jsw = 1;
|
||||||
|
|
||||||
|
|
||||||
for (int i = 1; i < imax + 1; i++) {
|
for (int i = 1; i < imax + 1; i++) {
|
||||||
P(i, 0) = P(i, 1);
|
P(i, 0) = P(i, 1);
|
||||||
P(i, jmax + 1) = P(i, jmax);
|
P(i, jmax + 1) = P(i, jmax);
|
||||||
@ -324,21 +331,18 @@ void solveRB(Solver* solver)
|
|||||||
|
|
||||||
// setObjectPBoundaryCondition(solver);
|
// setObjectPBoundaryCondition(solver);
|
||||||
|
|
||||||
for (pass = 0; pass < 2; pass++)
|
for (pass = 0; pass < 2; pass++) {
|
||||||
{
|
|
||||||
isw = jsw;
|
isw = jsw;
|
||||||
|
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
{
|
for (int i = isw; i < imax + 1; i += 2) {
|
||||||
for (int i = isw; i < imax + 1; i += 2)
|
|
||||||
{
|
|
||||||
// if(S(i,j) == NONE)
|
// if(S(i,j) == NONE)
|
||||||
// {
|
// {
|
||||||
double r = RHS(i, j) -
|
double r = RHS(i, j) -
|
||||||
((P(i + 1, j) - 2.0 * P(i, j) + P(i - 1, j)) * idx2 +
|
((P(i + 1, j) - 2.0 * P(i, j) + P(i - 1, j)) * idx2 +
|
||||||
(P(i, j + 1) - 2.0 * P(i, j) + P(i, j - 1)) * idy2);
|
(P(i, j + 1) - 2.0 * P(i, j) + P(i, j - 1)) * idy2);
|
||||||
|
|
||||||
P(i, j) -= (factor * r );
|
P(i, j) -= (factor * r);
|
||||||
|
|
||||||
res += (r * r);
|
res += (r * r);
|
||||||
// }
|
// }
|
||||||
@ -589,8 +593,7 @@ void setSpecialBoundaryCondition(Solver* solver)
|
|||||||
for (int i = 1; i < imax; i++) {
|
for (int i = 1; i < imax; i++) {
|
||||||
U(i, jmax + 1) = 2.0 - U(i, jmax);
|
U(i, jmax + 1) = 2.0 - U(i, jmax);
|
||||||
}
|
}
|
||||||
}
|
} else if (strcmp(solver->problem, "canal") == 0) {
|
||||||
else if (strcmp(solver->problem, "canal") == 0) {
|
|
||||||
double ylength = solver->ylength;
|
double ylength = solver->ylength;
|
||||||
double y;
|
double y;
|
||||||
|
|
||||||
@ -598,18 +601,12 @@ void setSpecialBoundaryCondition(Solver* solver)
|
|||||||
y = mDy * (j - 0.5);
|
y = mDy * (j - 0.5);
|
||||||
U(0, j) = y * (ylength - y) * 4.0 / (ylength * ylength);
|
U(0, j) = y * (ylength - y) * 4.0 / (ylength * ylength);
|
||||||
}
|
}
|
||||||
|
} else if (strcmp(solver->problem, "backstep") == 0) {
|
||||||
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
|
if (S(0, j) == NONE) U(0, j) = 1.0;
|
||||||
}
|
}
|
||||||
else if (strcmp(solver->problem, "backstep") == 0)
|
} else if (strcmp(solver->problem, "karman") == 0) {
|
||||||
{
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
|
||||||
{
|
|
||||||
if(S(0,j) == NONE) U(0, j) = 1.0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (strcmp(solver->problem, "karman") == 0)
|
|
||||||
{
|
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
|
||||||
{
|
|
||||||
U(0, j) = 1.0;
|
U(0, j) = 1.0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -623,55 +620,52 @@ void setObjectBoundaryCondition(Solver* solver)
|
|||||||
double* v = solver->v;
|
double* v = solver->v;
|
||||||
int* s = solver->s;
|
int* s = solver->s;
|
||||||
|
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
{
|
for (int i = 1; i < imax + 1; i++) {
|
||||||
for (int i = 1; i < imax + 1; i++)
|
switch (S(i, j)) {
|
||||||
{
|
|
||||||
switch(S(i,j))
|
|
||||||
{
|
|
||||||
case TOP:
|
case TOP:
|
||||||
U(i,j) = -U(i,j+1);
|
U(i, j) = -U(i, j + 1);
|
||||||
U(i-1,j) = -U(i-1,j+1);
|
U(i - 1, j) = -U(i - 1, j + 1);
|
||||||
V(i,j) = 0.0;
|
V(i, j) = 0.0;
|
||||||
break;
|
break;
|
||||||
case BOTTOM:
|
case BOTTOM:
|
||||||
U(i,j) = -U(i,j-1);
|
U(i, j) = -U(i, j - 1);
|
||||||
U(i-1,j) = -U(i-1,j-1);
|
U(i - 1, j) = -U(i - 1, j - 1);
|
||||||
V(i,j) = 0.0;
|
V(i, j) = 0.0;
|
||||||
break;
|
break;
|
||||||
case LEFT:
|
case LEFT:
|
||||||
U(i-1,j) = 0.0;
|
U(i - 1, j) = 0.0;
|
||||||
V(i,j) = -V(i-1,j);
|
V(i, j) = -V(i - 1, j);
|
||||||
V(i,j-1) = -V(i-1,j-1);
|
V(i, j - 1) = -V(i - 1, j - 1);
|
||||||
break;
|
break;
|
||||||
case RIGHT:
|
case RIGHT:
|
||||||
U(i,j) = 0.0;
|
U(i, j) = 0.0;
|
||||||
V(i,j) = -V(i+1,j);
|
V(i, j) = -V(i + 1, j);
|
||||||
V(i,j-1) = -V(i+1,j-1);
|
V(i, j - 1) = -V(i + 1, j - 1);
|
||||||
break;
|
break;
|
||||||
case TOPLEFT:
|
case TOPLEFT:
|
||||||
U(i,j) = -U(i,j+1);
|
U(i, j) = -U(i, j + 1);
|
||||||
U(i-1,j) = 0.0;
|
U(i - 1, j) = 0.0;
|
||||||
V(i,j) = 0.0;
|
V(i, j) = 0.0;
|
||||||
V(i,j-1) = -V(i-1,j-1);
|
V(i, j - 1) = -V(i - 1, j - 1);
|
||||||
break;
|
break;
|
||||||
case TOPRIGHT:
|
case TOPRIGHT:
|
||||||
U(i,j) = 0.0;
|
U(i, j) = 0.0;
|
||||||
U(i-1,j) = -U(i-1,j+1);
|
U(i - 1, j) = -U(i - 1, j + 1);
|
||||||
V(i,j) = 0.0;
|
V(i, j) = 0.0;
|
||||||
V(i,j-1) = -V(i+1,j-1);
|
V(i, j - 1) = -V(i + 1, j - 1);
|
||||||
break;
|
break;
|
||||||
case BOTTOMLEFT:
|
case BOTTOMLEFT:
|
||||||
U(i,j) = -U(i,j-1);
|
U(i, j) = -U(i, j - 1);
|
||||||
U(i-1,j) = 0.0;
|
U(i - 1, j) = 0.0;
|
||||||
V(i,j) = -V(i-1,j);
|
V(i, j) = -V(i - 1, j);
|
||||||
V(i,j-1) = 0.0;
|
V(i, j - 1) = 0.0;
|
||||||
break;
|
break;
|
||||||
case BOTTOMRIGHT:
|
case BOTTOMRIGHT:
|
||||||
U(i,j) = 0.0;
|
U(i, j) = 0.0;
|
||||||
U(i-1,j) = -U(i-1,j-1);
|
U(i - 1, j) = -U(i - 1, j - 1);
|
||||||
V(i,j) = -V(i,j+1);
|
V(i, j) = -V(i, j + 1);
|
||||||
V(i,j-1) = 0.0;
|
V(i, j - 1) = 0.0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -686,35 +680,32 @@ void setObjectPBoundaryCondition(Solver* solver)
|
|||||||
double* p = solver->p;
|
double* p = solver->p;
|
||||||
int* s = solver->s;
|
int* s = solver->s;
|
||||||
|
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
{
|
for (int i = 1; i < imax + 1; i++) {
|
||||||
for (int i = 1; i < imax + 1; i++)
|
switch (S(i, j)) {
|
||||||
{
|
|
||||||
switch (S(i,j))
|
|
||||||
{
|
|
||||||
case TOP:
|
case TOP:
|
||||||
P(i,j) = P(i,j+1);
|
P(i, j) = P(i, j + 1);
|
||||||
break;
|
break;
|
||||||
case BOTTOM:
|
case BOTTOM:
|
||||||
P(i,j) = P(i,j-1);
|
P(i, j) = P(i, j - 1);
|
||||||
break;
|
break;
|
||||||
case LEFT:
|
case LEFT:
|
||||||
P(i,j) = P(i-1,j);
|
P(i, j) = P(i - 1, j);
|
||||||
break;
|
break;
|
||||||
case RIGHT:
|
case RIGHT:
|
||||||
P(i,j) = P(i,j+1);
|
P(i, j) = P(i, j + 1);
|
||||||
break;
|
break;
|
||||||
case TOPLEFT:
|
case TOPLEFT:
|
||||||
P(i,j) = (P(i-1,j) + P(i,j+1))/2;
|
P(i, j) = (P(i - 1, j) + P(i, j + 1)) / 2;
|
||||||
break;
|
break;
|
||||||
case TOPRIGHT:
|
case TOPRIGHT:
|
||||||
P(i,j) = (P(i+1,j) + P(i,j+1))/2;
|
P(i, j) = (P(i + 1, j) + P(i, j + 1)) / 2;
|
||||||
break;
|
break;
|
||||||
case BOTTOMLEFT:
|
case BOTTOMLEFT:
|
||||||
P(i,j) = (P(i-1,j) + P(i,j-1))/2;
|
P(i, j) = (P(i - 1, j) + P(i, j - 1)) / 2;
|
||||||
break;
|
break;
|
||||||
case BOTTOMRIGHT:
|
case BOTTOMRIGHT:
|
||||||
P(i,j) = (P(i+1,j) + P(i,j-1))/2;
|
P(i, j) = (P(i + 1, j) + P(i, j - 1)) / 2;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@ -743,12 +734,9 @@ void computeFG(Solver* solver)
|
|||||||
double du2dx, dv2dy, duvdx, duvdy;
|
double du2dx, dv2dy, duvdx, duvdy;
|
||||||
double du2dx2, du2dy2, dv2dx2, dv2dy2;
|
double du2dx2, du2dy2, dv2dx2, dv2dy2;
|
||||||
|
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
{
|
for (int i = 1; i < imax + 1; i++) {
|
||||||
for (int i = 1; i < imax + 1; i++)
|
if (S(i, j) == NONE) {
|
||||||
{
|
|
||||||
if(S(i,j) == NONE)
|
|
||||||
{
|
|
||||||
du2dx = inverseDx * 0.25 *
|
du2dx = inverseDx * 0.25 *
|
||||||
((U(i, j) + U(i + 1, j)) * (U(i, j) + U(i + 1, j)) -
|
((U(i, j) + U(i + 1, j)) * (U(i, j) + U(i + 1, j)) -
|
||||||
(U(i, j) + U(i - 1, j)) * (U(i, j) + U(i - 1, j))) +
|
(U(i, j) + U(i - 1, j)) * (U(i, j) + U(i - 1, j))) +
|
||||||
@ -758,19 +746,24 @@ void computeFG(Solver* solver)
|
|||||||
|
|
||||||
duvdy = inverseDy * 0.25 *
|
duvdy = inverseDy * 0.25 *
|
||||||
((V(i, j) + V(i + 1, j)) * (U(i, j) + U(i, j + 1)) -
|
((V(i, j) + V(i + 1, j)) * (U(i, j) + U(i, j + 1)) -
|
||||||
(V(i, j - 1) + V(i + 1, j - 1)) * (U(i, j) + U(i, j - 1))) +
|
(V(i, j - 1) + V(i + 1, j - 1)) *
|
||||||
|
(U(i, j) + U(i, j - 1))) +
|
||||||
gamma * inverseDy * 0.25 *
|
gamma * inverseDy * 0.25 *
|
||||||
(fabs(V(i, j) + V(i + 1, j)) * (U(i, j) - U(i, j + 1)) +
|
(fabs(V(i, j) + V(i + 1, j)) * (U(i, j) - U(i, j + 1)) +
|
||||||
fabs(V(i, j - 1) + V(i + 1, j - 1)) *
|
fabs(V(i, j - 1) + V(i + 1, j - 1)) *
|
||||||
(U(i, j) - U(i, j - 1)));
|
(U(i, j) - U(i, j - 1)));
|
||||||
|
|
||||||
du2dx2 = inverseDx * inverseDx * (U(i + 1, j) - 2.0 * U(i, j) + U(i - 1, j));
|
du2dx2 = inverseDx * inverseDx *
|
||||||
du2dy2 = inverseDy * inverseDy * (U(i, j + 1) - 2.0 * U(i, j) + U(i, j - 1));
|
(U(i + 1, j) - 2.0 * U(i, j) + U(i - 1, j));
|
||||||
F(i, j) = U(i, j) + dt * (inverseRe * (du2dx2 + du2dy2) - du2dx - duvdy + gx);
|
du2dy2 = inverseDy * inverseDy *
|
||||||
|
(U(i, j + 1) - 2.0 * U(i, j) + U(i, j - 1));
|
||||||
|
F(i, j) = U(i, j) +
|
||||||
|
dt * (inverseRe * (du2dx2 + du2dy2) - du2dx - duvdy + gx);
|
||||||
|
|
||||||
duvdx = inverseDx * 0.25 *
|
duvdx = inverseDx * 0.25 *
|
||||||
((U(i, j) + U(i, j + 1)) * (V(i, j) + V(i + 1, j)) -
|
((U(i, j) + U(i, j + 1)) * (V(i, j) + V(i + 1, j)) -
|
||||||
(U(i - 1, j) + U(i - 1, j + 1)) * (V(i, j) + V(i - 1, j))) +
|
(U(i - 1, j) + U(i - 1, j + 1)) *
|
||||||
|
(V(i, j) + V(i - 1, j))) +
|
||||||
gamma * inverseDx * 0.25 *
|
gamma * inverseDx * 0.25 *
|
||||||
(fabs(U(i, j) + U(i, j + 1)) * (V(i, j) - V(i + 1, j)) +
|
(fabs(U(i, j) + U(i, j + 1)) * (V(i, j) - V(i + 1, j)) +
|
||||||
fabs(U(i - 1, j) + U(i - 1, j + 1)) *
|
fabs(U(i - 1, j) + U(i - 1, j + 1)) *
|
||||||
@ -783,41 +776,41 @@ void computeFG(Solver* solver)
|
|||||||
(fabs(V(i, j) + V(i, j + 1)) * (V(i, j) - V(i, j + 1)) +
|
(fabs(V(i, j) + V(i, j + 1)) * (V(i, j) - V(i, j + 1)) +
|
||||||
fabs(V(i, j) + V(i, j - 1)) * (V(i, j) - V(i, j - 1)));
|
fabs(V(i, j) + V(i, j - 1)) * (V(i, j) - V(i, j - 1)));
|
||||||
|
|
||||||
dv2dx2 = inverseDx * inverseDx * (V(i + 1, j) - 2.0 * V(i, j) + V(i - 1, j));
|
dv2dx2 = inverseDx * inverseDx *
|
||||||
dv2dy2 = inverseDy * inverseDy * (V(i, j + 1) - 2.0 * V(i, j) + V(i, j - 1));
|
(V(i + 1, j) - 2.0 * V(i, j) + V(i - 1, j));
|
||||||
G(i, j) = V(i, j) + dt * (inverseRe * (dv2dx2 + dv2dy2) - duvdx - dv2dy + gy);
|
dv2dy2 = inverseDy * inverseDy *
|
||||||
}
|
(V(i, j + 1) - 2.0 * V(i, j) + V(i, j - 1));
|
||||||
else
|
G(i, j) = V(i, j) +
|
||||||
{
|
dt * (inverseRe * (dv2dx2 + dv2dy2) - duvdx - dv2dy + gy);
|
||||||
switch(S(i,j))
|
} else {
|
||||||
{
|
switch (S(i, j)) {
|
||||||
case TOP:
|
case TOP:
|
||||||
G(i,j) = V(i,j);
|
G(i, j) = V(i, j);
|
||||||
break;
|
break;
|
||||||
case BOTTOM:
|
case BOTTOM:
|
||||||
G(i,j-1) = V(i,j-1);
|
G(i, j - 1) = V(i, j - 1);
|
||||||
break;
|
break;
|
||||||
case LEFT:
|
case LEFT:
|
||||||
F(i-1,j) = U(i-1,j);
|
F(i - 1, j) = U(i - 1, j);
|
||||||
break;
|
break;
|
||||||
case RIGHT:
|
case RIGHT:
|
||||||
F(i,j) = U(i,j);
|
F(i, j) = U(i, j);
|
||||||
break;
|
break;
|
||||||
case TOPLEFT:
|
case TOPLEFT:
|
||||||
F(i-1,j) = U(i-1,j);
|
F(i - 1, j) = U(i - 1, j);
|
||||||
G(i,j) = V(i,j);
|
G(i, j) = V(i, j);
|
||||||
break;
|
break;
|
||||||
case TOPRIGHT:
|
case TOPRIGHT:
|
||||||
F(i,j) = U(i,j);
|
F(i, j) = U(i, j);
|
||||||
G(i,j) = V(i,j);
|
G(i, j) = V(i, j);
|
||||||
break;
|
break;
|
||||||
case BOTTOMLEFT:
|
case BOTTOMLEFT:
|
||||||
F(i-1,j) = U(i-1,j);
|
F(i - 1, j) = U(i - 1, j);
|
||||||
G(i,j-1) = V(i,j-1);
|
G(i, j - 1) = V(i, j - 1);
|
||||||
break;
|
break;
|
||||||
case BOTTOMRIGHT:
|
case BOTTOMRIGHT:
|
||||||
F(i,j) = U(i,j);
|
F(i, j) = U(i, j);
|
||||||
G(i,j-1) = V(i,j-1);
|
G(i, j - 1) = V(i, j - 1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -852,10 +845,8 @@ void adaptUV(Solver* solver)
|
|||||||
|
|
||||||
double val = 0;
|
double val = 0;
|
||||||
|
|
||||||
for (int j = 1; j < jmax + 1; j++)
|
for (int j = 1; j < jmax + 1; j++) {
|
||||||
{
|
for (int i = 1; i < imax + 1; i++) {
|
||||||
for (int i = 1; i < imax + 1; i++)
|
|
||||||
{
|
|
||||||
U(i, j) = F(i, j) - (P(i + 1, j) - P(i, j)) * factorX;
|
U(i, j) = F(i, j) - (P(i + 1, j) - P(i, j)) * factorX;
|
||||||
V(i, j) = G(i, j) - (P(i, j + 1) - P(i, j)) * factorY;
|
V(i, j) = G(i, j) - (P(i, j + 1) - P(i, j)) * factorY;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
set terminal png size 3600,768 enhanced font ,28
|
set terminal png size 3600,768 enhanced font ,28
|
||||||
set output 'velocity.png'
|
set output 'velocity.png'
|
||||||
set xrange[0:30]
|
set xrange[0:7]
|
||||||
set yrange[0:4]
|
set yrange[0:1.5]
|
||||||
set size ratio -1
|
set size ratio -1
|
||||||
set datafile separator whitespace
|
set datafile separator whitespace
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 188 KiB |
@ -1,8 +1,10 @@
|
|||||||
unset border; unset tics; unset key;
|
unset border; unset tics; unset key;
|
||||||
set term gif animate delay 50
|
set term gif animate delay 10
|
||||||
set output "trace.gif"
|
set output "trace.gif"
|
||||||
set xrange [0:7]
|
set xrange [0:7]
|
||||||
set yrange [0:1.5]
|
set yrange [0:1.5]
|
||||||
|
set size ratio -1
|
||||||
|
|
||||||
set object 1 rect from 0.0,0.0 to 1.0,0.5 lw 5
|
set object 1 rect from 0.0,0.0 to 1.0,0.5 lw 5
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 453 KiB |
Loading…
Reference in New Issue
Block a user