cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made the linear algebra functions used in forcing.cc static to avoid collisions with the functions defined in math_utils.h

Browse Source
This commit is contained in:
jpekkila
2019-08-15 11:09:40 +03:00
parent 36fea70560
commit aa45ce04de
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/standalone/model/host_forcing.cc
View File

@@ -37,7 +37,7 @@ get_random_number_01()
return AcReal(rand()) / AcReal(RAND_MAX); return AcReal(rand()) / AcReal(RAND_MAX);
} }
AcReal3 static AcReal3
cross(const AcReal3& a, const AcReal3& b) cross(const AcReal3& a, const AcReal3& b)
{ {
AcReal3 c; AcReal3 c;
@@ -49,13 +49,13 @@ cross(const AcReal3& a, const AcReal3& b)
return c; return c;
} }
AcReal static AcReal
dot(const AcReal3& a, const AcReal3& b) dot(const AcReal3& a, const AcReal3& b)
{ {
return a.x * b.x + a.y * b.y + a.z * b.z; return a.x * b.x + a.y * b.y + a.z * b.z;
} }
AcReal3 static AcReal3
vec_norm(const AcReal3& a) vec_norm(const AcReal3& a)
{ {
AcReal3 c; AcReal3 c;
@@ -68,7 +68,7 @@ vec_norm(const AcReal3& a)
return c; return c;
} }
AcReal3 static AcReal3
vec_multi_scal(const AcReal scal, const AcReal3& a) vec_multi_scal(const AcReal scal, const AcReal3& a)
{ {
AcReal3 c; AcReal3 c;

8
src/standalone/model/host_forcing.h
View File

@@ -32,14 +32,6 @@
AcReal get_random_number_01(); AcReal get_random_number_01();
// AcReal3 cross(const AcReal3& a, const AcReal3& b);
// AcReal dot(const AcReal3& a, const AcReal3& b);
// AcReal3 vec_norm(const AcReal3& a);
// AcReal3 vec_multi_scal(const AcReal scal, const AcReal3& a);
AcReal3 helical_forcing_k_generator(const AcReal kmax, const AcReal kmin); AcReal3 helical_forcing_k_generator(const AcReal kmax, const AcReal kmin);
void helical_forcing_e_generator(AcReal3* e_force, const AcReal3 k_force); void helical_forcing_e_generator(AcReal3* e_force, const AcReal3 k_force);