Commit 352f3185 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'intrinsic-vectorisation' into 'master'

Corrected names in testSingle.c to reflect part struct change.



See merge request !209
parents c73bb32d cf666beb
......@@ -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);
......
......@@ -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);
......
# 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
Supports Markdown
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