Add CONDUCTOR boundary

.github/workflows/actions.yml

@@ -27,9 +27,14 @@ jobs:
       matrix:
         device: [cpu, amd-gpu, nvidia-gpu]
         precision: [double, single]
+        mpi: [serial, parallel]
         exclude: # my AMD GPU doesn't support fp64 atomics : (
         - device: amd-gpu 
           precision: double
+        - device: amd-gpu
+          mpi: parallel
+        - device: nvidia-gpu
+          mpi: parallel
     runs-on: [self-hosted, "${{ matrix.device }}"]
     steps:
       - name: Checkout
@@ -47,7 +52,7 @@ jobs:
             fi
           elif [ "${{ matrix.device }}" = "amd-gpu" ]; then
             FLAGS="-D Kokkos_ENABLE_HIP=ON -D Kokkos_ARCH_AMD_GFX1100=ON"
-          elif [ "${{ matrix.device }}" = "cpu" ]; then
+          elif [ "${{ matrix.mpi }}" = "parallel" ]; then
             FLAGS="-D mpi=ON"
           fi
           cmake -B build -D TESTS=ON -D output=ON -D precision=${{ matrix.precision }} $FLAGS

README.md

@@ -24,10 +24,14 @@ Our [detailed documentation](https://entity-toolkit.github.io/) includes everyth
 
 ## Contributors (alphabetical)
 
+🎸 __Ludwig Böss__ {[@LudwigBoess](https://github.com/LudwigBoess): PIC, framework}
+
 👀 __Yangyang Cai__ {[@StaticObserver](https://github.com/StaticObserver): GRPIC}
 
 🍵 __Benjamin Crinquand__ {[@bcrinquand](https://github.com/bcrinquand): GRPIC, cubed-sphere}
 
+🚂 __Evgeny Gorbunov__ {[@Alcauchy](https://github.com/Alcauchy): PIC, framework}
+
 :radio: __Siddhant Solanki__ {[@sidruns30](https://github.com/sidruns30): framework}
 
 🤷 __Arno Vanthieghem__ {[@vanthieg](https://github.com/vanthieg): framework, PIC}

cmake/kokkosConfig.cmake

@@ -37,41 +37,6 @@ set(Kokkos_ENABLE_OPENMP
     ${default_KOKKOS_ENABLE_OPENMP}
     CACHE BOOL "Enable OpenMP")
 
-# set memory space
-if(${Kokkos_ENABLE_CUDA})
-  add_compile_definitions(CUDA_ENABLED)
-  set(ACC_MEM_SPACE Kokkos::CudaSpace)
-elseif(${Kokkos_ENABLE_HIP})
-  add_compile_definitions(HIP_ENABLED)
-  set(ACC_MEM_SPACE Kokkos::HIPSpace)
-else()
-  set(ACC_MEM_SPACE Kokkos::HostSpace)
-endif()
-
-set(HOST_MEM_SPACE Kokkos::HostSpace)
-
-# set execution space
-if(${Kokkos_ENABLE_CUDA})
-  set(ACC_EXE_SPACE Kokkos::Cuda)
-elseif(${Kokkos_ENABLE_HIP})
-  set(ACC_EXE_SPACE Kokkos::HIP)
-elseif(${Kokkos_ENABLE_OPENMP})
-  set(ACC_EXE_SPACE Kokkos::OpenMP)
-else()
-  set(ACC_EXE_SPACE Kokkos::Serial)
-endif()
-
-if(${Kokkos_ENABLE_OPENMP})
-  set(HOST_EXE_SPACE Kokkos::OpenMP)
-else()
-  set(HOST_EXE_SPACE Kokkos::Serial)
-endif()
-
-add_compile_options("-D AccelExeSpace=${ACC_EXE_SPACE}")
-add_compile_options("-D AccelMemSpace=${ACC_MEM_SPACE}")
-add_compile_options("-D HostExeSpace=${HOST_EXE_SPACE}")
-add_compile_options("-D HostMemSpace=${HOST_MEM_SPACE}")
-
 if(${BUILD_TESTING} STREQUAL "OFF")
   set(Kokkos_ENABLE_TESTS
       OFF

dev/nix/adios2.nix

@@ -1,7 +1,7 @@
 {
   pkgs ? import <nixpkgs> { },
-  hdf5 ? false,
-  mpi ? false,
+  hdf5,
+  mpi,
 }:
 
 let

dev/nix/kokkos.nix

@@ -1,11 +1,10 @@
 {
   pkgs ? import <nixpkgs> { },
-  arch ? "native",
-  gpu ? "none",
+  arch,
+  gpu,
 }:
 
 let
-  gpuUpper = pkgs.lib.toUpper gpu;
   name = "kokkos";
   version = "4.5.01";
   compilerPkgs = {
@@ -30,35 +29,35 @@ let
   };
   getArch =
     _:
-    if gpu != "none" && arch == "native" then
+    if gpu != "NONE" && arch == "NATIVE" then
       throw "Please specify an architecture when the GPU support is enabled. Available architectures: https://kokkos.org/kokkos-core-wiki/keywords.html#architectures"
     else
-      pkgs.lib.toUpper arch;
+      arch;
 
 in
 pkgs.stdenv.mkDerivation {
   pname = "${name}";
   version = "${version}";
   src = pkgs.fetchgit {
     url = "https://github.com/kokkos/kokkos/";
-    rev = "v${version}";
+    rev = "${version}";
     sha256 = "sha256-cI2p+6J+8BRV5fXTDxxHTfh6P5PeeLUiF73o5zVysHQ=";
   };
 
   nativeBuildInputs = with pkgs; [
     cmake
   ];
 
-  propagatedBuildInputs = compilerPkgs.${gpuUpper};
+  propagatedBuildInputs = compilerPkgs.${gpu};
 
   cmakeFlags = [
     "-D CMAKE_CXX_STANDARD=17"
     "-D CMAKE_CXX_EXTENSIONS=OFF"
     "-D CMAKE_POSITION_INDEPENDENT_CODE=TRUE"
     "-D Kokkos_ARCH_${getArch { }}=ON"
-    (if gpu != "none" then "-D Kokkos_ENABLE_${gpuUpper}=ON" else "")
+    (if gpu != "none" then "-D Kokkos_ENABLE_${gpu}=ON" else "")
     "-D CMAKE_BUILD_TYPE=Release"
-  ] ++ cmakeFlags.${gpuUpper};
+  ] ++ cmakeFlags.${gpu};
 
   enableParallelBuilding = true;
 }

dev/nix/shell.nix

@@ -1,15 +1,45 @@
 {
   pkgs ? import <nixpkgs> { },
+  gpu ? "NONE",
+  arch ? "NATIVE",
+  hdf5 ? true,
   mpi ? false,
-  hdf5 ? false,
-  gpu ? "none",
-  arch ? "native",
 }:
 
 let
+  gpuUpper = pkgs.lib.toUpper gpu;
+  archUpper = pkgs.lib.toUpper arch;
   name = "entity-dev";
   adios2Pkg = (pkgs.callPackage ./adios2.nix { inherit pkgs mpi hdf5; });
-  kokkosPkg = (pkgs.callPackage ./kokkos.nix { inherit pkgs arch gpu; });
+  kokkosPkg = (
+    pkgs.callPackage ./kokkos.nix {
+      inherit pkgs;
+      arch = archUpper;
+      gpu = gpuUpper;
+    }
+  );
+  envVars = {
+    compiler = rec {
+      NONE = {
+        CXX = "g++";
+        CC = "gcc";
+      };
+      HIP = {
+        CXX = "hipcc";
+        CC = "hipcc";
+      };
+      CUDA = NONE;
+    };
+    kokkos = {
+      HIP = {
+        Kokkos_ENABLE_HIP = "ON";
+      };
+      CUDA = {
+        Kokkos_ENABLE_CUDA = "ON";
+      };
+      NONE = { };
+    };
+  };
 in
 pkgs.mkShell {
   name = "${name}-env";
@@ -39,11 +69,27 @@ pkgs.mkShell {
     pkgs.zlib
   ]);
 
-  shellHook = ''
-    BLUE='\033[0;34m'
-    NC='\033[0m'
+  shellHook =
+    ''
+      BLUE='\033[0;34m'
+      NC='\033[0m'
+
+      echo "following environment variables are set:"
+    ''
+    + pkgs.lib.concatStringsSep "" (
+      pkgs.lib.mapAttrsToList (
+        category: vars:
+        pkgs.lib.concatStringsSep "" (
+          pkgs.lib.mapAttrsToList (name: value: ''
+            export ${name}=${value}
+            echo -e "  ''\${BLUE}${name}''\${NC}=${value}"
+          '') vars.${gpuUpper}
+        )
+      ) envVars
+    )
+    + ''
+      echo ""
+      echo -e "${name} nix-shell activated"
+    '';
 
-    echo ""
-    echo -e "${name} nix-shell activated"
-  '';
 }

input.example.toml

@@ -90,7 +90,7 @@
     # Boundary conditions for fields:
     #   @required
     #   @type: 1/2/3-size array of string tuples, each of size 1 or 2
-    #   @valid: "PERIODIC", "MATCH", "FIXED", "ATMOSPHERE", "CUSTOM", "HORIZON"
+    #   @valid: "PERIODIC", "MATCH", "FIXED", "ATMOSPHERE", "CUSTOM", "HORIZON", "CONDUCTOR"
     #   @example: [["CUSTOM", "MATCH"]] (for 2D spherical [[rmin, rmax]])
     #   @note: When periodic in any of the directions, you should only set one value: [..., ["PERIODIC"], ...]
     #   @note: In spherical, bondaries in theta/phi are set automatically (only specify bc @ [rmin, rmax]): [["ATMOSPHERE", "MATCH"]]
@@ -340,7 +340,7 @@
     # Field quantities to output:
     #   @type: array of strings
     #   @valid: fields: "E", "B", "J", "divE"
-    #   @valid: moments: "Rho", "Charge", "N", "Nppc", "T0i", "Tij"
+    #   @valid: moments: "Rho", "Charge", "N", "Nppc", "T0i", "Tij", "Vi"
     #   @valid: for GR: "D", "H", "divD", "A"
     #   @default: []
     #   @note: For T, you can use unspecified indices, e.g., Tij, T0i, or specific ones, e.g., Ttt, T00, T02, T23

legacy/tests/kernels-sr.cpp

@@ -1,17 +1,17 @@
-#include "wrapper.h"
-
 #include <Kokkos_Core.hpp>
 
 #include <iostream>
 #include <stdexcept>
 
+#include "wrapper.h"
+
 #include METRIC_HEADER
 #include PGEN_HEADER
 
-#include "particle_macros.h"
-
 #include "kernels/particle_pusher_sr.hpp"
 
+#include "particle_macros.h"
+
 template <typename T>
 void put_value(ntt::array_t<T*>& arr, T value, int i) {
   auto arr_h = Kokkos::create_mirror_view(arr);
@@ -221,4 +221,4 @@ auto main(int argc, char* argv[]) -> int {
   ntt::GlobalFinalize();
 
   return 0;
-}
+}