Changeset e44432d in sasmodels for sasmodels/models/vesicle.c

Timestamp:

Oct 19, 2018 5:46:26 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:

be43e39

Parents:

2586ab72

Message:

support hollow models in structure factor calculations

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)
+shell_volume(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);
+    return M_4PI_3 * (cube(radius+thickness) - cube(radius));
 }
 
@@ -11 +8 @@
 form_volume(double radius, double thickness)
 {
-    //note that for the vesicle model, the volume is ONLY the shell volume
-    double total;
-    return shell_volume(&total, radius, thickness);
+    return M_4PI_3 * cube(radius+thickness);
 }
+
 
 static double