crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 22:26:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Cleaned up the optional parameters interface of rotate_angle

Browse source
This commit is contained in:
Adam G Nelson 2018-05-13 06:44:48 -04:00
parent a73f633d24
commit a6e75c3509
5 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
openmc/capi/math.py
View file

@ -1,4 +1,4 @@
from ctypes import (c_int, c_double, POINTER)
from ctypes import (c_int, c_double, POINTER, CFUNCTYPE)
import numpy as np
from numpy.ctypeslib import ndpointer
@ -201,8 +201,11 @@ def rotate_angle(uvw0, mu, phi=None):
uvw = np.zeros(3, dtype=np.float64)
uvw0_arr = np.array(uvw0, dtype=np.float64)
_dll.rotate_angle(uvw0_arr, c_double(mu),
uvw, c_double(phi))
if phi is None:
_dll.rotate_angle(uvw0_arr, c_double(mu), uvw, None)
else:
_dll.rotate_angle(uvw0_arr, c_double(mu), uvw, c_double(phi))
return uvw

17
src/math.F90
View file

@ -75,7 +75,7 @@ module math
implicit none
real(C_DOUBLE), intent(inout) :: uvw(3)
real(C_DOUBLE), value, intent(in) :: mu
real(C_DOUBLE), value, intent(in) :: phi
real(C_DOUBLE), optional, intent(in) :: phi
end subroutine rotate_angle_c_intfc
function maxwell_spectrum_c_intfc(T) bind(C, name='maxwell_spectrum_c') &
@ -225,16 +225,19 @@ contains
!===============================================================================
subroutine rotate_angle(uvw0, mu, uvw, phi) bind(C)
real(C_DOUBLE), intent(in) :: uvw0(3) ! directional cosine
real(C_DOUBLE), intent(in) :: mu ! cosine of angle in lab or CM
real(C_DOUBLE), intent(out) :: uvw(3) ! rotated directional cosine
real(C_DOUBLE), optional :: phi ! azimuthal angle
real(C_DOUBLE), intent(in) :: uvw0(3) ! directional cosine
real(C_DOUBLE), intent(in) :: mu ! cosine of angle in lab or CM
real(C_DOUBLE), intent(out) :: uvw(3) ! rotated directional cosine
real(C_DOUBLE), target, optional :: phi ! azimuthal angle
real(C_DOUBLE), pointer :: phi_ptr
uvw = uvw0
if (present(phi)) then
call rotate_angle_c_intfc(uvw, mu, phi)
phi_ptr => phi
call rotate_angle_c_intfc(uvw, mu, phi_ptr)
else
call rotate_angle_c_intfc(uvw, mu, -10._8)
call rotate_angle_c_intfc(uvw, mu)
end if
end subroutine rotate_angle

6
src/math_functions.cpp
View file

@ -659,7 +659,7 @@ void calc_zn_c(const int n, const double rho, const double phi, double zn[]) {
// and SERPENT.
//==============================================================================
void rotate_angle_c(double uvw[3], const double mu, double phi) {
void rotate_angle_c(double uvw[3], const double mu, double* phi) {
double phi_; // azimuthal angle
double sinphi; // std::sine of azimuthal angle
double cosphi; // cosine of azimuthal angle
@ -675,8 +675,8 @@ void rotate_angle_c(double uvw[3], const double mu, double phi) {
w0 = uvw[2];
// Sample azimuthal angle in [0,2pi) if none provided
if (phi != -10.) {
phi_ = phi;
if (phi != NULL) {
phi_ = (*phi);
} else {
phi_ = 2. * PI * prn();
}

2
src/math_functions.h
View file

@ -72,7 +72,7 @@ extern "C" void calc_zn_c(const int n, const double rho, const double phi,
//==============================================================================
extern "C" void rotate_angle_c(double uvw[3], const double mu,
double phi = -10.);
double* phi=NULL);
//==============================================================================
// MAXWELL_SPECTRUM samples an energy from the Maxwell fission distribution

12
tests/unit_tests/test_math.py
View file

@ -170,7 +170,17 @@ def test_rotate_angle():
assert np.array_equal(ref_uvw, test_uvw)
# Need to test phi=None somehow...
# Now to test phi is None
mu = 0.9
settings = openmc.capi.settings
settings.seed = 1
# When seed = 1, phi will be sampled as 1.9116495709698769
# The resultant reference is from hand-calculations given the above
ref_uvw = [0.9, 0.410813051297112, 0.1457142302040]
test_uvw = openmc.capi.math.rotate_angle(uvw0, mu)
assert np.allclose(ref_uvw, test_uvw)
def test_maxwell_spectrum():