feature/fftmDev

KEMField/CMakeLists.txt

@@ -95,7 +95,7 @@ add_subdirectory(${SOURCE}/Plugins/Root)
 add_subdirectory(${SOURCE}/Plugins/VTK)
 add_subdirectory(${SOURCE}/FastMultipole/Utility)
 add_subdirectory(${SOURCE}/Interface/BoundaryIntegrators/Electric)
-add_subdirectory(${SOURCE}/Interface/ChargeDensitySolvers/Electric)
+add_subdirectory(${SOURCE}/Interface/ChargeDensitySolvers)
 add_subdirectory(${SOURCE}/Interface/FieldSolvers/Electric)
 add_subdirectory(${SOURCE}/Interface/FieldSolvers/Magnetic)
 add_subdirectory(${SOURCE}/Interface/Fields/Magnetic)

KEMField/Source/Bindings/CMakeLists.txt

@@ -36,6 +36,8 @@ set (KEMFIELD_BINDINGS_HEADERFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Electric/include/KKrylovChargeDensitySolverOldBuilder.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Electric/include/KKrylovPreconditionerGeneratorBuilder.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Electric/include/KKrylovSolverConfigurationReader.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Magnetic/include/KCachedMagneticChargeDensitySolverBuilder.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Magnetic/include/KBiotSavartChargeDensitySolverBuilder.hh    
     ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Electric/include/KFMElectrostaticParametersBuilder.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/FieldSolvers/Electric/include/KIntegratingElectrostaticFieldSolverBuilder.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/FieldSolvers/Electric/include/KElectricZHFieldSolverBuilder.hh
@@ -80,6 +82,8 @@ set (KEMFIELD_BINDINGS_SOURCEFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Electric/src/KKrylovChargeDensitySolverOldBuilder.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Electric/src/KKrylovPreconditionerGeneratorBuilder.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Electric/src/KFMElectrostaticParametersBuilder.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Magnetic/src/KCachedMagneticChargeDensitySolverBuilder.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChargeDensitySolvers/Magnetic/src/KBiotSavartChargeDensitySolverBuilder.cc    
     ${CMAKE_CURRENT_SOURCE_DIR}/FieldSolvers/Electric/src/KIntegratingElectrostaticFieldSolverBuilder.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/FieldSolvers/Electric/src/KElectricZHFieldSolverBuilder.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/FieldSolvers/Electric/src/KElectricFastMultipoleFieldSolverBuilder.cc

KEMField/Source/Bindings/ChargeDensitySolvers/Magnetic/include/KBiotSavartChargeDensitySolverBuilder.hh

@@ -0,0 +1,48 @@
+/*
+ * KBiotSavartChargeDensitySolverBuilder.hh
+ *
+ *  Created on: 2 Apr 2025
+ *      Author: pslocum
+ */
+
+#ifndef KBIOTSAVARTCHARGEDENSITYSOLVERBUILDER_HH_
+#define KBIOTSAVARTCHARGEDENSITYSOLVERBUILDER_HH_
+
+#include "KComplexElement.hh"
+#include "KEMBindingsMessage.hh"
+#include "KEMStringUtils.hh"
+#include "KBiotSavartChargeDensitySolver.hh"
+
+
+namespace katrin
+{
+
+typedef KComplexElement<KEMField::KBiotSavartChargeDensitySolver> KBiotSavartChargeDensitySolverBuilder;
+
+template<> inline bool KBiotSavartChargeDensitySolverBuilder::AddAttribute(KContainer* aContainer)
+{
+    if (aContainer->Empty())
+    {
+        KEMField::kem_cout(eError) << "ERROR: Biot Savart solver container is empty (did you forget to set up the geometry?)" << eom;
+    }
+    return true;
+}
+
+template<> inline bool KBiotSavartChargeDensitySolverBuilder::AddElement(KContainer* anElement)
+{
+    if (anElement->Empty())
+    {
+        KEMField::kem_cout(eError) << "ERROR: Element is empty.)" << eom;
+    }
+    return true;
+}
+
+template<> inline bool KBiotSavartChargeDensitySolverBuilder::End()
+{
+    return true;
+}
+
+
+} /* namespace katrin */
+
+#endif /* KBIOTSAVARTCHARGEDENSITYSOLVERBUILDER_HH_ */

KEMField/Source/Bindings/ChargeDensitySolvers/Magnetic/include/KCachedMagneticChargeDensitySolverBuilder.hh

@@ -0,0 +1,38 @@
+/*
+ * KCachedMagneticChargeDensitySolverBuilder.hh
+ *
+ *  Created on: 18 Apr 2025
+ *      Author: pslocum
+ */
+
+#ifndef KCACHEDMAGNETICCHARGEDENSITYSOLVERBUILDER_HH_
+#define KCACHEDMAGNETICCHARGEDENSITYSOLVERBUILDER_HH_
+
+#include "KCachedMagneticChargeDensitySolver.hh"
+#include "KComplexElement.hh"
+
+namespace katrin
+{
+
+typedef KComplexElement<KEMField::KCachedMagneticChargeDensitySolver> KCachedMagneticChargeDensitySolverBuilder;
+
+template<> inline bool KCachedMagneticChargeDensitySolverBuilder::AddAttribute(KContainer* aContainer)
+{
+    if (aContainer->GetName() == "name") {
+        std::string name;
+        aContainer->CopyTo(name);
+        fObject->SetName(name);
+        return true;
+    }
+    if (aContainer->GetName() == "hash") {
+        std::string hash;
+        aContainer->CopyTo(hash);
+        fObject->SetHash(hash);
+        return true;
+    }
+    return false;
+}
+
+}  // namespace katrin
+
+#endif /* KCACHEDMAGNETICCHARGEDENSITYSOLVERBUILDER_HH_ */

KEMField/Source/Bindings/ChargeDensitySolvers/Magnetic/src/KBiotSavartChargeDensitySolverBuilder.cc

@@ -0,0 +1,28 @@
+/*
+ * KBiotSavartChargeDensitySolverBuilder.cc
+ *
+ *  Created on: 2 Apr 2025
+ *      Author: pslocum
+ */
+
+#include "KBiotSavartChargeDensitySolverBuilder.hh"
+
+#include "KElectrostaticBoundaryFieldBuilder.hh"
+
+using namespace KEMField;
+
+namespace katrin
+{
+
+template<> KBiotSavartChargeDensitySolverBuilder::~KComplexElement() = default;
+
+
+STATICINT sKBiotSavartChargeDensitySolverStructure =
+    KBiotSavartChargeDensitySolverBuilder::Attribute<std::string>("solver_name");
+
+STATICINT sKElectrostaticBoundaryField =
+    KElectrostaticBoundaryFieldBuilder::ComplexElement<KBiotSavartChargeDensitySolver>("biotsavart_bem_solver_new") +
+    KElectrostaticBoundaryFieldBuilder::ComplexElement<KBiotSavartChargeDensitySolver>("biotsavart_charge_density_solver");
+
+
+} /* namespace katrin */

KEMField/Source/Bindings/ChargeDensitySolvers/Magnetic/src/KCachedMagneticChargeDensitySolverBuilder.cc

@@ -0,0 +1,28 @@
+/*
+ * KCachedMagneticChargeDensitySolverBuilder.cc
+ *
+ *  Created on: 18 Apr 2025
+ *      Author: pslocum
+ */
+
+#ifndef SRC_KCACHEDMAGNETICCHARGEDENSITYSOLVERBUILDER_CC_
+#define SRC_KCACHEDMAGNETICCHARGEDENSITYSOLVERBUILDER_CC_
+
+#include "KCachedMagneticChargeDensitySolverBuilder.hh"
+
+#include "KElectrostaticBoundaryFieldBuilder.hh"
+
+using namespace KEMField;
+
+namespace katrin
+{
+
+template<> KCachedMagneticChargeDensitySolverBuilder::~KComplexElement() = default;
+
+STATICINT sKCachedMagneticChargeDensitySolverStructure = KCachedMagneticChargeDensitySolverBuilder::Attribute<std::string>("name") +
+                                                 KCachedMagneticChargeDensitySolverBuilder::Attribute<std::string>("hash");
+
+}  // namespace katrin
+
+
+#endif /* SRC_KCACHEDCHARGEDENSITYSOLVERBUILDER_CC_ */

KEMField/Source/Interface/ChargeDensitySolvers/Electric/CMakeLists.txt → KEMField/Source/Interface/ChargeDensitySolvers/CMakeLists.txt

@@ -1,4 +1,4 @@
-# CMakeLists for KEMField/Interface/ChargeDensitySolvers/Electric
+# CMakeLists for KEMField/Interface/ChargeDensitySolvers
 # Author: W. Gosda
 
 # header files
@@ -15,14 +15,28 @@ set( CHARGEDENSITYSOLVER_ELECTRIC_HEADER_BASENAMES
     KRobinHoodChargeDensitySolver.hh
 )
 
+set( CHARGEDENSITYSOLVER_MAGNETIC_HEADER_BASENAMES
+    KCachedMagneticChargeDensitySolver.hh
+    KBiotSavartChargeDensitySolver.hh        
+)
+
 set( CHARGEDENSITYSOLVER_ELECTRIC_HEADER_PATH
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/Electric/include
+)
+
+set( CHARGEDENSITYSOLVER_MAGNETIC_HEADER_PATH
+    ${CMAKE_CURRENT_SOURCE_DIR}/Magnetic/include
 )
 
 foreach( BASENAME ${CHARGEDENSITYSOLVER_ELECTRIC_HEADER_BASENAMES} )
     list( APPEND CHARGEDENSITYSOLVER_ELECTRIC_HEADER_FILENAMES ${CHARGEDENSITYSOLVER_ELECTRIC_HEADER_PATH}/${BASENAME} )
 endforeach( BASENAME )
 
+foreach( BASENAME ${CHARGEDENSITYSOLVER_MAGNETIC_HEADER_BASENAMES} )
+    list( APPEND CHARGEDENSITYSOLVER_MAGNETIC_HEADER_FILENAMES ${CHARGEDENSITYSOLVER_MAGNETIC_HEADER_PATH}/${BASENAME} )
+endforeach( BASENAME )
+
+
 # source files
 set( CHARGEDENSITYSOLVER_ELECTRIC_SOURCE_BASENAMES
     KChargeDensitySolver.cc
@@ -36,20 +50,41 @@ set( CHARGEDENSITYSOLVER_ELECTRIC_SOURCE_BASENAMES
     KRobinHoodChargeDensitySolver.cc
 )
 
+set( CHARGEDENSITYSOLVER_MAGNETIC_SOURCE_BASENAMES
+    KCachedMagneticChargeDensitySolver.cc
+    KBiotSavartChargeDensitySolver.cc        
+)
+
 set( CHARGEDENSITYSOLVER_ELECTRIC_SOURCE_PATH
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/Electric/src
 )
+
+set( CHARGEDENSITYSOLVER_MAGNETIC_SOURCE_PATH
+    ${CMAKE_CURRENT_SOURCE_DIR}/Magnetic/src
+)
+
 foreach( BASENAME ${CHARGEDENSITYSOLVER_ELECTRIC_SOURCE_BASENAMES} )
     list( APPEND CHARGEDENSITYSOLVER_ELECTRIC_SOURCE_FILENAMES ${CHARGEDENSITYSOLVER_ELECTRIC_SOURCE_PATH}/${BASENAME} )
 endforeach( BASENAME )
 
+foreach( BASENAME ${CHARGEDENSITYSOLVER_MAGNETIC_SOURCE_BASENAMES} )
+    list( APPEND CHARGEDENSITYSOLVER_MAGNETIC_SOURCE_FILENAMES ${CHARGEDENSITYSOLVER_MAGNETIC_SOURCE_PATH}/${BASENAME} )
+endforeach( BASENAME )
+
+
 # library
 add_library( KEMFieldChargeDensitySolvers SHARED
-    ${CHARGEDENSITYSOLVER_ELECTRIC_SOURCE_FILENAMES} ${CHARGEDENSITYSOLVER_ELECTRIC_HEADER_FILENAMES})
+    ${CHARGEDENSITYSOLVER_ELECTRIC_SOURCE_FILENAMES} ${CHARGEDENSITYSOLVER_ELECTRIC_HEADER_FILENAMES}
+    ${CHARGEDENSITYSOLVER_MAGNETIC_SOURCE_FILENAMES} ${CHARGEDENSITYSOLVER_MAGNETIC_HEADER_FILENAMES}
+)
 #set_target_properties( KEMFieldChargeDensitySolvers PROPERTIES COMPILE_FLAGS -Wno-overloaded-virtual )
 
 target_include_directories(KEMFieldChargeDensitySolvers
-    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
+    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Electric/include> $<INSTALL_INTERFACE:Electric/include>)
+target_include_directories(KEMFieldChargeDensitySolvers
+    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Magnetic/include> $<INSTALL_INTERFACE:Magnetic/include>)
+
+
 target_link_libraries( KEMFieldChargeDensitySolvers
     PUBLIC
         KEMFieldElectricBoundaryIntegrators
@@ -73,13 +108,21 @@ endif(KEMField_USE_VTK)
 
 # install
 kasper_install_headers( ${CHARGEDENSITYSOLVER_ELECTRIC_HEADER_FILENAMES} )
+kasper_install_headers( ${CHARGEDENSITYSOLVER_MAGNETIC_HEADER_FILENAMES} )
 kasper_install_libraries( KEMFieldChargeDensitySolvers )
 
-# test executable
-#add_executable( KChargeDensitySolver_test test/KChargeDensitySolver_test.cc )
+# test executables
+#add_executable( KChargeDensitySolver_test Electric/test/KChargeDensitySolver_test.cc )
 #target_link_libraries( KChargeDensitySolver_test
 #  ${KGeoBag_LIBRARIES}
 #  KEMFieldChargeDensitySolvers
 #)
+#add_executable( KMagneticChargeDensitySolver_test Magnetic/test/KMagneticChargeDensitySolver_test.cc )
+#target_link_libraries( KMagneticChargeDensitySolver_test
+#  ${KGeoBag_LIBRARIES}
+#  KEMFieldChargeDensitySolvers
+#)
+
 
 #kasper_install_executables( KChargeDensitySolver_test )
+#kasper_install_executables( KMagneticChargeDensitySolver_test )

KEMField/Source/Interface/ChargeDensitySolvers/Magnetic/include/KBiotSavartChargeDensitySolver.hh

@@ -0,0 +1,35 @@
+/*
+ * KBiotSavartChargeDensitySolver.hh
+ *
+ *  Created on: 4 Apr 2025
+ *      Author: pslocum
+ */
+
+#ifndef KBIOTSAVARTCHARGEDENSITYSOLVER_HH_
+#define KBIOTSAVARTCHARGEDENSITYSOLVER_HH_
+
+#include "KMagneticChargeDensitySolver.hh"
+
+namespace KEMField
+{
+
+template<typename ValueType> class KBoundaryMatrixGenerator;  // forward declaration
+
+class KBiotSavartChargeDensitySolver : public KMagneticChargeDensitySolver
+{
+  public:
+
+    KBiotSavartChargeDensitySolver();
+    ~KBiotSavartChargeDensitySolver() override;
+
+  private:
+    void InitializeCore(KSurfaceContainer& container) override;
+    void ComputeSolution(KSurfaceContainer& container);
+
+
+
+};
+
+} /* namespace KEMField */
+
+#endif /* KBIOTSAVARTCHARGEDENSITYSOLVER_HH_ */

KEMField/Source/Interface/ChargeDensitySolvers/Magnetic/include/KCachedMagneticChargeDensitySolver.hh

@@ -0,0 +1,42 @@
+/*
+ * KCachedMagneticChargeDensitySolver.hh
+ *
+ *  Created on: 18 Apr 2025
+ *      Author: pslocum
+ *
+ *      Imported from KSFieldMagnetostatic
+ */
+
+#ifndef KCACHEDMAGNETICCHARGEDENSITYSOLVER_HH_
+#define KCACHEDMAGNETICCHARGEDENSITYSOLVER_HH_
+
+#include "KMagneticChargeDensitySolver.hh"
+
+namespace KEMField
+{
+
+class KCachedMagneticChargeDensitySolver : public KMagneticChargeDensitySolver
+{
+  public:
+    KCachedMagneticChargeDensitySolver();
+    ~KCachedMagneticChargeDensitySolver() override;
+
+    void SetName(const std::string& s)
+    {
+        fName = s;
+    }
+    void SetHash(const std::string& s)
+    {
+        fHash = s;
+    }
+
+  private:
+    void InitializeCore(KSurfaceContainer& container) override;
+
+    std::string fName;
+    std::string fHash;
+};
+
+}  // namespace KEMField
+
+#endif /* KCACHEDMAGNETICCHARGEDENSITYSOLVER_HH_ */

KEMField/Source/Interface/ChargeDensitySolvers/Magnetic/src/KBiotSavartChargeDensitySolver.cc

@@ -0,0 +1,36 @@
+/*
+ * KBiotSavartChargeDensitySolver.cc
+ *
+ *  Created on: 18 Apr 2025
+ *      Author: pslocum
+ */
+
+#include "KBiotSavartChargeDensitySolver.hh"
+
+#include "KEMCoreMessage.hh"
+
+namespace KEMField
+{
+
+KBiotSavartChargeDensitySolver::KBiotSavartChargeDensitySolver()
+{
+}
+
+KBiotSavartChargeDensitySolver::~KBiotSavartChargeDensitySolver() = default;
+
+    void KBiotSavartChargeDensitySolver::InitializeCore(KSurfaceContainer& container)
+    {
+        if (container.empty()) {
+            kem_cout(eError) << "ERROR: Biot Savart solver container is empty (did you forget to set up the geometry?)" << eom;
+        }
+    }
+
+void KBiotSavartChargeDensitySolver::ComputeSolution(KSurfaceContainer& container)
+{
+    if (container.empty()) {
+        kem_cout(eError) << "ERROR: Solver got no electrode elements (did you forget to setup a geometry mesh?)" << eom;
+    }
+}
+
+
+} /* namespace KEMField */