tdecrease porosity control volume radius for speedup - sphere - GPU-based 3D di… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 3fb22ab2e5449c3004c500252975c65e9f4cd57a | |
parent 593fb8fe62895e72ad23dcf3134d528e143d43a3 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 7 Nov 2014 13:08:26 +0100 | |
decrease porosity control volume radius for speedup | |
Diffstat: | |
M src/darcy.cuh | 16 ++++++++-------- | |
1 file changed, 8 insertions(+), 8 deletions(-) | |
--- | |
diff --git a/src/darcy.cuh b/src/darcy.cuh | |
t@@ -269,8 +269,8 @@ __global__ void findDarcyPorosities( | |
const Float dz = devC_grid.L[2]/nz; | |
// Cell sphere radius | |
- //const Float R = fmin(dx, fmin(dy,dz)) * 0.5; // diameter = cell width | |
- const Float R = fmin(dx, fmin(dy,dz)); // diameter = 2*cell width | |
+ const Float R = fmin(dx, fmin(dy,dz)) * 0.5; // diameter = cell width | |
+ //const Float R = fmin(dx, fmin(dy,dz)); // diameter = 2*cell width | |
const Float cell_volume = 4.0/3.0*M_PI*R*R*R; | |
Float void_volume = cell_volume; | |
t@@ -311,14 +311,14 @@ __global__ void findDarcyPorosities( | |
unsigned int cellID, startIdx, endIdx, i; | |
// Iterate over 27 neighbor cells, R = cell width | |
- /*for (int z_dim=-1; z_dim<2; ++z_dim) // z-axis | |
- for (int y_dim=-1; y_dim<2; ++y_dim) // y-axis | |
- for (int x_dim=-1; x_dim<2; ++x_dim) // x-axis*/ | |
+ for (int z_dim=-1; z_dim<2; ++z_dim) { // z-axis | |
+ for (int y_dim=-1; y_dim<2; ++y_dim) { // y-axis | |
+ for (int x_dim=-1; x_dim<2; ++x_dim) { // x-axis | |
- // Iterate over 27 neighbor cells, R = 2*cell width | |
- for (int z_dim=-2; z_dim<3; ++z_dim) { // z-axis | |
+ // Iterate over 125 neighbor cells, R = 2*cell width | |
+ /*for (int z_dim=-2; z_dim<3; ++z_dim) { // z-axis | |
for (int y_dim=-2; y_dim<3; ++y_dim) { // y-axis | |
- for (int x_dim=-2; x_dim<3; ++x_dim) { // x-axis | |
+ for (int x_dim=-2; x_dim<3; ++x_dim) { // x-axis*/ | |
// Index of neighbor cell this iteration is looking at | |
targetCell = gridPos + make_int3(x_dim, y_dim, z_dim); |