Changeset bb73096 in sasmodels

Timestamp:

Mar 5, 2017 2:28:50 PM (8 years ago)

Author:

butler

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

acfb094

Parents:

4329539

Message:

Hide volume fraction parameter of component D since it is treated as the
matrix polymer and thus must always be 1-phia-phib-phid (and so
caculcate in c code). Relates to ticket #593.

Location:

sasmodels/models

Files:

• rpa.c (modified) (1 diff)
• rpa.py (modified) (2 diffs)

sasmodels/models/rpa.c

@@ -59 +59 @@
   }
  
+  // Set volume fraction of component D based on constraint that sum of vol frac =1
+  Phi[3]=1.0-Phi[0]-Phi[1]-Phi[2];
+
   //set up values for cross terms in case of block copolymers (1,3,4,6,7,8,9)
   Nab=sqrt(N[0]*N[1]);

sasmodels/models/rpa.py

@@ -107 +107 @@
 
 control = "case_num"
-HIDE_NONE = set()
-HIDE_A = set("N1 Phi1 v1 L1 b1 K12 K13 K14".split())
+HIDE_ALL = set("Phi4".split())
+HIDE_A = set("N1 Phi1 v1 L1 b1 K12 K13 K14".split()).union(HIDE_ALL)
 HIDE_AB = set("N2 Phi2 v2 L2 b2 K23 K24".split()).union(HIDE_A)
 def hidden(case_num):
@@ -119 +119 @@
         return HIDE_A
     else:
-        return HIDE_NONE
+        return HIDE_ALL