Disable AD solutions without HAVE_METAPHYSICL

manufactured-solutions · Nov 12, 2016 · ab2bb07 · ab2bb07
1 parent 97ca6fb
commit ab2bb07
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 38 deletions.
diff --git a/src/ad_cns_2d_crossterms.cpp b/src/ad_cns_2d_crossterms.cpp
@@ -23,6 +23,9 @@
 //-----------------------------------------------------------------------el-
 
 #include <masa_internal.h>
+
+#ifdef HAVE_METAPHYSICL
+
 #include <ad_masa.h>
 
 // typedef double RawScalar;
@@ -348,8 +351,4 @@ Scalar MASA::ad_cns_2d_crossterms<Scalar>::eval_exact_rho(Scalar x, Scalar y)
 MASA_INSTANTIATE_ALL(MASA::ad_cns_2d_crossterms);
 
 
-
-//---------------------------------------------------------
-// AUTOMASA
-// Generated on: 2012-05-30 14:47:18
-//---------------------------------------------------------
+#endif // HAVE_METAPHYSICL
diff --git a/src/ad_cns_3d_crossterms.cpp b/src/ad_cns_3d_crossterms.cpp
@@ -24,6 +24,8 @@
 
 #include <masa_internal.h>
 
+#ifdef HAVE_METAPHYSICL
+
 #include <ad_masa.h>
 
 typedef ShadowNumber<double, long double> RawScalar;
@@ -449,8 +451,4 @@ Scalar MASA::ad_cns_3d_crossterms<Scalar>::eval_exact_rho(Scalar x, Scalar y, Sc
 MASA_INSTANTIATE_ALL(MASA::ad_cns_3d_crossterms);
 
 
-
-//---------------------------------------------------------
-// AUTOMASA
-// Generated on: 2012-05-31 13:55:08
-//---------------------------------------------------------
+#endif // HAVE_METAPHYSICL
diff --git a/src/convdiff_steady_nosource_1d.cpp b/src/convdiff_steady_nosource_1d.cpp
@@ -24,6 +24,8 @@
 
 #include <masa_internal.h>
 
+#ifdef HAVE_METAPHYSICL
+
 #include <ad_masa.h>
 
 typedef ShadowNumber<double, long double> RawScalar;
@@ -109,8 +111,4 @@ Scalar MASA::convdiff_steady_nosource_1d<Scalar>::eval_exact_u(Scalar x)
 MASA_INSTANTIATE_ALL(MASA::convdiff_steady_nosource_1d);
 
 
-
-//---------------------------------------------------------
-// AUTOMASA
-// Generated on: 2013-04-23 14:32:21
-//---------------------------------------------------------
+#endif // HAVE_METAPHYSICL
diff --git a/src/masa_core.cpp b/src/masa_core.cpp
@@ -152,20 +152,22 @@ int get_list_mms(std::vector<manufactured_solution<Scalar>*>& anim)
   // sod shock tube
   anim.push_back(new sod_1d<Scalar>());
 
-  // automatically generated MMS:
-
-  anim.push_back(new burgers_equation<Scalar>());
-  anim.push_back(new axi_euler_transient<Scalar>());
-  anim.push_back(new axi_cns_transient<Scalar>());
+  // MetaPhysicL-based solutions
+#ifdef HAVE_METAPHYSICL
   anim.push_back(new ad_cns_2d_crossterms<Scalar>());
   anim.push_back(new ad_cns_3d_crossterms<Scalar>());
   anim.push_back(new convdiff_steady_nosource_1d<Scalar>());
-
   anim.push_back(new navierstokes_3d_incompressible<Scalar>());
-
   anim.push_back(new navierstokes_3d_incompressible_homogeneous<Scalar>());
-
   anim.push_back(new navierstokes_3d_transient_sutherland<Scalar>());
+#endif // HAVE_METAPHYSICL
+
+  // automatically generated MMS:
+
+  anim.push_back(new burgers_equation<Scalar>());
+  anim.push_back(new axi_euler_transient<Scalar>());
+  anim.push_back(new axi_cns_transient<Scalar>());
+
 
   // --l33t-- DO NOT EDIT THIS LINE OR ANY BELOW IT
 

diff --git a/src/masa_internal.h b/src/masa_internal.h
@@ -42,6 +42,8 @@
 #include <vector>
 #include <stdlib.h>
 
+#include <config.h>
+
 using std::cos;
 using std::sin;
 using std::pow;
@@ -1945,6 +1947,9 @@ class axi_cns_transient : public manufactured_solution<Scalar>
 };}
 
 
+// MetaPhysicL-powered manufactured solutions:
+#ifdef HAVE_METAPHYSICL
+
 // ------------------------------------------------------
 // --------------- ad_cns_2d_crossterms 
 // ------------------------------------------------------
@@ -2243,4 +2248,6 @@ class navierstokes_3d_transient_sutherland : public manufactured_solution<Scalar
 };}
 
 
+#endif // HAVE_METAPHYSICL
+
 // --l33t--
diff --git a/src/navierstokes_3d_incompressible.cpp b/src/navierstokes_3d_incompressible.cpp
@@ -24,6 +24,8 @@
 
 #include <masa_internal.h>
 
+#ifdef HAVE_METAPHYSICL
+
 #include <ad_masa.h>
 
 
@@ -310,8 +312,4 @@ Scalar MASA::navierstokes_3d_incompressible<Scalar>::eval_exact_p(Scalar x, Scal
 MASA_INSTANTIATE_ALL(MASA::navierstokes_3d_incompressible);
 
 
-
-//---------------------------------------------------------
-// AUTOMASA
-// Generated on: 2013-05-06 12:39:39
-//---------------------------------------------------------
+#endif // HAVE_METAPHYSICL
diff --git a/src/navierstokes_3d_incompressible_homogeneous.cpp b/src/navierstokes_3d_incompressible_homogeneous.cpp
@@ -24,6 +24,8 @@
 
 #include <masa_internal.h>
 
+#ifdef HAVE_METAPHYSICL
+
 #include <ad_masa.h>
 
 
@@ -303,8 +305,4 @@ Scalar MASA::navierstokes_3d_incompressible_homogeneous<Scalar>::eval_exact_p(Sc
 MASA_INSTANTIATE_ALL(MASA::navierstokes_3d_incompressible_homogeneous);
 
 
-
-//---------------------------------------------------------
-// AUTOMASA
-// Generated on: 2013-05-08 11:32:28
-//---------------------------------------------------------
+#endif // HAVE_METAPHYSICL
diff --git a/src/navierstokes_3d_transient_sutherland.cpp b/src/navierstokes_3d_transient_sutherland.cpp
@@ -24,6 +24,8 @@
 
 #include <masa_internal.h>
 
+#ifdef HAVE_METAPHYSICL
+
 #include <ad_masa.h>
 
 typedef ShadowNumber<double, long double> RawScalar;
@@ -402,8 +404,4 @@ Scalar MASA::navierstokes_3d_transient_sutherland<Scalar>::eval_exact_w(Scalar x
 MASA_INSTANTIATE_ALL(MASA::navierstokes_3d_transient_sutherland);
 
 
-
-//---------------------------------------------------------
-// AUTOMASA
-// Generated on: 2013-08-17 16:58:35
-//---------------------------------------------------------
+#endif // HAVE_METAPHYSICL