eisvogel-project · philippwindischhofer · Apr 20, 2024 · Mar 22, 2024 · Mar 22, 2024 · Mar 22, 2024
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
@@ -6,12 +6,16 @@ jobs:
   build_and_test:
     name: "Run build and tests"
     runs-on: ubuntu-latest
+    env:
+      CC: gcc-13
+      CXX: g++-13
     steps:
 
     - name: Install dependencies
       run: |
-        sudo apt-get -y update
+        sudo apt-get -y update	
         sudo apt-get install -y pkg-config cmake
+        sudo apt-get install -y libtbb-dev
         sudo apt-get install -y libhdf5-mpi-dev libharminv-dev libfftw3-dev libgsl-dev libgslcblas0
         sudo apt-get install -y python3-setuptools cython3 python3-matplotlib python3-mpi4py
         sudo apt-get install -y python3-meep-mpi-default libmeep-mpi-default-dev
@@ -23,16 +27,10 @@ jobs:
       run: |
         mkdir -p build &&
         pushd build &&
-        cmake -DBUILD_PYTHON=ON -DBUILD_WFC=ON -DBUILD_TESTS=ON ../ &&
+        cmake -DBUILD_MEEP=ON -DBUILD_TESTS=ON ../ &&
         VERBOSE=1 make &&
         popd
 
     - name: Run C++ tests
       run: |
-        bash tests/run_tests.sh build/
-
-    - name: Run python tests
-      run: |
-        source build/setup.sh &&
-        python3 -m unittest discover -s cpython/tests/
-
+        bash tests/run_tests.sh build/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,19 +1,22 @@
 cmake_minimum_required( VERSION 3.20 FATAL_ERROR )
 
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED YES)
+
+set(CMAKE_CXX_FLAGS "-O3 -Wall -Wpedantic -Wextra -ftree-vectorize -ffast-math -ftree-vectorizer-verbose=2 -funroll-loops -march=native -save-temps -fverbose-asm -g")
+
 project(eisvogel)
 
-option(BUILD_PYTHON "Build with python support." OFF)
-option(BUILD_WFC "Also build weighting field creator." OFF)
 option(BUILD_TESTS "Build tests." OFF)
+option(BUILD_MEEP "Also build weighting field creator." OFF)
+option(BUILD_EXTERN "Build external tools." OFF)
 
-add_subdirectory(cmake)
-add_subdirectory(src)
+add_subdirectory(eisvogel)
 add_subdirectory(examples)
-add_subdirectory(extern)
 
-if(BUILD_PYTHON)
-    add_subdirectory(cpython)
-endif(BUILD_PYTHON)
+if(BUILD_EXTERN)
+    add_subdirectory(extern)
+endif(BUILD_EXTERN)
 
 if(BUILD_TESTS)
     add_subdirectory(tests)

diff --git a/README.md b/README.md
@@ -24,16 +24,10 @@ make -j5
 source setup.sh
 ```
 
-To build with `python` support, do
+To also build the components for the calculation of the Green's function do
 
 ```
-cmake -DBUILD_PYTHON=ON ..
-```
-
-and to also build the components for the calculation of the Green's function do
-
-```
-cmake -DBUILD_WFC=ON ..
+cmake -DBUILD_MEEP=ON ..
 ```
 
 If you want to build the C++ unit tests, add

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
diff --git a/cmake/setup.sh.in b/cmake/setup.sh.in
diff --git a/cpython/.gitignore b/cpython/.gitignore
diff --git a/cpython/CMakeLists.txt b/cpython/CMakeLists.txt
diff --git a/cpython/__init__.py b/cpython/__init__.py
diff --git a/cpython/ccoordutils.pxd b/cpython/ccoordutils.pxd
diff --git a/cpython/ccurrent.pxd b/cpython/ccurrent.pxd
diff --git a/cpython/csignalcalculator.pxd b/cpython/csignalcalculator.pxd
diff --git a/cpython/cweightingfield.pxd b/cpython/cweightingfield.pxd
diff --git a/cpython/cweightingfieldutils.pxd b/cpython/cweightingfieldutils.pxd
diff --git a/cpython/eisvogel.pyx b/cpython/eisvogel.pyx
diff --git a/cpython/libeisvogel.pxd b/cpython/libeisvogel.pxd
diff --git a/cpython/setup.py b/cpython/setup.py
diff --git a/eisvogel/CMakeLists.txt b/eisvogel/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_subdirectory(core)
+
+if(BUILD_MEEP)
+    add_subdirectory(meep)
+endif(BUILD_MEEP)
diff --git a/eisvogel/core/AnalyticGreensFunctionCalculator.hh b/eisvogel/core/AnalyticGreensFunctionCalculator.hh
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <filesystem>
+#include "Vector.hh"
+
+namespace GreensFunctionCalculator::Analytic {
+
+  void ElectricDipole(std::filesystem::path gf_path, const RZCoordVector& start_coords, const RZCoordVector& end_coords, scalar_t t_end, scalar_t ior,
+		      scalar_t filter_t_peak, unsigned int filter_order, scalar_t r_min,
+		      scalar_t os_factor = 10, std::size_t max_pts_in_chunk = 400);
+
+}
+
+#include "AnalyticGreensFunctionCalculator.hxx"