Changeset a807206 in sasmodels for sasmodels/models/hayter_msa.py

Timestamp:

Sep 30, 2016 10:42:06 PM (8 years ago)

Author:

butler

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

caddb14, 5031ca3

Parents:

2222134

Message:

updating more parameter names addressing #649

File:

• sasmodels/models/hayter_msa.py (modified) (5 diffs)

sasmodels/models/hayter_msa.py

@@ -51 +51 @@
 #  dp[2] = volfraction();
 #  dp[3] = temperature();
-#  dp[4] = salt_concentration();
+#  dp[4] = concentration_salt();
 #  dp[5] = dielectconst();
 
@@ -76 +76 @@
     ["charge",        "e",   19.0,    [0, inf],    "", "charge on sphere (in electrons)"],
     ["temperature",   "K",  318.16,   [0, inf],    "", "temperature, in Kelvin, for Debye length calculation"],
-    ["salt_concentration",      "M",    0.0,    [-inf, inf], "", "conc of salt, moles/litre, 1:1 electolyte, for Debye length"],
+    ["concentration_salt",      "M",    0.0,    [-inf, inf], "", "conc of salt, moles/litre, 1:1 electolyte, for Debye length"],
     ["dielectconst",  "None",    71.08,   [-inf, inf], "", "dielectric constant (relative permittivity) of solvent, default water, for Debye length"]
     ]
@@ -93 +93 @@
 # note the calculation varies in different limiting cases so a wide range of
 # parameters will be required for a thorough test!
-# odd that the default st has salt_concentration zero
+# odd that the default st has concentration_salt zero
 demo = dict(radius_effective=20.75,
             charge=19.0,
             volfraction=0.0192,
             temperature=318.16,
-            salt_concentration=0.05,
+            concentration_salt=0.05,
             dielectconst=71.08,
             radius_effective_pd=0.1,
@@ -113 +113 @@
       'volfraction': 0.0192,
       'temperature': 298.0,
-      'salt_concentration': 0,
+      'concentration_salt': 0,
       'dielectconst': 78.0,
       'radius_effective_pd': 0},
@@ -123 +123 @@
       'volfraction': 0.0192,
       'temperature': 298.0,
-      'salt_concentration': 0.05,
+      'concentration_salt': 0.05,
       'dielectconst': 78.0,
       'radius_effective_pd': 0.1,