Changeset db472a5 in sasmodels for sasmodels/models/spherical_sld.c

Timestamp:

Sep 18, 2018 9:19:29 AM (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:

fb7c176, c5f7aa9

Parents:

0159b5e (diff), d299327 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'beta_approx_new_R_eff' into beta_approx

File:

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

sasmodels/models/spherical_sld.c

@@ -1 @@
-static double form_volume(
-    double fp_n_shells,
-    double thickness[],
-    double interface[])
+static double
+outer_radius(double fp_n_shells, double thickness[], double interface[])
 {
     int n_shells= (int)(fp_n_shells + 0.5);
@@ -9 +7 @@
         r += thickness[i] + interface[i];
     }
-    return M_4PI_3*cube(r);
+    return r;
+}
+
+static double form_volume(
+    double fp_n_shells,
+    double thickness[],
+    double interface[])
+{
+    return M_4PI_3*cube(outer_radius(fp_n_shells, thickness, interface));
+}
+
+static double
+effective_radius(int mode, double fp_n_shells, double thickness[], double interface[])
+{
+    // case 1: outer radius
+    return outer_radius(fp_n_shells, thickness, interface);
 }