No commit message

No commit message

Solver/elasticitySolver.cpp

@@ -249,10 +249,12 @@ void elasticitySolver::readInputFile(const std::string &fn)
 
 /********************* end deprecated api ****************************************/
 
-void elasticitySolver::addDirichletBC (int dim, int entityId, int component, double value) {
+#if defined (HAVE_LUA)
+
+void elasticitySolver::addDirichletBCLua (int dim, int entityId, int component, std::string luaFunctionName, lua_State *L) {
   dirichletBC diri;
   diri.g = new groupOfElements (dim, entityId);
-  diri._f= new simpleFunction<double>(value);
+  diri._f= new simpleFunctionLua<double>(L, luaFunctionName,0.);
   diri._comp=component;
   diri._tag=entityId;
   switch (dim) {
@@ -264,10 +266,26 @@ void elasticitySolver::addDirichletBC (int dim, int entityId, int component, dou
   allDirichlet.push_back(diri);
 }
 
-void elasticitySolver::addDirichletBCLua (int dim, int entityId, int component, std::string luaFunctionName, lua_State *L) {
+void elasticitySolver::addNeumannBCLua (int dim, int entityId, std::string luaFunctionName, lua_State *L) {
+  neumannBC neu;
+  neu.g = new groupOfElements (dim, entityId);
+  neu._f= new simpleFunctionLua<SVector3>(L, luaFunctionName, SVector3(0,0,0));
+  neu._tag=entityId;
+  switch (dim) {
+    case 0 : neu.onWhat=BoundaryCondition::ON_VERTEX; break;
+    case 1 : neu.onWhat=BoundaryCondition::ON_EDGE; break;
+    case 2 : neu.onWhat=BoundaryCondition::ON_FACE; break;
+    default : return;
+  }
+  allNeumann.push_back(neu);
+}
+
+#endif
+
+void elasticitySolver::addDirichletBC (int dim, int entityId, int component, double value) {
   dirichletBC diri;
   diri.g = new groupOfElements (dim, entityId);
-  diri._f= new simpleFunctionLua<double>(L, luaFunctionName,0.);
+  diri._f= new simpleFunction<double>(value);
   diri._comp=component;
   diri._tag=entityId;
   switch (dim) {
@@ -279,6 +297,7 @@ void elasticitySolver::addDirichletBCLua (int dim, int entityId, int component,
   allDirichlet.push_back(diri);
 }
 
+
 void elasticitySolver::addNeumannBC (int dim, int entityId, const std::vector<double> value) {
   if(value.size()!=3) return;
   neumannBC neu;
@@ -294,19 +313,7 @@ void elasticitySolver::addNeumannBC (int dim, int entityId, const std::vector<do
   allNeumann.push_back(neu);
 }
 
-void elasticitySolver::addNeumannBCLua (int dim, int entityId, std::string luaFunctionName, lua_State *L) {
-  neumannBC neu;
-  neu.g = new groupOfElements (dim, entityId);
-  neu._f= new simpleFunctionLua<SVector3>(L, luaFunctionName, SVector3(0,0,0));
-  neu._tag=entityId;
-  switch (dim) {
-    case 0 : neu.onWhat=BoundaryCondition::ON_VERTEX; break;
-    case 1 : neu.onWhat=BoundaryCondition::ON_EDGE; break;
-    case 2 : neu.onWhat=BoundaryCondition::ON_FACE; break;
-    default : return;
-  }
-  allNeumann.push_back(neu);
-}
+
 
 void elasticitySolver::addElasticDomain (int physical, double e, double nu){
   elasticField field;
@@ -602,6 +609,9 @@ PView* elasticitySolver::buildVonMisesView(const std::string &postFileName)
 }
 #endif
 
+
+#if defined (HAVE_LUA)
+
 #include "Bindings.h"
 void elasticitySolverRegisterBindings(binding *b)
 {
@@ -663,3 +673,4 @@ void elasticitySolverRegisterBindings(binding *b)
   cm->setArgNames("model","tag",NULL);
 }
 
+#endif

Solver/elasticitySolver.h

@@ -55,7 +55,6 @@ struct neumannBC  : public BoundaryCondition
   simpleFunction<SVector3> *_f;
   neumannBC () : BoundaryCondition(),_f(NULL){}
 };
-
 // an elastic solver ...
 class elasticitySolver
 {
@@ -78,12 +77,18 @@ class elasticitySolver
   elasticitySolver(int tag) : _tag(tag),LagSpace(0),pAssembler(0),LagrangeMultiplierSpace(0) {}
 
   elasticitySolver(GModel *model, int tag);
+
   void addDirichletBC (int dim, int entityId, int component, double value);
-  void addDirichletBCLua (int dim, int entityId, int component, std::string luaFunctionName, lua_State *L);
   void addNeumannBC (int dim, int entityId, const std::vector<double> value);
-  void addNeumannBCLua (int dim, int entityId, std::string luaFunctionName, lua_State *L);
   void addElasticDomain (int tag, double e, double nu);
 
+  #if defined (HAVE_LUA)
+
+  void addDirichletBCLua (int dim, int entityId, int component, std::string luaFunctionName, lua_State *L);
+  void addNeumannBCLua (int dim, int entityId, std::string luaFunctionName, lua_State *L);
+
+  #endif
+
   virtual ~elasticitySolver()
   {
     if (LagSpace) delete LagSpace;