Changeset c25f1fa in sasview for sansmodels/src/sans/models

Timestamp:

Nov 30, 2011 3:06:10 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

533e745

Parents:

a807ffd

Message:

Re #5 fixing onion compilation on MSVC

File:

• sansmodels/src/sans/models/c_extensions/onion.c (modified) (3 diffs)

sansmodels/src/sans/models/c_extensions/onion.c

@@ -9 +9 @@
 // some details can be found in sld_cal.c
 double so_kernel(double dp[], double q) {
-        const int n = dp[0];
+        int n = dp[0];
         double scale = dp[1];
         double rad_core0 = dp[2];
@@ -20 +20 @@
   double pi;
   double r0 = 0.0;
-  const array_size = n+2;
-
-  double sld_out[array_size];
-  double slope[array_size];
-  double sld_in[array_size];
-  double thick[array_size];
-  double A[array_size];
-  int fun_type[array_size];
-
+
+  double *sld_out;
+  double *slope;
+  double *sld_in;
+  double *thick;
+  double *A;
+  int *fun_type;
+
+  sld_out = (double*) malloc(n+2);
+  slope = (double*) malloc(n+2);
+  sld_in = (double*) malloc(n+2);
+  thick = (double*) malloc(n+2);
+  A = (double*) malloc(n+2);
+  fun_type = (int*) malloc(n+2);
 
         for (i =1; i<=n; i++){
@@ -164 +169 @@
         f2 *= scale;
         f2 += background;
+
+  free(sld_out);
+  free(slope);
+  free(sld_in);
+  free(thick);
+  free(A);
+  free(fun_type);
+
     return (f2);
 }