Changeset 54954e1 in sasmodels for sasmodels/models/hayter_msa.py

Timestamp:

Mar 17, 2016 9:58:53 AM (8 years ago)

Author:

richardh

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:

03e8a6e, 3a45c2c

Parents:

15bd6e7

Message:

renam volfrac in adsorbedlayer, sort some docs bugs

File:

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

sasmodels/models/hayter_msa.py

@@ -51 +51 @@
 #  dp[2] = volfraction();
 #  dp[3] = temperature();
-#  dp[4] = saltconc();
+#  dp[4] = salt_concentration();
 #  dp[5] = dielectconst();
 
@@ -76 +76 @@
     ["volfraction",   "None",     0.0192, [0, 0.74],   "", "volume fraction of spheres"],
     ["temperature",   "K",  318.16,   [0, inf],    "", "temperature, in Kelvin, for Debye length calculation"],
-    ["saltconc",      "M",    0.0,    [-inf, inf], "", "conc of salt, moles/litre, 1:1 electolyte, for Debye length"],
+    ["salt_concentration",      "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"]
     ]
@@ -96 +96 @@
 oldname = 'HayterMSAStructure'
 #oldpars = dict(effect_radius="radius_effective",effect_radius_pd="radius_effective_pd",effect_radius_pd_n="radius_effective_pd_n")
-oldpars = dict(radius_effective="effect_radius",radius_effective_pd="effect_radius_pd",radius_effective_pd_n="effect_radius_pd_n")
+oldpars = dict(radius_effective="effect_radius",radius_effective_pd="effect_radius_pd",radius_effective_pd_n="effect_radius_pd_n",salt_concentration="saltconc")
 #oldpars = dict( )
 # default parameter set,  use  compare.sh -midQ -linear
 # 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 saltconc zero
+# odd that the default st has salt_concentration zero
 demo = dict(radius_effective=20.75,
             charge=19.0,
             volfraction=0.0192,
             temperature=318.16,
-            saltconc=0.05,
+            salt_concentration=0.05,
             dielectconst=71.08,
             radius_effective_pd=0.1,
@@ -120 +120 @@
       'volfraction': 0.0192,
       'temperature': 298.0,
-      'saltconc': 0,
+      'salt_concentration': 0,
       'dielectconst': 78.0,
       'radius_effective_pd': 0},
@@ -130 +130 @@
       'volfraction': 0.0192,
       'temperature': 298.0,
-      'saltconc': 0.05,
+      'salt_concentration': 0.05,
       'dielectconst': 78.0,
       'radius_effective_pd': 0.1,