Changeset 890ac7f1 in sasview for sansmodels/src/sans/models/c_extensions/refl_adv.c

Timestamp:

Nov 30, 2011 2:43:17 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:

2138c061

Parents:

e161fac

Message:

Re #5 fixing samsmodels compilation on MSVC

File:

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

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

@@ -16 +16 @@
         int n = dp[0];
         int i,j,fun_type[n+2];
+        double nsl;
 
         double scale = dp[1];
@@ -25 +26 @@
 
         double sld[n+2],sld_im[n+2],thick_inter[n+2],thick[n+2],fun_coef[n+2],total_thick;
-        fun_type[0] = dp[3];
+
+  int n_s;
+  double sld_i,sldim_i,dz,phi,R,ko2;
+  double sign,erfunc;
+  double pi;
+
+  fun_type[0] = dp[3];
         fun_coef[0] = fabs(dp[70]);
         for (i =1; i<=n; i++){
@@ -48 +55 @@
         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;
-
-    double sld_i,sldim_i,dz,phi,R,ko2;
-    double sign,erfunc;
-    double pi;
+        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);