Changeset deac08c in sasmodels

Timestamp:

Feb 26, 2016 2:42:27 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

e7678b2

Parents:

a8bd500

Message:

add square(), cube() and M_4PI_3

File:

• sasmodels/kernel_template.c (modified) (2 diffs)

sasmodels/kernel_template.c

@@ -67 +67 @@
 #  define pown(a,b) pow(a,b)
 #else
-#  ifdef USE_SINCOS
+#  if defined(USE_SINCOS)
 #    define SINCOS(angle,svar,cvar) svar=sincos(angle,&cvar)
 #  else
@@ -89 +89 @@
 #endif
 
-// Non-standard pi/180, used for converting between degrees and radians
+// Non-standard function library
+// pi/180, used for converting between degrees and radians
+// 4/3 pi for computing sphere volumes
+// square and cube for computing squares and cubes
 #ifndef M_PI_180
 #  define M_PI_180 0.017453292519943295
 #endif
+#ifndef M_4PI_3
+#  define M_4PI_3 4.18879020478639
+#endif
+inline double square(double x) { return pow(x,2.0); }
+//inline double square(double x) { return pown(x,2); }
+//inline double square(x) { return x*x; }
+inline double cube(double x) { return x*x*x; }