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

Timestamp:

Sep 10, 2018 2: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/onion.c (modified) (2 diffs)

sasmodels/models/onion.c

@@ -30 +30 @@
 
 static double
-form_volume(double radius_core, double n_shells, double thickness[])
-{
-  int n = (int)(n_shells+0.5);
-  double r = radius_core;
-  for (int i=0; i < n; i++) {
-    r += thickness[i];
-  }
-  return M_4PI_3*cube(r);
-}
-
-static double
-effective_radius(int mode, double radius_core, double n_shells, double thickness[])
+outer_radius(double radius_core, double n_shells, double thickness[])
 {
   int n = (int)(n_shells+0.5);
@@ -49 +38 @@
   }
   return r;
+}
+
+static double
+form_volume(double radius_core, double n_shells, double thickness[])
+{
+  return M_4PI_3*cube(outer_radius(radius_core, n_shells, thickness));
+}
+
+static double
+effective_radius(int mode, double radius_core, double n_shells, double thickness[])
+{
+  // case 1: outer radius
+  return outer_radius(radius_core, n_shells, thickness);
 }