[cantera]: adding tests for HWM graph cpvt
This commit is contained in:
Nicholas Malaya
parent
7b8bec8bae
commit
f13b925f8b
10 changed files with 65 additions and 235 deletions
|
|
@ -18,3 +18,7 @@ library_includedir = $(INC)
|
|||
#-----------------------
|
||||
|
||||
DH_graph_1_SOURCES = $(cc_sources)
|
||||
|
||||
|
||||
TESTS_ENVIRONMENT =
|
||||
TESTS = runtest
|
||||
|
|
|
|||
|
|
@ -18,3 +18,6 @@ library_includedir = $(INC)
|
|||
#-----------------------
|
||||
|
||||
DH_graph_1_SOURCES = $(cc_sources)
|
||||
|
||||
TESTS_ENVIRONMENT =
|
||||
TESTS = runtest
|
||||
|
|
|
|||
|
|
@ -18,3 +18,6 @@ library_includedir = $(INC)
|
|||
#-----------------------
|
||||
|
||||
DH_graph_1_SOURCES = $(cc_sources)
|
||||
|
||||
TESTS_ENVIRONMENT =
|
||||
TESTS = runtest
|
||||
|
|
|
|||
|
|
@ -18,3 +18,6 @@ library_includedir = $(INC)
|
|||
#-----------------------
|
||||
|
||||
DH_graph_1_SOURCES = $(cc_sources)
|
||||
|
||||
TESTS_ENVIRONMENT =
|
||||
TESTS = runtest
|
||||
|
|
@ -18,3 +18,6 @@ library_includedir = $(INC)
|
|||
#-----------------------
|
||||
|
||||
DH_graph_1_SOURCES = $(cc_sources)
|
||||
|
||||
TESTS_ENVIRONMENT =
|
||||
TESTS = runtest
|
||||
|
|
|
|||
23
test_problems/cathermo/HMW_dupl_test/Makefile.am
Normal file
23
test_problems/cathermo/HMW_dupl_test/Makefile.am
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
cc_sources = HMW_dupl_test.cpp sortAlgorithms.cpp
|
||||
|
||||
INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
|
||||
AM_CPPFLAGS = $(INC)
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
|
||||
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
|
||||
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
|
||||
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
|
||||
AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/
|
||||
LIBS = $(LINK)
|
||||
|
||||
bin_PROGRAMS = HMW_dupl_test
|
||||
library_includedir = $(INC)
|
||||
|
||||
#-----------------------
|
||||
# Cantera DH graph test
|
||||
#-----------------------
|
||||
|
||||
HMW_dupl_test_SOURCES = $(cc_sources)
|
||||
|
||||
TESTS_ENVIRONMENT =
|
||||
TESTS = runtest
|
||||
|
|
@ -1,114 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
############################################################################
|
||||
#
|
||||
# Makefile to compile and link a C++ application to
|
||||
# Cantera.
|
||||
#
|
||||
#############################################################################
|
||||
|
||||
# addition to suffixes
|
||||
.SUFFIXES : .d
|
||||
|
||||
# the name of the executable program to be created
|
||||
PROG_NAME = HMW_dupl_test
|
||||
|
||||
# the object files to be linked together. List those generated from Fortran
|
||||
# and from C/C++ separately
|
||||
OBJS = HMW_dupl_test.o sortAlgorithms.o
|
||||
|
||||
# additional flags to be passed to the linker. If your program
|
||||
# requires other external libraries, put them here
|
||||
LINK_OPTIONS = @EXTRA_LINK@
|
||||
|
||||
#############################################################################
|
||||
|
||||
PURIFY=@PURIFY@
|
||||
|
||||
# Check to see whether we are in the msvc++ environment
|
||||
os_is_win = @OS_IS_WIN@
|
||||
|
||||
# Fortran libraries
|
||||
ifeq (@build_with_f2c@, 0)
|
||||
FORT_LIBS = @FLIBS@
|
||||
else
|
||||
FORT_LIBS =
|
||||
endif
|
||||
|
||||
# the C++ compiler
|
||||
CXX = @CXX@
|
||||
|
||||
# C++ compile flags
|
||||
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||
|
||||
# Ending C++ linking libraries
|
||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||
|
||||
# the directory where the Cantera libraries are located
|
||||
CANTERA_LIBDIR=@buildlib@
|
||||
|
||||
# required Cantera libraries
|
||||
CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
|
||||
|
||||
# Dependencies for CANTERA_LIBS
|
||||
CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
|
||||
|
||||
# the directory where Cantera include files may be found.
|
||||
CANTERA_INCDIR=@ctroot@/build/include/cantera
|
||||
INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
|
||||
|
||||
# flags passed to the C++ compiler/linker for the linking step
|
||||
LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
|
||||
|
||||
# How to compile C++ source files to object files
|
||||
.@CXX_EXT@.@OBJ_EXT@:
|
||||
$(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS)
|
||||
|
||||
# How to compile the dependency file
|
||||
.cpp.d:
|
||||
@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
|
||||
|
||||
# List of dependency files to be created
|
||||
DEPENDS=$(OBJS:.o=.d)
|
||||
|
||||
# Program Name
|
||||
PROGRAM = $(PROG_NAME)$(EXE_EXT)
|
||||
|
||||
all: $(PROGRAM) .depends
|
||||
|
||||
$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
|
||||
$(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
|
||||
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
|
||||
$(LCXX_END_LIBS)
|
||||
|
||||
# Add an additional target for stability:
|
||||
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
|
||||
|
||||
# depends target -> forces recalculation of dependencies
|
||||
depends:
|
||||
@MAKE@ .depends
|
||||
|
||||
.depends: $(DEPENDS)
|
||||
cat $(DEPENDS) > .depends
|
||||
|
||||
# Do the test -> For the windows vc++ environment, we have to skip checking on
|
||||
# whether the program is uptodate, because we don't utilize make
|
||||
# in that environment to build programs.
|
||||
test:
|
||||
ifeq ($(os_is_win), 1)
|
||||
else
|
||||
@ @MAKE@ -s $(PROGRAM)
|
||||
endif
|
||||
@ ./runtest
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends *.o
|
||||
../../../bin/rm_cvsignore
|
||||
(if test -d SunWS_cache ; then \
|
||||
$(RM) -rf SunWS_cache ; \
|
||||
fi )
|
||||
|
||||
ifeq ($(wildcard .depends), .depends)
|
||||
include .depends
|
||||
endif
|
||||
|
||||
23
test_problems/cathermo/HMW_graph_CpvT/Makefile.am
Normal file
23
test_problems/cathermo/HMW_graph_CpvT/Makefile.am
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
cc_sources = HMW_graph_CpvT.cpp sortAlgorithms.cpp
|
||||
|
||||
INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
|
||||
AM_CPPFLAGS = $(INC)
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
|
||||
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
|
||||
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
|
||||
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
|
||||
AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/
|
||||
LIBS = $(LINK)
|
||||
|
||||
bin_PROGRAMS = HMW_graph_CpvT
|
||||
library_includedir = $(INC)
|
||||
|
||||
#-----------------------
|
||||
# Cantera DH graph test
|
||||
#-----------------------
|
||||
|
||||
HMW_graph_CpvT_SOURCES = $(cc_sources)
|
||||
|
||||
TESTS_ENVIRONMENT =
|
||||
TESTS = runtest
|
||||
|
|
@ -1,119 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
############################################################################
|
||||
#
|
||||
# Makefile to compile and link a C++ application to
|
||||
# Cantera.
|
||||
#
|
||||
#############################################################################
|
||||
|
||||
# addition to suffixes
|
||||
.SUFFIXES : .d
|
||||
|
||||
# the name of the executable program to be created
|
||||
PROG_NAME = HMW_graph_CpvT
|
||||
|
||||
# the object files to be linked together. List those generated from Fortran
|
||||
# and from C/C++ separately
|
||||
OBJS = HMW_graph_CpvT.o sortAlgorithms.o
|
||||
|
||||
# additional flags to be passed to the linker. If your program
|
||||
# requires other external libraries, put them here
|
||||
LINK_OPTIONS = @EXTRA_LINK@
|
||||
|
||||
#############################################################################
|
||||
|
||||
PURIFY=@PURIFY@
|
||||
|
||||
# Check to see whether we are in the msvc++ environment
|
||||
os_is_win = @OS_IS_WIN@
|
||||
|
||||
# Fortran libraries
|
||||
ifeq (@build_with_f2c@, 0)
|
||||
FORT_LIBS = @FLIBS@
|
||||
else
|
||||
FORT_LIBS =
|
||||
endif
|
||||
|
||||
# the C++ compiler
|
||||
CXX = @CXX@
|
||||
|
||||
# C++ compile flags
|
||||
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||
|
||||
# Ending C++ linking libraries
|
||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||
|
||||
# the directory where the Cantera libraries are located
|
||||
CANTERA_LIBDIR=@buildlib@
|
||||
|
||||
# required Cantera libraries
|
||||
CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
|
||||
|
||||
# Dependencies for CANTERA_LIBS
|
||||
CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
|
||||
|
||||
# the directory where Cantera include files may be found.
|
||||
CANTERA_INCDIR=@ctroot@/build/include/cantera
|
||||
INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
|
||||
|
||||
# flags passed to the C++ compiler/linker for the linking step
|
||||
LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@
|
||||
|
||||
# How to compile C++ source files to object files
|
||||
.@CXX_EXT@.@OBJ_EXT@:
|
||||
$(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS)
|
||||
|
||||
# How to compile the dependency file
|
||||
.cpp.d:
|
||||
@CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d
|
||||
|
||||
# List of dependency files to be created
|
||||
DEPENDS=$(OBJS:.o=.d)
|
||||
|
||||
# Program Name
|
||||
PROGRAM = $(PROG_NAME)$(EXE_EXT)
|
||||
|
||||
all: $(PROGRAM) .depends Cp_standalone
|
||||
|
||||
$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
|
||||
$(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
|
||||
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
|
||||
$(LCXX_END_LIBS)
|
||||
|
||||
|
||||
# Add an additional target for stability:
|
||||
$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a
|
||||
|
||||
Cp_standalone: Cp_standalone.o
|
||||
$(CXX) -o Cp_standalone Cp_standalone.o \
|
||||
$(LCXX_FLAGS) $(LINK_OPTIONS) $(LCXX_END_LIBS)
|
||||
|
||||
# depends target -> forces recalculation of dependencies
|
||||
depends:
|
||||
@MAKE@ .depends
|
||||
|
||||
.depends: $(DEPENDS)
|
||||
cat $(DEPENDS) > .depends
|
||||
|
||||
# Do the test -> For the windows vc++ environment, we have to skip checking on
|
||||
# whether the program is uptodate, because we don't utilize make
|
||||
# in that environment to build programs.
|
||||
test:
|
||||
ifeq ($(os_is_win), 1)
|
||||
else
|
||||
@ @MAKE@ -s $(PROGRAM)
|
||||
endif
|
||||
@ ./runtest
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends *.o
|
||||
../../../bin/rm_cvsignore
|
||||
(if test -d SunWS_cache ; then \
|
||||
$(RM) -rf SunWS_cache ; \
|
||||
fi )
|
||||
|
||||
ifeq ($(wildcard .depends), .depends)
|
||||
include .depends
|
||||
endif
|
||||
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
SUBDIRS = DH_graph_1 DH_graph_acommon DH_graph_bdotak/ DH_graph_Pitzer/ DH_graph_NM/
|
||||
SUBDIRS = DH_graph_1 DH_graph_acommon DH_graph_bdotak/ DH_graph_Pitzer/ DH_graph_NM/ HMW_dupl_test/ HMW_graph_CpvT
|
||||
#SUBDIRS +=
|
||||
|
||||
# HMW_graph_CpvT/ HMW_graph_GvT/ HMW_graph_VvT/ HMW_test_3/ issp/ Makefile.am stoichSubSSTP/ testIAPWSPres/ testWaterPDSS/ VPissp/
|
||||
# HMW_dupl_test/ HMW_graph_GvI/ HMW_graph_HvT/ HMW_test_1/ ims/ Makefile Makefile.in testIAPWS/ testIAPWSTripP/ testWaterTP/ wtWater/
|
||||
# HMW_graph_GvI/ HMW_graph_HvT/ HMW_test_1/ ims/ Makefile Makefile.in testIAPWS/ testIAPWSTripP/ testWaterTP/ wtWater/
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue