Skip to content

Commit e273782

Browse files
committed
Add constants file to avoid issues on macOS with M_PIl not being defined
1 parent 53db2c5 commit e273782

File tree

7 files changed

+17
-2
lines changed

7 files changed

+17
-2
lines changed

native/include/c_constants.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#pragma once
2+
3+
// GNU compilers on Linux should already have this defined
4+
#ifndef M_PIl
5+
#define M_PIl 3.141592653589793238462643383279
6+
#endif
7+
8+
#define MU_0 (4*M_PIl*1e-7)
9+
#define MU_0_INV (1/MU_0)
10+
11+

native/src/a_random.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <time.h>
33
#include <math.h>
44
#include "a_random.h"
5+
#include "c_constants.h"
56

67
mt19937_state *create_mt19937_state(void) {
78

native/src/a_util.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "c_vectormath.h"
33
#include<complex>
44
#include<cmath>
5+
#include "c_constants.h"
56

67
using namespace std::complex_literals;
78

native/src/c_demag_oommf.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ to copyright protection within the United States.
4444
#include <stdlib.h>
4545
#include "c_dipolar.h"
4646
#include "c_demagcoef.h"
47-
47+
#include "c_constants.h"
4848

4949
int AS_Compare(const void* px,const void* py) {
5050
// Comparison based on absolute values

native/src/c_nebm_spherical_lib.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "c_nebm_spherical_lib.h"
22
#include "c_nebm_lib.h"
33
#include "math.h"
4+
#include "c_constants.h"
45

56
double compute_norm_spherical(double * a, int n, int scale) {
67
/* Compute the norm of an array *a. *a is assumed to have spherical

native/src/c_tensor_2dpbc.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "c_dipolar.h"
44
#include "c_demagcoef.h"
55
#include "c_tensor_2dpbc.h"
6+
#include "c_constants.h"
67

78
double DemagTensorNormal(enum Type_Nij comp,double x,double y,double z,double a,double b,double c)
89
{

native/src/m_util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "m_clib.h"
22
#include "c_vectormath.h"
3-
3+
#include "c_constants.h"
44

55
// Compute: S \cdot (S_i \times S_j)
66
inline double volume(double S[3], double Si[3], double Sj[3]) {

0 commit comments

Comments
 (0)