Changeset 460

Show
Ignore:
Timestamp:
06/17/2009 09:53:29 PM (3 years ago)
Author:
powell
Message:

Library and header file change from ternary to gibbs.

Location:
trunk/matml/src/ternary
Files:
8 modified
1 copied

Legend:

Unmodified
Added
Removed

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

    r459 r460  
    99 
    1010#include "freenergy.h" /*+ Free energy prototypes, typedefs, etc. +*/ 
    11 #include "ternary.h" /*+ Ternary prototypes, typedefs, etc. +*/ 
     11#include "gibbs.h" /*+ Ternary prototypes, typedefs, etc. +*/ 
    1212#include <math.h>    /*+ For sqrt(), fmin()/fmax() +*/ 
    1313#include <stdlib.h>  /*+ For malloc and free +*/ 

  • trunk/matml/src/ternary/ChangeLog

    r459 r460  
    1414  * New "square" free energy parameters for pseudo-square representation. 
    1515  * Rectangle bookkeeping functions complete square functionality. 
    16   * Split all non-free-energy functions out into a ternary library. 
     16  * Split all non-free-energy functions out into a library named gibbs with a 
     17    matching header. 
    1718  * New "square" example program demonstrates these functions. 
    1819 

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

    r459 r460  
    66 
    77 
    8 #include "ternary.h" /*+ Ternary prototypes, typedefs, etc. +*/ 
     8#include "gibbs.h" /*+ Ternary prototypes, typedefs, etc. +*/ 
    99#include <unistd.h>  /*+ For execlp() +*/ 
    1010#include <stdio.h>   /*+ For FILE, fdopen(), etc. +*/ 

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

  • trunk/matml/src/ternary/Makefile.am

    r459 r460  
    99AUTOMAKE_OPTIONS=1.5 
    1010 
    11 lib_LTLIBRARIES = libfreenergy.la libternary.la 
     11lib_LTLIBRARIES = libfreenergy.la libgibbs.la 
    1212 
    1313libfreenergy_la_SOURCES = freenergy.c 
    … …  
    1515libfreenergy_la_LDFLAGS = -version-info 0:0:0 
    1616 
    17 libternary_la_SOURCES = geomview.c qhull.c book.c spinodal.c 
    18 libternary_la_LIBADD  = -lm -lqhull libfreenergy.la 
    19 libternary_la_CFLAGS  = -std=c99 -DGEOMVIEW=\"@GEOMVIEW@\" #-DDEBUG 
    20 libternary_la_LDFLAGS = -version-info 0:0:0 
     17libgibbs_la_SOURCES = geomview.c qhull.c book.c spinodal.c 
     18libgibbs_la_LIBADD  = -lm -lqhull libfreenergy.la 
     19libgibbs_la_CFLAGS  = -std=c99 -DGEOMVIEW=\"@GEOMVIEW@\" #-DDEBUG 
     20libgibbs_la_LDFLAGS = -version-info 0:0:0 
    2121 
    22 include_HEADERS = freenergy.h ternary.h 
     22include_HEADERS = freenergy.h gibbs.h 
    2323 
    2424bin_PROGRAMS    = ternary square 
    2525ternary_SOURCES = ternary.c 
    2626ternary_CFLAGS  = #-DDEBUG 
    27 ternary_LDADD   = libternary.la libfreenergy.la 
     27ternary_LDADD   = libgibbs.la libfreenergy.la 
    2828square_SOURCES = square.c 
    2929square_CFLAGS  = #-DDEBUG 
    30 square_LDADD   = libternary.la libfreenergy.la 
     30square_LDADD   = libgibbs.la libfreenergy.la 
    3131 
    3232EXTRA_DIST = autogen.sh macros/autogen.sh macros/cxref-latex.m4 \ 
    … …  
    3838BUILT_TEXFILES = $(top_srcdir)/ternary.c.tex \ 
    3939                 $(top_srcdir)/square.c.tex \ 
    40                  $(top_srcdir)/ternary.h.tex \ 
     40                 $(top_srcdir)/gibbs.h.tex \ 
    4141                 $(top_srcdir)/spinodal.c.tex \ 
    4242                 $(top_srcdir)/geomview.c.tex \ 

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

    r459 r460  
    88 
    99#include "freenergy.h" 
    10 #include "ternary.h" 
     10#include "gibbs.h" 
    1111#include <qhull/qset.h> 
    1212#include <qhull/qhull.h> 

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

    r459 r460  
    77 
    88#include "freenergy.h" 
    9 #include "ternary.h" 
     9#include "gibbs.h" 
    1010#include <stdlib.h>  /*+ For malloc() and free() +*/ 
    1111 

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

    r459 r460  
    77 
    88 
    9 #include "ternary.h" /*+ Ternary prototypes, typedefs, etc. +*/ 
     9#include "gibbs.h" /*+ Ternary prototypes, typedefs, etc. +*/ 
    1010#include <stdlib.h>  /*+ For calloc() +*/ 
    1111#include <math.h>    /*+ For fabs() +*/ 

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

    r459 r460  
    77 
    88 
    9 #include "ternary.h" /*+ Ternary prototypes, typedefs, etc. +*/ 
     9#include "gibbs.h" /*+ Ternary prototypes, typedefs, etc. +*/ 
    1010#include <stdlib.h>  /*+ For calloc() +*/ 
    1111#include <math.h>    /*+ For fabs() +*/