Merge pull request #50 from OpenSEMBA/dev

Updating to Maxwell/Hesthaven/Global operators with curved elements

Author: AlejandroMunozManterola

CMakeLists.txt

@@ -8,22 +8,22 @@ project(dgtd)
 
 set(CMAKE_CXX_STANDARD 17)
 
-option(MAXWELL_USE_MPI OFF)
-option(MAXWELL_ENABLE_PYTHON_BINDINGS OFF)
-option(MAXWELL_USE_MFEM_AS_SUBDIRECTORY ON)
+option(SEMBA_DGTD_ENABLE_MPI "Enable MPI support" OFF )
+option(SEMBA_DGTD_ENABLE_PYTHON_BINDINGS "Enable Python bindings" OFF )
+option(SEMBA_DGTD_ENABLE_MFEM_AS_SUBDIRECTORY "Use MFEM as a subdirectory" ON )
 
-option(MAXWELL_ENABLE_EXTENSIVE_CASE_TESTS ON)
-option(MAXWELL_ENABLE_EXTENSIVE_SOLVER_TESTS ON)
-option(MAXWELL_ENABLE_EXTENSIVE_RCS_TESTS ON)
+option(SEMBA_DGTD_ENABLE_EXTENSIVE_CASE_TESTS "Enable extensive case tests" ON )
+option(SEMBA_DGTD_ENABLE_EXTENSIVE_SOLVER_TESTS "Enable extensive solver tests" ON )
+option(SEMBA_DGTD_ENABLE_EXTENSIVE_RCS_TESTS "Enable extensive RCS tests" ON )
 
-option(MAXWELL_SHOW_TIMER_INFORMATION OFF)
+option(SEMBA_DGTD_ENABLE_TIMER_INFORMATION "Enable timer information" OFF)
 
 include_directories(
 	src/ 
 	src/maxwell/
 )
 
-if (MAXWELL_USE_MFEM_AS_SUBDIRECTORY)
+if (SEMBA_DGTD_ENABLE_MFEM_AS_SUBDIRECTORY)
 	add_subdirectory(external/mfem-geg)
 else ()
 	find_package(MFEM CONFIG REQUIRED)
@@ -32,26 +32,10 @@ endif()
 
 add_subdirectory(src)
 
-if(MAXWELL_ENABLE_PYTHON_BINDINGS)
+if(SEMBA_DGTD_ENABLE_PYTHON_BINDINGS)
 	add_subdirectory(pythonBindings)
 endif()
 
-if(MAXWELL_ENABLE_EXTENSIVE_CASE_TESTS)
-	add_definitions(-DENABLE_EXTENSIVE_CASE_TESTS)
-endif()
-
-if(MAXWELL_ENABLE_EXTENSIVE_SOLVER_TESTS)
-	add_definitions(-DENABLE_EXTENSIVE_SOLVER_TESTS)
-endif()
-
-if(MAXWELL_ENABLE_EXTENSIVE_RCS_TESTS)
-	add_definitions(-DENABLE_EXTENSIVE_RCS_TESTS)
-endif()
-
-if(MAXWELL_SHOW_TIMER_INFORMATION)
-	add_definitions(-DSHOW_TIMER_INFORMATION)
-endif()
-
 enable_testing()
 
 add_subdirectory(test/  )

CMakePresets.json

@@ -12,16 +12,16 @@
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
         "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
-        "MAXWELL_USE_MFEM_AS_SUBDIRECTORY": "ON"
+        "SEMBA_DGTD_ENABLE_MFEM_AS_SUBDIRECTORY": "ON"
       }
     },
     {
       "name": "gnu",
       "displayName": "GNU release",
       "inherits": "default",
       "cacheVariables": {
-        "MAXWELL_ENABLE_EXTENSIVE_CASE_TESTS": "ON", 
-        "MAXWELL_ENABLE_EXTENSIVE_SOLVER_TESTS": "ON",
+        "SEMBA_DGTD_ENABLE_EXTENSIVE_CASE_TESTS": "ON", 
+        "SEMBA_DGTD_ENABLE_EXTENSIVE_SOLVER_TESTS": "ON",
         "CMAKE_BUILD_TYPE": "Release"
       }
     },
@@ -38,8 +38,8 @@
       "displayName": "x64 Release",
       "inherits": "default",
       "cacheVariables": {
-        "MAXWELL_ENABLE_EXTENSIVE_CASE_TESTS": "ON", 
-        "MAXWELL_ENABLE_EXTENSIVE_SOLVER_TESTS": "ON",
+        "SEMBA_DGTD_ENABLE_EXTENSIVE_CASE_TESTS": "ON", 
+        "SEMBA_DGTD_ENABLE_EXTENSIVE_SOLVER_TESTS": "ON",
         "CMAKE_BUILD_TYPE": "Release"
       }
     }

src/CMakeLists.txt

@@ -1,6 +1,6 @@
-if (MAXWELL_USE_MPI)
-	message(STATUS "MAXWELL_USE_MPI:" ${MAXWELL_USE_MPI})
-	add_compile_definitions(MAXWELL_USE_MPI)
+if (SEMBA_DGTD_ENABLE_MPI)
+	message(STATUS "SEMBA_DGTD_ENABLE_MPI:" ${SEMBA_DGTD_ENABLE_MPI})
+	add_compile_definitions(SEMBA_DGTD_ENABLE_MPI)
 endif()
 
 add_subdirectory(launcher)

src/components/CMakeLists.txt

@@ -13,7 +13,8 @@ add_library(maxwell-components STATIC
 	"SubMesher.cpp"
 	"RCSManager.cpp" 
 	"RCSExporter.cpp"
-)
+	"ProblemDefinition.cpp"
+	"DGOperatorFactory.cpp")
 
 get_filename_component(PARENT_DIR ../ ABSOLUTE)
 include_directories(${PARENT_DIR})