Merge pull request #25 from SeisSol/fix-luastate-init

Fix initialization of Lua state
SeisSol · Feb 9, 2022 · 0d1d4e8 · 0d1d4e8
2 parents 39c2508 + f4083de
commit 0d1d4e8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(easi)
 cmake_minimum_required(VERSION 3.13)
 set(EASI_VERSION_MAJOR 1)
 set(EASI_VERSION_MINOR 1)
-set(EASI_VERSION_PATCH 0)
+set(EASI_VERSION_PATCH 1)
 
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)

diff --git a/examples/4_lua.yaml b/examples/4_lua.yaml
@@ -8,7 +8,7 @@ components:
         mu:         0.0
         lambda: 1.96e10
   - !LuaMap
-      returns: ["rho", "mu", "lambda"]
+      returns: [rho, mu, lambda]
       function: |
          function f (x)
           io.write(x[1], " ", x[2], " ", x[3], "\n") -- optional debug output

diff --git a/include/easi/component/LuaMap.h b/include/easi/component/LuaMap.h
@@ -27,13 +27,13 @@ class LuaMap : public Map {
 
     ~LuaMap() override;
 protected:
-    virtual Matrix<double> map(Matrix<double>& x) override;
+    Matrix<double> map(Matrix<double>& x) override;
 
 private:
     double executeLuaFunction(Matrix<double> x, unsigned coordIdx, unsigned funcIdx);
     std::string function;
     std::vector<std::string> idxToNameMap;
-    lua_State* luaState;
+    lua_State* luaState{nullptr};
 
 };
 

diff --git a/src/component/LuaMap.cpp b/src/component/LuaMap.cpp
@@ -32,7 +32,6 @@ double LuaMap::executeLuaFunction(Matrix<double> x,
                                   unsigned coordIdx,
                                   unsigned funcIdx) {
     if (!luaState) {
-        std::cout << "Init lua state" << std::endl;
         luaState = luaL_newstate();
         luaL_openlibs(luaState);
         const auto status = luaL_dostring(luaState, function.data());