[cig-commits] commit 1990 by buerg to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 1990

Make ASPIRE work without cantera.

U   trunk/aspire/CMakeLists.txt
U   trunk/aspire/include/aspect/material_model/cantera.h
U   trunk/aspire/source/material_model/cantera.cc


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=1990&peg=1990

Diff:
Modified: trunk/aspire/CMakeLists.txt
===================================================================
--- trunk/aspire/CMakeLists.txt	2013-10-21 17:07:44 UTC (rev 1989)
+++ trunk/aspire/CMakeLists.txt	2013-10-21 18:55:09 UTC (rev 1990)
@@ -55,4 +55,5 @@
 if (CANTERA_FOUND)
 include_directories(${CANTERA_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(${TARGET} ${CANTERA_LIBRARIES})
+add_definitions (-DASPIRE_WITH_CANTERA)
 endif (CANTERA_FOUND)

Modified: trunk/aspire/include/aspect/material_model/cantera.h
===================================================================
--- trunk/aspire/include/aspect/material_model/cantera.h	2013-10-21 17:07:44 UTC (rev 1989)
+++ trunk/aspire/include/aspect/material_model/cantera.h	2013-10-21 18:55:09 UTC (rev 1990)
@@ -23,6 +23,8 @@
 #ifndef __aspect__model_cantera_h
 #define __aspect__model_cantera_h
 
+#ifdef ASPIRE_WITH_CANTERA
+
 #include <aspect/material_model/interface.h>
 #include <aspect/simulator_access.h>
 #include <cantera/IdealGasMix.h>
@@ -173,3 +175,5 @@
 }
 
 #endif
+
+#endif

Modified: trunk/aspire/source/material_model/cantera.cc
===================================================================
--- trunk/aspire/source/material_model/cantera.cc	2013-10-21 17:07:44 UTC (rev 1989)
+++ trunk/aspire/source/material_model/cantera.cc	2013-10-21 18:55:09 UTC (rev 1990)
@@ -19,10 +19,11 @@
 */
 /*  $Id: simple.cc 1689 2013-05-14 08:08:05Z heister $  */
 
-
 #include <aspect/material_model/cantera.h>
 #include <deal.II/base/parameter_handler.h>
 
+#ifdef ASPIRE_WITH_CANTERA
+
 using namespace dealii;
 
 namespace aspect
@@ -260,6 +261,8 @@
   }
 }
 
+#endif
+
 // explicit instantiations
 namespace aspect
 {
@@ -270,3 +273,4 @@
                                    "Use the chemical kinetics toolkit Cantera to determine all parameters.")
   }
 }
+