Skip to content

Commit bb6e0ca

Browse files
Fixes commented points in review
1 parent 85bc816 commit bb6e0ca

File tree

11 files changed

+25
-25
lines changed

11 files changed

+25
-25
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(dgtd)
99
set(CMAKE_CXX_STANDARD 17)
1010

1111
option(SEMBA_DGTD_ENABLE_MPI "Enable MPI support" OFF )
12-
option(SEMBA_DGTD_ENABLE_OPEN_MP "Enable OpenMP support" OFF )
12+
option(SEMBA_DGTD_ENABLE_OPENMP "Enable OpenMP support" OFF )
1313
option(SEMBA_DGTD_ENABLE_CUDA "Enable CUDA support" OFF )
1414
option(SEMBA_DGTD_ENABLE_PYTHON_BINDINGS "Enable Python bindings" OFF )
1515
option(SEMBA_DGTD_ENABLE_MFEM_AS_SUBDIRECTORY "Use MFEM as a subdirectory" ON )

src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ if (SEMBA_DGTD_ENABLE_MPI)
33
add_compile_definitions(SEMBA_DGTD_ENABLE_MPI)
44
endif()
55

6-
if (SEMBA_DGTD_ENABLE_OPEN_MP)
6+
if (SEMBA_DGTD_ENABLE_OPENMP)
77
FIND_PACKAGE(OpenMP REQUIRED)
88
IF(OpenMP_FOUND)
9-
message(STATUS "SEMBA_DGTD_ENABLE_OPEN_MP:" ${SEMBA_DGTD_ENABLE_OPEN_MP})
9+
message(STATUS "SEMBA_DGTD_ENABLE_OPENMP:" ${SEMBA_DGTD_ENABLE_OPENMP})
1010
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
1111
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
12-
add_compile_definitions(SEMBA_DGTD_ENABLE_OPEN_MP)
12+
add_compile_definitions(SEMBA_DGTD_ENABLE_OPENMP)
1313
endif()
1414
endif()
1515

src/components/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ include_directories(${PARENT_DIR})
2424

2525
target_link_libraries(maxwell-components mfem Eigen3::Eigen nlohmann_json)
2626

27-
if (SEMBA_DGTD_ENABLE_OPEN_MP)
27+
if (SEMBA_DGTD_ENABLE_OPENMP)
2828
message(STATUS "Linking maxwell-components with OpenMP libraries")
2929
target_link_libraries(maxwell-components OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
3030
endif()

src/components/RCSDataExtractor.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
#include "RCSDataExtractor.h"
22

3+
#include <mfem.hpp>
4+
#include <filesystem>
5+
#include <fstream>
6+
#include <sstream>
7+
#include <iomanip>
8+
9+
#include "RCSManager.h"
10+
#include "SubMesher.h"
11+
#include "../test/TestUtils.h"
12+
#include "math/PhysicalConstants.h"
13+
#include "evolution/HesthavenEvolutionMethods.h"
14+
315
namespace maxwell {
416

517
std::unique_ptr<SparseMatrix> assembleNtFFMatrix(FiniteElementSpace& fes) {

src/components/RCSDataExtractor.h

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
#include <mfem.hpp>
2-
#include <filesystem>
3-
#include <fstream>
4-
#include <sstream>
5-
#include <iomanip>
1+
#include <string>
62

7-
#include "RCSManager.h"
8-
#include "SubMesher.h"
9-
#include "../test/TestUtils.h"
10-
#include "math/PhysicalConstants.h"
11-
#include "evolution/HesthavenEvolutionMethods.h"
12-
13-
namespace maxwell {
14-
15-
using namespace mfem;
3+
namespace maxwell {
164

175
class RCSDataExtractor {
186
public:

src/driver/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ target_link_libraries(maxwell-driver
1010
nlohmann_json
1111
)
1212

13-
if (SEMBA_DGTD_ENABLE_OPEN_MP)
13+
if (SEMBA_DGTD_ENABLE_OPENMP)
1414
message(STATUS "Linking maxwell-driver with OpenMP libraries")
1515
target_link_libraries(maxwell-driver OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
1616
endif()

src/evolution/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include_directories(${PARENT_DIR})
1515

1616
target_link_libraries(maxwell-evolution maxwell-components mfem maxwell-mfemExtension Eigen3::Eigen)
1717

18-
if (SEMBA_DGTD_ENABLE_OPEN_MP)
18+
if (SEMBA_DGTD_ENABLE_OPENMP)
1919
message(STATUS "Linking maxwell-evolution with OpenMP libraries")
2020
target_link_libraries(maxwell-evolution OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
2121
endif()

src/launcher/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ target_link_libraries(opensemba_dgtd
77
mfem
88
)
99

10-
if (SEMBA_DGTD_ENABLE_OPEN_MP)
10+
if (SEMBA_DGTD_ENABLE_OPENMP)
1111
message(STATUS "Linking opensemba_dgtd with OpenMP libraries")
1212
target_link_libraries(opensemba_dgtd OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
1313
endif()

src/math/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include_directories(${PARENT_DIR})
77

88
target_link_libraries(maxwell-math mfem)
99

10-
if (SEMBA_DGTD_ENABLE_OPEN_MP)
10+
if (SEMBA_DGTD_ENABLE_OPENMP)
1111
message(STATUS "Linking maxwell-math with OpenMP libraries")
1212
target_link_libraries(maxwell-math OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
1313
endif()

src/mfemExtension/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ add_library(maxwell-mfemExtension STATIC
88

99
target_link_libraries(maxwell-mfemExtension mfem)
1010

11-
if (SEMBA_DGTD_ENABLE_OPEN_MP)
11+
if (SEMBA_DGTD_ENABLE_OPENMP)
1212
message(STATUS "Linking maxwell-mfemExtension with OpenMP libraries")
1313
target_link_libraries(maxwell-mfemExtension OpenMP::OpenMP_C OpenMP::OpenMP_CXX)
1414
endif()

0 commit comments

Comments
 (0)