Changeset ee60aa7 in sasmodels for sasmodels/models/vesicle.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/vesicle.c (modified) (2 diffs)

sasmodels/models/vesicle.c

@@ +1 @@
+// TODO: interface to form_volume/shell_volume not yet settled
+static double
+shell_volume(double *total, double radius, double thickness)
+{
+    //note that for the vesicle model, the volume is ONLY the shell volume
+    *total = M_4PI_3 * cube(radius+thickness);
+    return *total - M_4PI_3*cube(radius);
+}
+
 static double
 form_volume(double radius, double thickness)
 {
     //note that for the vesicle model, the volume is ONLY the shell volume
-    return M_4PI_3*(cube(radius+thickness) - cube(radius));
+    double total;
+    return shell_volume(&total, radius, thickness);
 }
 
@@ -9 +19 @@
 effective_radius(int mode, double radius, double thickness)
 {
+    // case 1: outer radius
     return radius + thickness;
 }