Changeset 7296219 in sasview for sansmodels/src/sans

Timestamp:

Nov 30, 2011 1:22:59 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:

01a870d

Parents:

72da06f

Message:

Re #5 fixing refl_adv compilation on MSVC

File:

• sansmodels/src/sans/models/c_extensions/refl_adv.c (modified) (5 diffs)

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

@@ -15 +15 @@
 double re_adv_kernel(double dp[], double q) {
         int n = dp[0];
-        int i,j,fun_type[n+2];
+        int i,j;
         double nsl;
 
@@ -25 +25 @@
         double npts = dp[69]; //number of sub_layers in each interface
 
-        double sld[n+2],sld_im[n+2],thick_inter[n+2],thick[n+2],fun_coef[n+2],total_thick;
+        double total_thick;
 
   int n_s;
@@ -31 +31 @@
   double sign,erfunc;
   double pi;
+
+  int* fun_type;
+  double* sld;
+  double* sld_im
+  double* thick_inter;
+  double* thick;
+  double* fun_coef;
+  complex  inv_n,phi1,alpha,alpha2,kn,fnm,fnp,rn,Xn,nn,nn2,an,nnp1,one,zero,two,n_sub,n_sup,knp1,Xnp1;
+
+  fun_type = (int*)malloc(n+2);
+  sld = (double*)malloc(n+2);
+  sld_im = (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];
@@ -57 +72 @@
         nsl=npts;//21.0; //nsl = Num_sub_layer:  MUST ODD number in double //no other number works now
 
-        complex  inv_n,phi1,alpha,alpha2,kn,fnm,fnp,rn,Xn,nn,nn2,an,nnp1,one,zero,two,n_sub,n_sup,knp1,Xnp1;
         pi = 4.0*atan(1.0);
     one = cassign(1.0,0.0);
@@ -138 +152 @@
     R += background;
 
+    free(fun_type);
+    free(sld);
+    free(sld_im);
+    free(thick_inter);
+    free(thick);
+    free(fun_coef);
+
     return R;