research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modifications to the Makefiles to make the THREAD_SAFE_CANTERA ifdef

Browse source 
block work again.
This commit is contained in:
Harry Moffat 2010-11-12 19:18:49 +00:00
parent 56ad9ca9e8
commit fa56309462
24 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test_problems/ChemEquil_gri_matrix/Makefile.in
View file

@ -52,7 +52,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
#
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS)
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/ChemEquil_gri_pairs/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/ChemEquil_ionizedGas/Makefile.in
View file

@ -43,7 +43,7 @@ CXX = @CXX@
# LOCAL_DEFS=-DDEBUG_CHEMEQUIL
#
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS)
CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/ChemEquil_red1/Makefile.in
View file

@ -52,7 +52,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
#
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS)
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/CpJump/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/VCSnonideal/NaCl_equil/Makefile.in
View file

@ -45,7 +45,7 @@ CANTERA_INCDIR=@ctroot@/build/include/cantera
INCLUDE_DIRS = -I$(CANTERA_INCDIR)
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@ $(INCLUDE_DIRS)
CXX_FLAGS = @CXXFLAGS@ $(INCLUDE_DIRS) @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/DH_graph_1/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/DH_graph_NM/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/DH_graph_acommon/Makefile.in
View file

@ -38,7 +38,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_dupl_test/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_graph_CpvT/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_graph_GvI/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@
CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_graph_GvT/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_graph_HvT/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/HMW_graph_VvT/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/VPissp/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/issp/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/stoichSubSSTP/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/testWaterTP/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/cathermo/wtWater/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/fracCoeff/Makefile.in
View file

@ -39,7 +39,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/negATest/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/rankine_democxx/Makefile.in
View file

@ -51,7 +51,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
#
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS)
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@

2
test_problems/surfSolverTest/Makefile.in
View file

@ -37,7 +37,7 @@ endif
CXX = @CXX@
# C++ compile flags
CXX_FLAGS = @CXXFLAGS@
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
# Ending C++ linking libraries
LCXX_END_LIBS = @LCXX_END_LIBS@