From 9091de5aa3b2980a2801c58372d011067ccaac86 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Tue, 30 Dec 2008 22:08:14 +0000 Subject: [PATCH] Added PURIFY instrumentation commands to a lot of test programs. --- test_problems/cathermo/HMW_dupl_test/Makefile.in | 7 ++++--- test_problems/cathermo/HMW_graph_CpvT/Makefile.in | 6 ++++-- test_problems/cathermo/HMW_graph_GvI/Makefile.in | 6 ++++-- test_problems/cathermo/HMW_graph_HvT/Makefile.in | 6 ++++-- test_problems/cathermo/HMW_graph_VvT/Makefile.in | 6 ++++-- test_problems/cathermo/HMW_test_1/Makefile.in | 6 ++++-- test_problems/cathermo/VPissp/Makefile.in | 6 ++++-- test_problems/cathermo/issp/Makefile.in | 6 ++++-- test_problems/diamondSurf_dupl/Makefile.in | 6 ++++-- test_problems/multiGasTransport/Makefile.in | 6 ++++-- test_problems/pureFluidTest/Makefile.in | 6 ++++-- 11 files changed, 44 insertions(+), 23 deletions(-) diff --git a/test_problems/cathermo/HMW_dupl_test/Makefile.in b/test_problems/cathermo/HMW_dupl_test/Makefile.in index f1067e883..e210ad1b9 100644 --- a/test_problems/cathermo/HMW_dupl_test/Makefile.in +++ b/test_problems/cathermo/HMW_dupl_test/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -60,7 +62,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: - $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -75,11 +77,10 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP) - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(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 diff --git a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in index 7330b6c56..39ae2000a 100644 --- a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -60,7 +62,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: - $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -75,7 +77,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) all: $(PROGRAM) .depends Cp_standalone $(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP) - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS) diff --git a/test_problems/cathermo/HMW_graph_GvI/Makefile.in b/test_problems/cathermo/HMW_graph_GvI/Makefile.in index 0219a6aa3..505d6ad40 100644 --- a/test_problems/cathermo/HMW_graph_GvI/Makefile.in +++ b/test_problems/cathermo/HMW_graph_GvI/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -60,7 +62,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: - $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -75,7 +77,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP) - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS) diff --git a/test_problems/cathermo/HMW_graph_HvT/Makefile.in b/test_problems/cathermo/HMW_graph_HvT/Makefile.in index ca7015cdf..f23503d3a 100644 --- a/test_problems/cathermo/HMW_graph_HvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_HvT/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -60,7 +62,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: - $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -75,7 +77,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) all: $(PROGRAM) .depends L_standalone $(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP) - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS) diff --git a/test_problems/cathermo/HMW_graph_VvT/Makefile.in b/test_problems/cathermo/HMW_graph_VvT/Makefile.in index f87503489..8325e574c 100644 --- a/test_problems/cathermo/HMW_graph_VvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_VvT/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -60,7 +62,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: - $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -75,7 +77,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) all: $(PROGRAM) .depends V_standalone $(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP) - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS) diff --git a/test_problems/cathermo/HMW_test_1/Makefile.in b/test_problems/cathermo/HMW_test_1/Makefile.in index d0096346e..7ae9500eb 100644 --- a/test_problems/cathermo/HMW_test_1/Makefile.in +++ b/test_problems/cathermo/HMW_test_1/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -68,7 +70,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: - $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -83,7 +85,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP) - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS) diff --git a/test_problems/cathermo/VPissp/Makefile.in b/test_problems/cathermo/VPissp/Makefile.in index 3841e4e05..ae869c571 100644 --- a/test_problems/cathermo/VPissp/Makefile.in +++ b/test_problems/cathermo/VPissp/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -57,7 +59,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: - $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -72,7 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS) diff --git a/test_problems/cathermo/issp/Makefile.in b/test_problems/cathermo/issp/Makefile.in index 00626023a..f4cd8710e 100644 --- a/test_problems/cathermo/issp/Makefile.in +++ b/test_problems/cathermo/issp/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -60,7 +62,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: - $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -75,7 +77,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT) all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP) - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS) diff --git a/test_problems/diamondSurf_dupl/Makefile.in b/test_problems/diamondSurf_dupl/Makefile.in index c8568e9cf..cc0e4d5be 100644 --- a/test_problems/diamondSurf_dupl/Makefile.in +++ b/test_problems/diamondSurf_dupl/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -56,7 +58,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: Interface.h - $(CXX) -c $< -I$(CANTERA_INCDIR) @CXX_INCLUDES@ $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< -I$(CANTERA_INCDIR) @CXX_INCLUDES@ $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -73,7 +75,7 @@ all: $(PROGRAM) # Rule to make the program $(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS) diff --git a/test_problems/multiGasTransport/Makefile.in b/test_problems/multiGasTransport/Makefile.in index 19b44080d..951247869 100644 --- a/test_problems/multiGasTransport/Makefile.in +++ b/test_problems/multiGasTransport/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -64,7 +66,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: Interface.h - $(CXX) -c $< -I$(CANTERA_INCDIR) @CXX_INCLUDES@ $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< -I$(CANTERA_INCDIR) @CXX_INCLUDES@ $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -81,7 +83,7 @@ all: .depends $(PROGRAM) # Rule to make the program $(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS) $(CANTERA_LAPACK_DEPS) - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS) diff --git a/test_problems/pureFluidTest/Makefile.in b/test_problems/pureFluidTest/Makefile.in index 338f55a95..c5505883e 100644 --- a/test_problems/pureFluidTest/Makefile.in +++ b/test_problems/pureFluidTest/Makefile.in @@ -23,6 +23,8 @@ LINK_OPTIONS = @EXTRA_LINK@ ############################################################################# +PURIFY=@PURIFY@ + # Check to see whether we are in the msvc++ environment os_is_win = @OS_IS_WIN@ @@ -57,7 +59,7 @@ LCXX_FLAGS = @CXXFLAGS@ @LOCAL_LIB_DIRS@ # How to compile C++ source files to object files .@CXX_EXT@.@OBJ_EXT@: - $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) + $(PURIFY) $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) # How to compile the dependency file .cpp.d: @@ -73,7 +75,7 @@ all: $(PROGRAM) .depends $(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \ $(CANTERA_LIBDIR)/libthermo.a - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ + $(PURIFY) $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ $(LCXX_END_LIBS)