Changeset 451 for trunk

Show
Ignore:
Timestamp:
03/20/2009 07:23:43 AM (3 years ago)
Author:
powell
Message:

Added name to Gaussian, added a Gaussian to square. Beautiful!

Location:
trunk/matml/src/ternary
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/matml/src/ternary/square.c

    r449 r451  
    3636  phase_boundary solid_spinodal, *allbounds=NULL; 
    3737  /* eparams: R,T0, G1@T0,G2,G3, C1,C2,C3, M1,M2,M3, O12,O13,O23,O123 */ 
     38  energy_gaussian species = { "Species 0.8 0.8", .8, .8, -.2, .1, 2. }; 
    3839  energy_params /* Solid, liquid */ 
    39     eparams0 = {"Solid", 1.,1., 0.,-.1,-.2, -1.,-1.1,-1.2, 0.,1.,1.,1.,1., -.5,2.,.2, 0., NULL,0}, 
     40    eparams0 = {"Solid", 1.,1., 0.,-.1,-.2, -1.,-1.1,-1.2, 0.,1.,1.,1.,1., -.5,2.,.2, 0., &species,1}, 
    4041    eparams1 = {"Liquid", 1.,1., .3,.1,-.1, -2.2,-2.,-1.8, 0.,1.,.67,1.,2., -.3,-.4,-.1, -.5, NULL,0}, 
    4142      allparams[2] = {eparams0, eparams1}; 

  • trunk/matml/src/ternary/ternary.h

    r449 r451  
    7878 
    7979typedef struct { 
     80  char *name; 
    8081  double C2; /*+ Composition at center of this Gaussian term +*/ 
    8182  double C3; /*+ Composition at center of this Gaussian term +*/