Changeset 830622f in sasview for sansmodels/src

Timestamp:

Nov 30, 2011 3:27:22 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:

2585545

Parents:

01a870d

Message:

Re #5 fixing spheresld compilation on MSVC

File:

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

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

@@ -21 +21 @@
         double background = dp[6];
         double npts = dp[57]; //number of sub_layers in each interface
-
-        double sld[n+2],thick_inter[n+2],thick[n+2],fun_coef[n+2],total_thick;
+  double nsl=npts;//21.0; //nsl = Num_sub_layer:  MUST ODD number in double //no other number works now
+  int n_s;
+  int floor_nsl;
+
+  double sld_i,sld_f,dz,bes,fun,f,vol,vol_pre,vol_sub,qr,r,contr,f2;
+  double sign,slope=0.0;
+  double pi;
+  double r0 = 0.0, thick_inter_f;
+
+  int* fun_type;
+  double* sld;
+  double* thick_inter;
+  double* thick;
+  double* fun_coef;
+
+        double total_thick;
+
+        fun_type = (int*)malloc(n+2);
+  sld = (double*)malloc(n+2);
+  thick_inter = (double*)malloc(n+2);
+  thick = (double*)malloc(n+2);
+  fun_coef = (double*)malloc(n+2);
+
         fun_type[0] = dp[3];
         fun_coef[0] = fabs(dp[58]);
@@ -40 +61 @@
         thick_inter[n+1] = 0.0;
         fun_coef[n+1] = 0.0;
-
-        double nsl=npts;//21.0; //nsl = Num_sub_layer:  MUST ODD number in double //no other number works now
-        int n_s;
-        int floor_nsl;
-
-  double sld_i,sld_f,dz,bes,fun,f,vol,vol_pre,vol_sub,qr,r,contr,f2;
-  double sign,slope=0.0;
-  double pi;
-  double r0 = 0.0, thick_inter_f;
 
     pi = 4.0*atan(1.0);
@@ -144 +156 @@
         f2 *= scale;
         f2 += background;
+
+  free(fun_type);
+  free(sld);
+  free(sld_im);
+  free(thick_inter);
+  free(thick);
+  free(fun_coef);
+
     return (f2);
 }