diff --git a/tests/testSPHStep.c b/tests/testSPHStep.c index dade82f1b4f358f5a80091007868650a0115dbfd..daa86163066f4adf355a6a695f4652893a90d5a4 100644 --- a/tests/testSPHStep.c +++ b/tests/testSPHStep.c @@ -61,9 +61,9 @@ struct cell *make_cell(size_t N, float cellSize, int offset[3], int id_offset) { offset[2] * cellSize + z * cellSize / N + cellSize / (2 * N); part->h = h; part->id = x * N * N + y * N + z + id_offset; - ++part; part->ti_begin = 0; part->ti_end = 1; + ++part; } } } @@ -193,7 +193,7 @@ int main() { runner_do_ghost(&r, ci); message("h=%f rho=%f N_ngb=%f", p->h, p->rho, p->density.wcount); - message("c=%f", p->force.c); + message("soundspeed=%f", p->force.soundspeed); runner_doself2_force(&r, ci); runner_do_kick(&r, ci, 1); diff --git a/tests/testSingle.c b/tests/testSingle.c index 6f6a8c8ad6cffbc8594d774c4a230220b8039890..e2ec35bc4382658be7754b9c11fc3a3dbe4bbdc1 100644 --- a/tests/testSingle.c +++ b/tests/testSingle.c @@ -81,14 +81,14 @@ int main(int argc, char *argv[]) { p2.rho = 1.0f; p2.mass = 9.7059e-4; p2.h = 0.222871287 / 2; - p1.force.c = 0.0040824829f; + p1.force.soundspeed = 0.0040824829f; p1.force.balsara = 0.0f; - p2.force.c = 58.8972740361f; + p2.force.soundspeed = 58.8972740361f; p2.force.balsara = 0.0f; p1.u = 1.e-5 / (hydro_gamma_minus_one * p1.rho); p2.u = 1.e-5 / (hydro_gamma_minus_one * p2.rho) + 100.0f / (33 * p2.mass); - p1.force.POrho2 = p1.u * hydro_gamma_minus_one / p1.rho; - p2.force.POrho2 = p2.u * hydro_gamma_minus_one / p2.rho; + p1.force.P_over_rho2 = p1.u * hydro_gamma_minus_one / p1.rho; + p2.force.P_over_rho2 = p2.u * hydro_gamma_minus_one / p2.rho; /* Dump a header. */ // printParticle_single(&p1, NULL); diff --git a/tests/tolerance.dat b/tests/tolerance.dat index f5031c5f47dfa203300ebcc9a47fbac42f854d26..beaecb967bc99edafc19ed66ce14db333933b0d7 100644 --- a/tests/tolerance.dat +++ b/tests/tolerance.dat @@ -1,3 +1,3 @@ # ID pos_x pos_y pos_z v_x v_y v_z rho rho_dh wcount wcount_dh div_v curl_vx curl_vy curl_vz - 0 1e-6 1e-6 1e-6 1e-6 1e-6 1e-6 1e-5 1e-5 2e-5 3e-2 1e-5 1e-5 1e-5 1e-5 + 0 1e-6 1e-6 1e-6 1e-6 1e-6 1e-6 1e-5 1e-5 4e-5 3e-2 1e-5 1e-5 1e-5 1e-5 0 1e-6 1e-6 1e-6 1e-6 1e-6 1e-6 1e-5 1.2e-5 1e-5 1e-2 1e-4 1e-4 1e-4 1e-4