Commit 0dd9426f authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Restore the union in the DEFAULT_SPH particle definition

parent d908d35f
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
/* SPH variant to use */ /* SPH variant to use */
//#define MINIMAL_SPH //#define MINIMAL_SPH
//#define GADGET2_SPH #define GADGET2_SPH
#define DEFAULT_SPH //#define DEFAULT_SPH
/* Gravity properties */ /* Gravity properties */
#define EXTERNAL_POTENTIAL_POINTMASS #define EXTERNAL_POTENTIAL_POINTMASS
......
...@@ -69,43 +69,43 @@ struct part { ...@@ -69,43 +69,43 @@ struct part {
float alpha; float alpha;
/* Store density/force specific stuff. */ /* Store density/force specific stuff. */
// union { union {
struct { struct {
/* Particle velocity divergence. */ /* Particle velocity divergence. */
float div_v; float div_v;
/* Derivative of particle number density. */ /* Derivative of particle number density. */
float wcount_dh; float wcount_dh;
/* Particle velocity curl. */ /* Particle velocity curl. */
float rot_v[3]; float rot_v[3];
/* Particle number density. */ /* Particle number density. */
float wcount; float wcount;
} density; } density;
struct { struct {
/* Balsara switch */ /* Balsara switch */
float balsara; float balsara;
/* Aggregate quantities. */ /* Aggregate quantities. */
float POrho2; float POrho2;
/* Change in particle energy over time. */ /* Change in particle energy over time. */
float u_dt; float u_dt;
/* Signal velocity */ /* Signal velocity */
float v_sig; float v_sig;
/* Sound speed */ /* Sound speed */
float c; float c;
} force; } force;
//}; };
/* Particle mass. */ /* Particle mass. */
float mass; float mass;
......
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