Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

importing problems with new C functions? #152

Merged
merged 1 commit into from
Jun 5, 2014
+8 −8
Merged

importing problems with new C functions? #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tardis/cmontecarlo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ npy_int64 binary_search(npy_float64 *x, npy_float64 x_insert, npy_int64 imin, np
return imin;
}

inline npy_float64 compute_distance2outer(npy_float64 r, npy_float64 mu, npy_float64 r_outer)
npy_float64 compute_distance2outer(npy_float64 r, npy_float64 mu, npy_float64 r_outer)
{
return sqrt(r_outer * r_outer + ((mu * mu - 1.0) * r * r)) - (r * mu);
}

inline npy_float64 compute_distance2inner(npy_float64 r, npy_float64 mu, npy_float64 r_inner)
npy_float64 compute_distance2inner(npy_float64 r, npy_float64 mu, npy_float64 r_inner)
{
npy_float64 check = r_inner * r_inner + (r * r * (mu * mu - 1.0));
if (check < 0.0)
Expand All @@ -67,7 +67,7 @@ inline npy_float64 compute_distance2inner(npy_float64 r, npy_float64 mu, npy_flo
}
}

inline npy_float64 compute_distance2line(npy_float64 r, npy_float64 mu, npy_float64 nu, npy_float64 nu_line, npy_float64 t_exp, npy_float64 inverse_t_exp, npy_float64 last_line, npy_float64 next_line, npy_int64 cur_zone_id)
npy_float64 compute_distance2line(npy_float64 r, npy_float64 mu, npy_float64 nu, npy_float64 nu_line, npy_float64 t_exp, npy_float64 inverse_t_exp, npy_float64 last_line, npy_float64 next_line, npy_int64 cur_zone_id)
{
npy_float64 comov_nu, doppler_factor;
doppler_factor = 1.0 - mu * r * inverse_t_exp * INVERSE_C;
Expand All @@ -91,7 +91,7 @@ inline npy_float64 compute_distance2line(npy_float64 r, npy_float64 mu, npy_floa
return ((comov_nu - nu_line) / nu) * C * t_exp;
}

inline npy_float64 compute_distance2electron(npy_float64 r, npy_float64 mu, npy_float64 tau_event, npy_float64 inverse_ne)
npy_float64 compute_distance2electron(npy_float64 r, npy_float64 mu, npy_float64 tau_event, npy_float64 inverse_ne)
{
return tau_event * inverse_ne;
}
8 changes: 4 additions & 4 deletions tardis/cmontecarlo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ npy_int64 line_search(npy_float64 *nu, npy_float64 nu_insert, npy_int64 number_o
*
* @return distance to the outer boundary
*/
inline npy_float64 compute_distance2outer(npy_float64 r, npy_float64 mu, npy_float64 r_outer);
npy_float64 compute_distance2outer(npy_float64 r, npy_float64 mu, npy_float64 r_outer);

/** Calculate the distance to the inner boundary.
*
Expand All @@ -95,7 +95,7 @@ inline npy_float64 compute_distance2outer(npy_float64 r, npy_float64 mu, npy_flo
*
* @return distance to the inner boundary
*/
inline npy_float64 compute_distance2inner(npy_float64 r, npy_float64 mu, npy_float64 r_inner);
npy_float64 compute_distance2inner(npy_float64 r, npy_float64 mu, npy_float64 r_inner);

/** Calculate the distance the packet has to travel until it redshifts to the first spectral line.
*
Expand All @@ -110,7 +110,7 @@ inline npy_float64 compute_distance2inner(npy_float64 r, npy_float64 mu, npy_flo
*
* @return distance to the next spectral line
*/
inline npy_float64 compute_distance2line(npy_float64 r, npy_float64 mu, npy_float64 nu, npy_float64 nu_line, npy_float64 t_exp, npy_float64 inverse_t_exp, npy_float64 last_line, npy_float64 next_line, npy_int64 cur_zone_id);
npy_float64 compute_distance2line(npy_float64 r, npy_float64 mu, npy_float64 nu, npy_float64 nu_line, npy_float64 t_exp, npy_float64 inverse_t_exp, npy_float64 last_line, npy_float64 next_line, npy_int64 cur_zone_id);

/** Calculate the distance to the Thomson scatter event.
* @param r distance from the center to the packet
Expand All @@ -120,6 +120,6 @@ inline npy_float64 compute_distance2line(npy_float64 r, npy_float64 mu, npy_floa
*
* @return distance to the Thomson scatter event in centimeters
*/
inline npy_float64 compute_distance2electron(npy_float64 r, npy_float64 mu, npy_float64 tau_event, npy_float64 inverse_ne);
npy_float64 compute_distance2electron(npy_float64 r, npy_float64 mu, npy_float64 tau_event, npy_float64 inverse_ne);

#endif // TARDIS_CMONTECARLO_H