[cantera + automake]: fixing equilibrium makefile
This commit is contained in:
Nicholas Malaya
parent
8fa5356ec0
commit
541b35c130
3 changed files with 20 additions and 179 deletions
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
# need to add CXX_INCLUDES
|
||||
# will need to add python and matlab
|
||||
#SUBDIRS = base converters equil kinetics numerics oneD spectra transport zeroD
|
||||
|
||||
# order we need
|
||||
SUBDIRS = base converters thermo transport oneD zeroD kinetics numerics spectra
|
||||
SUBDIRS = base converters thermo transport oneD zeroD kinetics numerics spectra equil
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,25 @@
|
|||
h_sources = vcs_internal.h vcs_VolPhase.h vcs_solve.h vcs_prob.h \
|
||||
vcs_IntStarStar.h vcs_DoubleStarStar.h vcs_defs.h \
|
||||
vcs_MultiPhaseEquil.h vcs_Exception.h \
|
||||
vcs_IntStarStar.h vcs_DoubleStarStar.h vcs_defs.h \
|
||||
vcs_MultiPhaseEquil.h vcs_Exception.h \
|
||||
vcs_SpeciesProperties.h vcs_species_thermo.h
|
||||
|
||||
cc_sources = vcs_solve_TP.o vcs_VolPhase.o vcs_solve.o vcs_prob.o \
|
||||
vcs_TP.o vcs_report.o vcs_util.o \
|
||||
vcs_IntStarStar.o vcs_DoubleStarStar.o vcs_elem.o \
|
||||
vcs_elem_rearrange.o vcs_MultiPhaseEquil.o \
|
||||
vcs_nondim.o vcs_Exception.o \
|
||||
vcs_inest.o vcs_rearrange.o \
|
||||
vcs_root1d.o vcs_rxnadj.o \
|
||||
vcs_SpeciesProperties.o vcs_equilibrate.o \
|
||||
vcs_prep.o vcs_species_thermo.o vcs_Gibbs.o vcs_phaseStabil
|
||||
cc_sources = BasisOptimize.cpp vcs_elem.cpp vcs_IntStarStar.cpp \
|
||||
vcs_prob.cpp vcs_solve.cpp vcs_VolPhase.cpp ChemEquil.cpp \
|
||||
vcs_elem_rearrange.cpp vcs_linmaxc.cpp vcs_rearrange.cpp \
|
||||
vcs_solve_TP.cpp equilibrate.cpp vcs_equilibrate.cpp \
|
||||
vcs_MultiPhaseEquil.cpp vcs_report.cpp \
|
||||
vcs_SpeciesProperties.cpp MultiPhase.cpp vcs_Exception.cpp \
|
||||
vcs_nondim.cpp vcs_root1d.cpp vcs_species_thermo.cpp \
|
||||
MultiPhaseEquil.cpp vcs_Gibbs.cpp vcs_phaseStability.cpp \
|
||||
vcs_rxnadj.cpp vcs_TP.cpp vcs_DoubleStarStar.cpp vcs_inest.cpp \
|
||||
vcs_prep.cpp vcs_setMolesLinProg.cpp vcs_util.cpp
|
||||
|
||||
INCLUDES = = -I../base -I../thermo -I../numerics
|
||||
AM_CXXFLAGS = $(INCLUDES)
|
||||
cc_sources += vcs_dbocls.c vcs_dbols.c vcs_dbolsm.c vcs_dmout.c \
|
||||
vcs_dvout.c vcs_ivout.c vcs_xerror.c
|
||||
|
||||
INCLUDES = -I../base -I../thermo -I../numerics -I../../../
|
||||
INCLUDES += -I../../../ext/f2c_libs/
|
||||
AM_CXXFLAGS = $(INCLUDES)
|
||||
|
||||
lib_LTLIBRARIES = libequil.la
|
||||
library_includedir = $(includedir)
|
||||
|
|
@ -24,9 +29,4 @@ library_includedir = $(includedir)
|
|||
#-----------------------
|
||||
|
||||
libequil_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE)
|
||||
libequil_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
# Basic Cantera Thermodynamics Object Files
|
||||
EQUIL_OBJ = BasisOptimize.o ChemEquil.o MultiPhase.o MultiPhaseEquil.o equilibrate.o
|
||||
|
||||
EQUIL_H = ChemEquil.h MultiPhase.h MultiPhaseEquil.h equil.h PropertyCalculator.h
|
||||
libequil_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
|
@ -1,156 +0,0 @@
|
|||
#/bin/sh
|
||||
###############################################################
|
||||
# $Author$
|
||||
# $Date$
|
||||
# $Revision$
|
||||
#
|
||||
# Copyright 2002 California Institute of Technology
|
||||
#
|
||||
###############################################################
|
||||
|
||||
.SUFFIXES :
|
||||
.SUFFIXES : .cpp .c .d .o .h
|
||||
|
||||
INCDIR = ../../../build/include/cantera/kernel
|
||||
INSTALL_TSC = ../../../bin/install_tsc
|
||||
do_ranlib = @DO_RANLIB@
|
||||
|
||||
do_VCSnonideal = @COMPILE_VCSNONIDEAL@
|
||||
#
|
||||
# Purify Options - instrument code for debugging and quantitification
|
||||
#
|
||||
PURIFY=@PURIFY@
|
||||
#
|
||||
# Decide whether ot use the linear programmaing module lookalike
|
||||
# (from Goodwin's code). Both should produce the same results.
|
||||
do_AltLinProg = 1
|
||||
|
||||
debug_mode = @CANTERA_DEBUG_MODE@
|
||||
ifeq ($(debug_mode), 1)
|
||||
DEBUG_FLAG=-DDEBUG_MODE
|
||||
else
|
||||
DEBUG_FLAG=
|
||||
endif
|
||||
#LOCAL_DEFS=-DDEBUG_MODE
|
||||
|
||||
#
|
||||
# Local Define to turn on if you want to debug ChemEquil: or
|
||||
# BasisOptimize
|
||||
#
|
||||
#LOCAL_DEFS=-DDEBUG_MODE
|
||||
#
|
||||
|
||||
ifeq ($(do_AltLinProg), 1)
|
||||
DALT_STR=-DALTLINPROG
|
||||
endif
|
||||
LOCAL_DEFS= $(DALT_STR)
|
||||
#
|
||||
#
|
||||
PIC_FLAG=@PIC@
|
||||
|
||||
CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) $(CXX_OPT) $(PIC_FLAG) $(DEBUG_FLAG)
|
||||
|
||||
# Basic Cantera Thermodynamics Object Files
|
||||
EQUIL_OBJ = BasisOptimize.o ChemEquil.o MultiPhase.o MultiPhaseEquil.o equilibrate.o
|
||||
|
||||
EQUIL_H = ChemEquil.h MultiPhase.h MultiPhaseEquil.h equil.h PropertyCalculator.h
|
||||
|
||||
# depending on the option, different object files are used
|
||||
ifeq ($(do_AltLinProg), 1)
|
||||
DALT_OBJ=vcs_setMolesLinProg.o
|
||||
else
|
||||
DALT_OBJ=vcs_linmaxc.o vcs_dbocls.o vcs_dbols.o vcs_dbolsm.o vcs_dmout.o \
|
||||
vcs_dvout.o vcs_ivout.o vcs_xerror.o
|
||||
endif
|
||||
|
||||
|
||||
ifeq ($(do_VCSnonideal), 1)
|
||||
VCSNONIDEAL_OBJ = vcs_solve_TP.o vcs_VolPhase.o vcs_solve.o vcs_prob.o \
|
||||
vcs_TP.o vcs_report.o vcs_util.o \
|
||||
vcs_IntStarStar.o vcs_DoubleStarStar.o vcs_elem.o \
|
||||
vcs_elem_rearrange.o vcs_MultiPhaseEquil.o \
|
||||
vcs_nondim.o vcs_Exception.o \
|
||||
vcs_inest.o vcs_rearrange.o \
|
||||
vcs_root1d.o vcs_rxnadj.o \
|
||||
vcs_SpeciesProperties.o vcs_equilibrate.o \
|
||||
vcs_prep.o vcs_species_thermo.o vcs_Gibbs.o vcs_phaseStability.o \
|
||||
$(DALT_OBJ)
|
||||
|
||||
VCSNONIDEAL_H = vcs_internal.h vcs_VolPhase.h vcs_solve.h vcs_prob.h \
|
||||
vcs_IntStarStar.h vcs_DoubleStarStar.h vcs_defs.h \
|
||||
vcs_MultiPhaseEquil.h vcs_Exception.h \
|
||||
vcs_SpeciesProperties.h vcs_species_thermo.h
|
||||
endif
|
||||
|
||||
CXX_INCLUDES = -I../base -I../thermo -I../numerics @CXX_INCLUDES@
|
||||
LIB = @buildlib@/libequil.a
|
||||
|
||||
ifeq ($(do_VCSnonideal), 1)
|
||||
VLIB=@buildlib@/libVCSnonideal.a
|
||||
endif
|
||||
|
||||
DEPENDS = $(EQUIL_OBJ:.o=.d) $(VCSNONIDEAL_OBJ:.o=.d)
|
||||
|
||||
all: $(LIB) $(VLIB) .depends
|
||||
@(@INSTALL@ -d $(INCDIR))
|
||||
@(for lh in $(EQUIL_H) $(VCSNONIDEAL_H); do \
|
||||
$(INSTALL_TSC) "$${lh}" $(INCDIR) ; \
|
||||
done)
|
||||
|
||||
.cpp.d: Makefile %.o
|
||||
@CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.cpp > $*.d
|
||||
|
||||
.c.d: Makefile %.o
|
||||
@CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) -I../../../ext/f2c_libs $*.c > $*.d
|
||||
|
||||
.cpp.o:
|
||||
$(PURIFY) @CXX@ -c $< $(CXX_FLAGS) $(CXX_INCLUDES)
|
||||
|
||||
.c.o:
|
||||
$(PURIFY) @CC@ -c $< $(CXX_FLAGS) $(CXX_INCLUDES) -I../../../ext/f2c_libs
|
||||
|
||||
$(LIB): $(EQUIL_OBJ) $(EQUIL_H) $(VCSNONIDEAL_OBJ) $(VCSNONIDEAL_H)
|
||||
@ARCHIVE@ $(LIB) $(EQUIL_OBJ) $(VCSNONIDEAL_OBJ) > /dev/null
|
||||
ifeq ($(do_ranlib),1)
|
||||
@RANLIB@ $(LIB)
|
||||
endif
|
||||
|
||||
$(VLIB): $(VCSNONIDEAL_OBJ) $(VCS_NONIDEAL_H)
|
||||
@ARCHIVE@ $(VLIB) $(VCSNONIDEAL_OBJ) > /dev/null
|
||||
ifeq ($(do_ranlib),1)
|
||||
@RANLIB@ $(VLIB)
|
||||
endif
|
||||
|
||||
|
||||
clean:
|
||||
@(for lh in dummy.h $(EQUIL_H) $(VCSNONIDEAL_H); do \
|
||||
th=$(INCDIR)/"$${lh}" ; \
|
||||
if test -f "$${th}" ; then \
|
||||
$(RM) "$${th}" ; \
|
||||
echo "$(RM) $${th}" ; \
|
||||
fi \
|
||||
done)
|
||||
@(if test -f $(LIB) ; then \
|
||||
$(RM) $(LIB) ; \
|
||||
echo "$(RM) $(LIB)" ; \
|
||||
fi)
|
||||
$(RM) *.o *~ .depends *.d
|
||||
(if test -d SunWS_cache ; then \
|
||||
$(RM) -rf SunWS_cache ; \
|
||||
fi )
|
||||
|
||||
depends:
|
||||
@MAKE@ .depends
|
||||
|
||||
.depends: $(DEPENDS)
|
||||
cat $(DEPENDS) > .depends
|
||||
|
||||
$(EQUIL_OBJ) $(VCSNONIDEAL_OBJ): Makefile
|
||||
|
||||
TAGS:
|
||||
etags *.h *.cpp
|
||||
|
||||
ifeq ($(wildcard .depends), .depends)
|
||||
include .depends
|
||||
endif
|
||||
|
||||
Loading…
Add table
Reference in a new issue