Changeset 36f482f3 in sasview

Timestamp:

Dec 12, 2011 1:46:11 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:

67ac282

Parents:

74c9a30

Message:

Re #4 Fix a bunch of model warnings

Location:

sansmodels/src/sans/models/c_extensions

Files:

• core_shell_cylinder.c (modified) (1 diff)
• csparallelepiped.c (modified) (1 diff)
• sc.c (modified) (1 diff)

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

@@ -64 +64 @@
 double core_shell_cylinder_analytical_2D_scaled(CoreShellCylinderParameters *pars, double q, double q_x, double q_y) {
         double cyl_x, cyl_y, cyl_z;
-        double q_z, lenq;
-        double alpha, f, vol, sin_val, cos_val;
+        double q_z;
+        double alpha, vol, cos_val;
         double answer;
         //convert angle degree to radian

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

@@ -160 +160 @@
 double csparallelepiped_analytical_2D_scaled(CSParallelepipedParameters *pars, double q, double q_x, double q_y) {
         double dp[13];
-  double cparallel_x, cparallel_y, cparallel_z, bparallel_x, bparallel_y, parallel_x, parallel_y, parallel_z;
+  double cparallel_x, cparallel_y, cparallel_z, bparallel_x, bparallel_y, parallel_x, parallel_y;
   double q_z;
-  double alpha, vol, cos_val_c, cos_val_b, cos_val_a, edgeA, edgeB, edgeC;
+  double alpha, cos_val_c, cos_val_b, cos_val_a, edgeA, edgeB, edgeC;
 
   double answer;

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

@@ -59 +59 @@
  */
 double sc_analytical_2D_scaled(SCParameters *pars, double q, double q_x, double q_y) {
-        double a3_x, a3_y, a3_z, a2_x, a2_y, a1_x, a1_y, a1_z;
+        double a3_x, a3_y, a3_z, a2_x, a2_y, a1_x, a1_y;
         double q_z;
-        double alpha, vol, cos_val_a3, cos_val_a2, cos_val_a1;
+        double alpha, cos_val_a3, cos_val_a2, cos_val_a1;
         double a1_dot_q, a2_dot_q,a3_dot_q;
         double answer;