Changeset 533e745 in sasview

Timestamp:

Nov 30, 2011 1:10:45 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:

72da06f

Parents:

c25f1fa

Message:

Re #5 fixing reflc compilation on MSVC

File:

• sansmodels/src/sans/models/c_extensions/refl.c (modified) (4 diffs)

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

@@ -15 +15 @@
 double re_kernel(double dp[], double q) {
         int n = dp[0];
-        int i,j,fun_type[n+2];
+        int i,j;
 
         double scale = dp[1];
@@ -23 +23 @@
         double background = dp[6];
 
-        double sld[n+2],thick_inter[n+2],thick[n+2],total_thick;
+  double total_thick;
   double nsl=21.0; //nsl = Num_sub_layer:
   int n_s;
@@ -29 +29 @@
   double sign,erfunc, fun;
   double pi;
+
+  double* sld;
+  double* thick_inter;
+  double* thick;
+  int*fun_type;
+
+  sld = (double*)malloc(n+2);
+  thick_inter = (double*)malloc(n+2);
+  thick = (double*)malloc(n+2);
+  fun_type = (int*)malloc(n+2);
 
   fun_type[0] = dp[3];
@@ -119 +129 @@
     R += background;
 
+    free(sld);
+    free(thick_inter);
+    free(thick);
+    free(fun_type);
+
     return R;