Commit 56c389b3 authored by incardon's avatar incardon

Fixing example compilation

parent f6f26f4d
......@@ -17,8 +17,8 @@ ifeq ($(PROFILE),ON)
CUDA_CC=scorep --nocompiler --cuda --mpp=mpi nvcc
CUDA_CC_LINK=scorep --nocompiler --cuda --mpp=mpi nvcc
else
CUDA_CC=nvcc
CUDA_CC_LINK=nvcc
CUDA_CC=$(CUDA_CC)
CUDA_CC_LINK=$(CUDA_CC)
endif
LDIR =
......@@ -31,7 +31,7 @@ sph_dlb_test: OPT += -DTEST_RUN
sph_dlb_test: sph_dlb
%.o: %.cu
$(CUDA_CC) -O3 $(OPT) -use_fast_math -arch=sm_61 -lineinfo -g -c -isystem=/home/i-bird/MPI/include --std=c++11 -o $@ $< $(INCLUDE_PATH_NVCC)
$(CUDA_CC) -O3 $(OPT) -use_fast_math -arch=sm_61 -lineinfo -g -c --std=c++11 -o $@ $< $(INCLUDE_PATH_NVCC)
%.o: %.cpp
$(CC) -O3 $(OPT) -g -c --std=c++11 -o $@ $< $(INCLUDE_PATH)
......
......@@ -60,7 +60,7 @@ typedef float real_number;
#define FLUID 1
// initial spacing between particles dp in the formulas
const real_number dp = 0.00425 / 2.0;
const real_number dp = 0.00425;
// Maximum height of the fluid water
// is going to be calculated and filled later on
real_number h_swl = 0.0;
......@@ -72,7 +72,7 @@ const real_number coeff_sound = 20.0;
const real_number gamma_ = 7.0;
// sqrt(3.0*dp*dp) support of the kernel
const real_number H = 0.00736121593217 / 2.0;
const real_number H = 0.00736121593217;
// Eta in the formulas
const real_number Eta2 = 0.01 * H*H;
......@@ -86,10 +86,10 @@ const real_number visco = 0.1;
real_number cbar = 0.0;
// Mass of the fluid particles
const real_number MassFluid = 0.0000767656 / 8.0;
const real_number MassFluid = 0.0000767656;
// Mass of the boundary particles
const real_number MassBound = 0.0000767656 / 8.0;
const real_number MassBound = 0.0000767656;
//
......@@ -713,7 +713,7 @@ int main(int argc, char* argv[])
// Here we define our domain a 2D box with internals from 0 to 1.0 for x and y
Box<3,real_number> domain({-0.05,-0.05,-0.05},{1.7010,0.7065,0.511});
size_t sz[3] = {2*(413-1)+1,2*(179-1)+1,2*(133-1)+1};
size_t sz[3] = {413,179,133};
// Fill W_dap
W_dap = 1.0/Wab(H/1.5);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment