Changeset ee60aa7 in sasmodels for sasmodels/models/hollow_cylinder.c

Timestamp:

Sep 10, 2018 4:16:46 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

d299327

Parents:

3f818b2

Message:

clean up effective radius functions; improve mono_gauss_coil accuracy; start moving VR into C

File:

• sasmodels/models/hollow_cylinder.c (modified) (2 diffs)

sasmodels/models/hollow_cylinder.c

@@ -15 +15 @@
 }
 
+// TODO: interface to form_volume/shell_volume not yet settled
+static double
+shell_volume(double *total, double radius, double thickness, double length)
+{
+    *total = M_PI*length*square(radius+thickness);
+    return *total - M_PI*length*radius*radius;
+}
+
 static double
 form_volume(double radius, double thickness, double length)
 {
-    double v_shell = M_PI*length*(square(radius+thickness) - radius*radius);
-    return v_shell;
+    double total;
+    return shell_volume(&total, radius, thickness, length);
 }
 
@@ -38 +46 @@
 effective_radius(int mode, double radius, double thickness, double length)
 {
-    if (mode == 1) {
+    switch (mode) {
+    case 1: // equivalent sphere
         return radius_from_volume(radius, thickness, length);
-    } else if (mode == 2) {
+    case 2: // outer radius
         return radius + thickness;
-    } else if (mode == 3) {
+    case 3: // half length
         return 0.5*length;
-    } else if (mode == 4) {
+    case 4: // half outer min dimension
         return (radius + thickness < 0.5*length ? radius + thickness : 0.5*length);
-    } else if (mode == 5) {
+    case 5: // half outer max dimension
         return (radius + thickness > 0.5*length ? radius + thickness : 0.5*length);
-    } else {
+    case 6: // half outer diagonal
         return radius_from_diagonal(radius,thickness,length);
     }