diff --git a/tests/testInteractions.c b/tests/testInteractions.c index 991ac995b873887d8ce75c16cbd86378a3b72668..67ac0a24d7d49e0fd1d4d58abc002d1e19d2a1e3 100644 --- a/tests/testInteractions.c +++ b/tests/testInteractions.c @@ -96,17 +96,17 @@ void dump_indv_particle_fields(char *fileName, struct part *p) { fprintf(file, "%6llu %10f %10f %10f %10f %10f %10f %10f %10f %10f %13e %13e %13e " "%13e %13e %13e %13e " - "%13e %13e %13e\n", + "%13e %13e %13e %10f\n", p->id, p->x[0], p->x[1], p->x[2], p->v[0], p->v[1], p->v[2], p->a_hydro[0], p->a_hydro[1], p->a_hydro[2], p->rho, p->rho_dh, p->density.wcount, p->density.wcount_dh, p->force.h_dt, p->force.v_sig, #if defined(GADGET2_SPH) p->density.div_v, p->density.rot_v[0], p->density.rot_v[1], - p->density.rot_v[2] + p->density.rot_v[2], p->entropy_dt #elif defined(DEFAULT_SPH) - p->density.div_v, p->density.curl_v[0], p->density.curl_v[1], - p->density.curl_v[2] + p->density.div_v, p->density.rot_v[0], p->density.rot_v[1], + p->density.rot_v[2], 0. #else 0., 0., 0., 0., 0., 0., 0., 0., 0., 0. #endif @@ -146,7 +146,6 @@ void test_interactions(struct part *parts, int count, /* Use the first particle in the array as the one that gets updated. */ struct part pi = parts[0]; - // const float hig2 = hi * hi * kernel_gamma2; FILE *file; char serial_filename[200] = ""; @@ -223,7 +222,7 @@ void test_interactions(struct part *parts, int count, dump_indv_particle_fields(vec_filename, pjq[i]); /* Perform vector interaction. */ - runner_iact_nonsym_vec_density(r2q, dxq, hiq, hjq, piq, pjq); + vec_inter_func(r2q, dxq, hiq, hjq, piq, pjq); file = fopen(vec_filename, "a"); fprintf(file, "\nPARTICLES AFTER INTERACTION:\n"); diff --git a/tests/testSPHStep.c b/tests/testSPHStep.c index d60f258eadd0ed792ba87ad56905d840fa32a6ab..fa49ed9d00c37393abd2f7e17ae628d79b4125f6 100644 --- a/tests/testSPHStep.c +++ b/tests/testSPHStep.c @@ -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.soundspeed); + 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 79e1630b35e4d5f2867f13ef0f61a8067e1bb3ba..e2ec35bc4382658be7754b9c11fc3a3dbe4bbdc1 100644 --- a/tests/testSingle.c +++ b/tests/testSingle.c @@ -87,8 +87,8 @@ int main(int argc, char *argv[]) { 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_27.dat b/tests/tolerance_27.dat index f5031c5f47dfa203300ebcc9a47fbac42f854d26..beaecb967bc99edafc19ed66ce14db333933b0d7 100644 --- a/tests/tolerance_27.dat +++ b/tests/tolerance_27.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