Sync branch with main

.github/pull_request_template.md

@@ -0,0 +1,7 @@
+## This PR updates
+
+(Add description)
+
+## PR Checklist
+- [ ] Did you include comments/documentation?
+- [ ] Did you include and pass unit tests?

.gitignore

@@ -39,10 +39,16 @@
 *.JSON
 test.py
 
+# Visualization files
+*.vtk
+*.vtm
+*.vti
+
 # Exclude directories
 build/
 external/*/
 .cache/
 .vscode
 images/*
-examples/*
+examples/*
+tmp/

CMakeLists.txt

@@ -154,3 +154,16 @@ if(TEST)
     target_link_libraries(simulatorTest PUBLIC gtest testLib)
     gtest_discover_tests(simulatorTest)
 endif()
+
+# create benchmarks
+option(BENCHMARK "Configure for building benchmarks")
+if(BENCHMARK)
+    find_package(benchmark REQUIRED)
+    set(TARGET_NAME simulatorBenchmark)
+    add_executable(simulatorBenchmark)
+    target_sources(simulatorBenchmark PUBLIC benchmarks/benchmark.cpp)
+    target_link_libraries(simulatorBenchmark PUBLIC gtest gtest_main)
+    target_link_libraries(simulatorBenchmark PUBLIC gtest lbmLib)
+    target_link_libraries(simulatorBenchmark PUBLIC gtest simLib)
+    target_link_libraries(simulatorBenchmark PUBLIC benchmark::benchmark)
+endif()

benchmarks/CMakeLists.txt

@@ -0,0 +1,5 @@
+target_sources(${TARGET_NAME} PRIVATE ${SOURCE_LIST})
+target_link_libraries(${TARGET_NAME} PUBLIC gtest gtest_main)
+target_link_libraries(${TARGET_NAME} PUBLIC nlohmann_json::nlohmann_json)
+target_link_libraries(${TARGET_NAME} PUBLIC lbmLib)
+target_link_libraries(${TARGET_NAME} PUBLIC simLib)

benchmarks/benchmark.cpp

@@ -0,0 +1,24 @@
+#include "gtest/gtest.h"
+#include "benchmark/benchmark.h"
+
+#include "../src/baseSimulator.h"
+#include "../src/baseSimulator.hh"
+
+using T = double;
+
+void BM_simRun(benchmark::State& state) {
+
+  std::string file = "../examples/Hybrid/Network4a.JSON";
+
+  // Load and set the network from a JSON file
+  arch::Network<T> network = porting::networkFromJSON<T>(file);
+
+  // Load and set the simulation from a JSON file
+  sim::Simulation<T> testSimulation = porting::simulationFromJSON<T>(file, &network);
+  for (auto _ : state) {
+    testSimulation.simulate();
+  }
+}
+BENCHMARK(BM_simRun);
+
+BENCHMARK_MAIN(); 

examples/Hybrid/Network1a.py

@@ -51,9 +51,11 @@ def hybridContinuous():
     simulation.setContinuousPhase(f0)
     simulation.setPoiseuilleResistanceModel()
 
-    simulation.addLbmSimulator("1a", "../STL/cross.stl", m0, [n5, n7, n8, n9], \
-                               [[1.0, 0.0], [0.0, -1.0], [0.0, 1.0], [-1.0, 0.0]], [1e-4, 1e-4, 1e-4, 1e-4], \
-                                1e-4, 1e-1, 0.1, 20, 1e-1, 0.55)
+    s1 = simulation.addLbmSimulator("1a", "../STL/cross.stl", m0, [n5, n7, n8, n9], \
+                                    [[1.0, 0.0], [0.0, -1.0], [0.0, 1.0], [-1.0, 0.0]], [1e-4, 1e-4, 1e-4, 1e-4], \
+                                    1e-4, 1e-1, 20, 1e-1, 0.55)
+
+    s1.setNaiveScheme(0.1, 0.5, 10)
 
     network.sort()