Author: bugman
Date: Tue Aug 26 19:18:24 2014
New Revision: 25314
URL: http://svn.gna.org/viewcvs/relax?rev=25314&view=rev
Log:
The square() function macro is now defined for the
target_functions/exponential.c file.
This is defined in the header, and now the exponential.h is included in the C
file to access it.
Modified:
trunk/target_functions/exponential.c
trunk/target_functions/exponential.h
Modified: trunk/target_functions/exponential.c
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/exponential.c?rev=25314&r1=25313&r2=25314&view=diff
==============================================================================
--- trunk/target_functions/exponential.c (original)
+++ trunk/target_functions/exponential.c Tue Aug 26 19:18:24 2014
@@ -21,8 +21,8 @@
/* The exponential function is needed. */
#include <math.h>
-/* Get the maximum dimensions. */
-#include "dimensions.h"
+/* Include the exponential header file to access the square() function and the
maximum dimensions. */
+#include "exponential.h"
void exponential(double I0, double R, double relax_times[MAX_DATA], double
back_calc[MAX_DATA], int num_times) {
Modified: trunk/target_functions/exponential.h
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/exponential.h?rev=25314&r1=25313&r2=25314&view=diff
==============================================================================
--- trunk/target_functions/exponential.h (original)
+++ trunk/target_functions/exponential.h Tue Aug 26 19:18:24 2014
@@ -33,4 +33,7 @@
void exponential_dR_dI0(double I0, double R, int R_index, int IO_index, double
relax_times[MAX_DATA], double back_calc_hess[MAX_PARAMS][MAX_PARAMS][MAX_DATA],
int num_times);
void exponential_dR2(double I0, double R, int R_index, double
relax_times[MAX_DATA], double back_calc_hess[MAX_PARAMS][MAX_PARAMS][MAX_DATA],
int num_times);
+/* Define the function for calculating the square of a number. */
+#define square(x) ((x)*(x))
+
#endif
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
