Changes in sasmodels/models/hollow_rectangular_prism.c [71b751d:ee60aa7] in sasmodels

File:

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

sasmodels/models/hollow_rectangular_prism.c

@@ +1 @@
+// TODO: interface to form_volume/shell_volume not yet settled
 static double
-form_volume(double length_a, double b2a_ratio, double c2a_ratio, double thickness)
+shell_volume(double *total, double length_a, double b2a_ratio, double c2a_ratio, double thickness)
 {
     double length_b = length_a * b2a_ratio;
@@ -8 +9 @@
     double c_core = length_c - 2.0*thickness;
     double vol_core = a_core * b_core * c_core;
-    double vol_total = length_a * length_b * length_c;
-    double vol_shell = vol_total - vol_core;
-    return vol_shell;
+    *total = length_a * length_b * length_c;
+    return *total - vol_core;
+}
+
+static double
+form_volume(double length_a, double b2a_ratio, double c2a_ratio, double thickness)
+{
+    double total;
+    return shell_volume(&total, length_a, b2a_ratio, c2a_ratio, thickness);
+}
+
+static double
+effective_radius(int mode, double length_a, double b2a_ratio, double c2a_ratio, double thickness)
+//effective_radius_type = ["equivalent sphere","half length_a", "half length_b", "half length_c",
+//                         "equivalent outer circular cross-section","half ab diagonal","half diagonal"]
+// NOTE length_a is external dimension!
+{
+    switch (mode) {
+    case 1: // equivalent sphere
+        return cbrt(0.75*cube(length_a)*b2a_ratio*c2a_ratio/M_PI);
+    case 2: // half length_a
+        return 0.5 * length_a;
+    case 3: // half length_b
+        return 0.5 * length_a*b2a_ratio;
+    case 4: // half length_c
+        return 0.5 * length_a*c2a_ratio;
+    case 5: // equivalent outer circular cross-section
+        return length_a*sqrt(b2a_ratio/M_PI);
+    case 6: // half ab diagonal
+        return 0.5*sqrt(square(length_a) * (1.0 + square(b2a_ratio)));
+    case 7: // half diagonal
+        return 0.5*sqrt(square(length_a) * (1.0 + square(b2a_ratio) + square(c2a_ratio)));
+    }
 }