Skip to content

Commit 51c94ea

Browse files
author
Monica Bugeanu (iMac)
committed
change to CMakeLists to compile wemFiles and not wem, pwl. WEMsolver missing a bracket
1 parent 8156e50 commit 51c94ea

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ if(DEVELOPMENT_CODE)
1212
set(header_dir_list_DEVELOPMENT
1313
${CMAKE_CURRENT_SOURCE_DIR}/wemSolvers
1414
${CMAKE_CURRENT_SOURCE_DIR}/wemFiles
15-
${CMAKE_CURRENT_SOURCE_DIR}/pwl
15+
#${CMAKE_CURRENT_SOURCE_DIR}/pwl
1616
${CMAKE_CURRENT_SOURCE_DIR}/wavcav
17-
#${CMAKE_CURRENT_SOURCE_DIR}/wem
17+
${CMAKE_CURRENT_SOURCE_DIR}/wem
1818
)
1919
list(APPEND header_dir_list "${header_dir_list_DEVELOPMENT}")
2020
list(SORT header_dir_list)
@@ -38,7 +38,7 @@ if(DEVELOPMENT_CODE)
3838
add_subdirectory(wemFiles)
3939
add_subdirectory(wemSolvers)
4040
#add_subdirectory(wem)
41-
add_subdirectory(pwl)
41+
#add_subdirectory(pwl)
4242
add_subdirectory(tsless)
4343
add_subdirectory(wavcav)
4444
endif()

src/solver/WEMSolver.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
#include "SparseMatrix.hpp"
3737
#include "GenericAnsatzFunction.hpp"
38+
#include "LinAnsatzFunction.hpp"
39+
#include "ConAnsatzFunction.hpp"
3840

3941
class Vector2;
4042
class Vector3;
@@ -64,6 +66,7 @@ class WEMSolver : public PCMSolver
6466
: PCMSolver(gfInside_, gfOutside_), integralEquation(integralEquation_) {
6567
if(modelType =="Linear"){
6668
af = new LinAnsatzFunction();
69+
}
6770
else if(modelType == "Wavelet"){
6871
af = new ConAnsatzFunction();
6972
}
@@ -75,7 +78,7 @@ class WEMSolver : public PCMSolver
7578
return af->interCoeff;
7679
}
7780
int getQuadratureLevel() {
78-
return quadratureLevel_;
81+
return af->quadratureLevel_;
7982
}
8083
virtual void buildSystemMatrix(const Cavity & cavity);
8184
virtual void compCharge(const Eigen::VectorXd & potential, Eigen::VectorXd & charge,

0 commit comments

Comments
 (0)