Skip to content
Snippets Groups Projects
Commit 6e82cd6b authored by Tom Theuns's avatar Tom Theuns
Browse files

updated include file for external potentials

parent 5c14e1f2
No related branches found
No related tags found
1 merge request!143Gravity particles
...@@ -73,10 +73,8 @@ ...@@ -73,10 +73,8 @@
#define NO_SPH #define NO_SPH
/* Gravity properties */ /* Gravity properties */
#define GRAVITY /* valid choices EXTERNAL_POTENTIAL_POINTMASS */
/* valid choices DEFAULT_GRAVITY || EXTERNAL_POTENTIAL */ #define EXTERNAL_POTENTIAL_POINTMASS
#define EXTERNAL_POTENTIAL
//#define DEFAULT_GRAVITY
/* System of units */ /* System of units */
...@@ -88,10 +86,4 @@ ...@@ -88,10 +86,4 @@
#define const_unit_time_in_cgs (const_unit_length_in_cgs / const_unit_velocity_in_cgs) #define const_unit_time_in_cgs (const_unit_length_in_cgs / const_unit_velocity_in_cgs)
#define const_G ((NEWTON_GRAVITY_CGS*const_unit_mass_in_cgs/(const_unit_velocity_in_cgs*const_unit_velocity_in_cgs*const_unit_length_in_cgs))) #define const_G ((NEWTON_GRAVITY_CGS*const_unit_mass_in_cgs/(const_unit_velocity_in_cgs*const_unit_velocity_in_cgs*const_unit_length_in_cgs)))
/* External Potential Constants */
#define External_Potential_X (50000 * PARSEC_IN_CGS / const_unit_length_in_cgs)
#define External_Potential_Y (50000 * PARSEC_IN_CGS / const_unit_length_in_cgs)
#define External_Potential_Z (50000 * PARSEC_IN_CGS / const_unit_length_in_cgs)
#define External_Potential_Mass (1e10 * SOLAR_MASS_IN_CGS / const_unit_mass_in_cgs)
#endif /* SWIFT_CONST_H */ #endif /* SWIFT_CONST_H */
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
******************************************************************************/ ******************************************************************************/
#include <float.h> #include <float.h>
#include "potentials.h"
/** /**
* @brief Computes the gravity time-step of a given particle * @brief Computes the gravity time-step of a given particle
* *
......
#ifndef SWIFT_GRAVITY_CONST_H
#define SWIFT_GRAVITY_CONST_H
/* External Potential Constants */
/* Properties of Point Mass */
#ifdef EXTERNAL_POTENTIAL_POINTMASS
#define External_Potential_X (50000 * PARSEC_IN_CGS / const_unit_length_in_cgs)
#define External_Potential_Y (50000 * PARSEC_IN_CGS / const_unit_length_in_cgs)
#define External_Potential_Z (50000 * PARSEC_IN_CGS / const_unit_length_in_cgs)
#define External_Potential_Mass (1e10 * SOLAR_MASS_IN_CGS / const_unit_mass_in_cgs)
#endif
#endif /* SWIFT_GRAVITY_CONST_H */
...@@ -51,9 +51,7 @@ ...@@ -51,9 +51,7 @@
#error "Invalid choice of SPH variant" #error "Invalid choice of SPH variant"
#endif #endif
#if defined(GRAVITY)
#include "./gravity/Default/gravity_part.h" #include "./gravity/Default/gravity_part.h"
#endif
#ifdef WITH_MPI #ifdef WITH_MPI
void part_create_mpi_type(MPI_Datatype* part_type); void part_create_mpi_type(MPI_Datatype* part_type);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment