Changeset bb73096 in sasmodels


Ignore:
Timestamp:
Mar 5, 2017 4:28:50 PM (5 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:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/rpa.c

    r4329539 rbb73096  
    5959  } 
    6060  
     61  // Set volume fraction of component D based on constraint that sum of vol frac =1 
     62  Phi[3]=1.0-Phi[0]-Phi[1]-Phi[2]; 
     63 
    6164  //set up values for cross terms in case of block copolymers (1,3,4,6,7,8,9) 
    6265  Nab=sqrt(N[0]*N[1]); 
  • sasmodels/models/rpa.py

    r40a87fa rbb73096  
    107107 
    108108control = "case_num" 
    109 HIDE_NONE = set() 
    110 HIDE_A = set("N1 Phi1 v1 L1 b1 K12 K13 K14".split()) 
     109HIDE_ALL = set("Phi4".split()) 
     110HIDE_A = set("N1 Phi1 v1 L1 b1 K12 K13 K14".split()).union(HIDE_ALL) 
    111111HIDE_AB = set("N2 Phi2 v2 L2 b2 K23 K24".split()).union(HIDE_A) 
    112112def hidden(case_num): 
     
    119119        return HIDE_A 
    120120    else: 
    121         return HIDE_NONE 
     121        return HIDE_ALL 
    122122 
Note: See TracChangeset for help on using the changeset viewer.