Changeset d42dd4a in sasmodels

Timestamp:

Oct 26, 2018 12:18:32 PM (6 years ago)

Author:

pkienzle

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

f872fd1

Parents:

12f4c19

Message:

fix compiler warnings for CUDA

Location:

sasmodels/models

Files:

• barbell.c (modified) (1 diff)
• capped_cylinder.c (modified) (1 diff)
• core_multi_shell.c (modified) (1 diff)
• core_shell_bicelle.c (modified) (1 diff)
• core_shell_bicelle_elliptical.c (modified) (1 diff)
• core_shell_bicelle_elliptical_belt_rough.c (modified) (1 diff)
• core_shell_cylinder.c (modified) (1 diff)
• core_shell_ellipsoid.c (modified) (1 diff)
• core_shell_parallelepiped.c (modified) (1 diff)
• core_shell_sphere.c (modified) (1 diff)
• cylinder.c (modified) (1 diff)
• ellipsoid.c (modified) (1 diff)
• elliptical_cylinder.c (modified) (1 diff)
• fuzzy_sphere.c (modified) (1 diff)
• hollow_cylinder.c (modified) (1 diff)
• hollow_rectangular_prism.c (modified) (1 diff)
• hollow_rectangular_prism_thin_walls.c (modified) (1 diff)
• mono_gauss_coil.c (modified) (1 diff)
• parallelepiped.c (modified) (1 diff)
• pringle.c (modified) (1 diff)
• raspberry.c (modified) (1 diff)
• rectangular_prism.c (modified) (1 diff)
• triaxial_ellipsoid.c (modified) (1 diff)

sasmodels/models/barbell.c

@@ -80 +80 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(radius_bell, radius , length);

sasmodels/models/capped_cylinder.c

@@ -102 +102 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(radius, radius_cap, length);

sasmodels/models/core_multi_shell.c

@@ -29 +29 @@
 {
   switch (mode) {
+  default:
   case 1: // outer radius
     return outer_radius(core_radius, fp_n, thickness);

sasmodels/models/core_shell_bicelle.c

@@ -55 +55 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(radius, thick_rim, thick_face, length);

sasmodels/models/core_shell_bicelle_elliptical.c

@@ -30 +30 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(r_minor, x_core, thick_rim, thick_face, length);

sasmodels/models/core_shell_bicelle_elliptical_belt_rough.c

@@ -31 +31 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(r_minor, x_core, thick_rim, thick_face, length);

sasmodels/models/core_shell_cylinder.c

@@ -32 +32 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(radius, thickness, length);

sasmodels/models/core_shell_ellipsoid.c

@@ -74 +74 @@
 
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(radius_equat_core, x_core, thick_shell, x_polar_shell);

sasmodels/models/core_shell_parallelepiped.c

@@ -47 +47 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(length_a, length_b, length_c, thick_rim_a, thick_rim_b, thick_rim_c);

sasmodels/models/core_shell_sphere.c

@@ -9 +9 @@
 {
     switch (mode) {
+    default:
     case 1: // outer radius
         return radius + thickness;

sasmodels/models/cylinder.c

@@ -29 +29 @@
 {
     switch (mode) {
+    default:
     case 1:
         return radius_from_volume(radius, length);

sasmodels/models/ellipsoid.c

@@ -35 +35 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(radius_polar, radius_equatorial);

sasmodels/models/elliptical_cylinder.c

@@ -37 +37 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(radius_minor, r_ratio, length);

sasmodels/models/fuzzy_sphere.c

@@ -8 +8 @@
 {
     switch (mode) {
+    default:
     case 1: // radius
         return radius;

sasmodels/models/hollow_cylinder.c

@@ -30 +30 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(radius, thickness, length);

sasmodels/models/hollow_rectangular_prism.c

@@ -26 +26 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return cbrt(cube(length_a)*b2a_ratio*c2a_ratio/M_4PI_3);

sasmodels/models/hollow_rectangular_prism_thin_walls.c

@@ -21 +21 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return cbrt(cube(length_a)*b2a_ratio*c2a_ratio/M_4PI_3);

sasmodels/models/mono_gauss_coil.c

@@ -8 +8 @@
 {
     switch (mode) {
+    default:
     case 1: // R_g
         return rg;

sasmodels/models/parallelepiped.c

@@ -9 +9 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return cbrt(length_a*length_b*length_c/M_4PI_3);

sasmodels/models/pringle.c

@@ -108 +108 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return cbrt(M_PI*radius*radius*thickness/M_4PI_3);

sasmodels/models/raspberry.c

@@ -18 +18 @@
 {
     switch (mode) {
+    default:
     case 1: // radius_large
         return radius_lg;

sasmodels/models/rectangular_prism.c

@@ -9 +9 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return cbrt(cube(length_a)*b2a_ratio*c2a_ratio/M_4PI_3);

sasmodels/models/triaxial_ellipsoid.c

@@ -31 +31 @@
 {
     switch (mode) {
+    default:
     case 1: // equivalent sphere
         return radius_from_volume(radius_equat_minor,radius_equat_major, radius_polar);