diff --git a/Common/operator_base.h b/Common/operator_base.h index 50cd306..19eb931 100644 --- a/Common/operator_base.h +++ b/Common/operator_base.h @@ -19,7 +19,7 @@ #define OPERATOR_BASE_H #include "tools/global.h" -#include "FDTD/processing.h" +#include "Common/processing.h" #include "string" class Operator_Base diff --git a/FDTD/process_efield.cpp b/Common/process_efield.cpp similarity index 100% rename from FDTD/process_efield.cpp rename to Common/process_efield.cpp diff --git a/FDTD/process_efield.h b/Common/process_efield.h similarity index 98% rename from FDTD/process_efield.h rename to Common/process_efield.h index bf1d9f2..35afc40 100644 --- a/FDTD/process_efield.h +++ b/Common/process_efield.h @@ -19,7 +19,7 @@ #define PROCESS_EFIELD_H #include "processing.h" -#include "engine.h" +#include "FDTD/engine.h" /*! \brief Process E-field at a point diff --git a/FDTD/process_hfield.cpp b/Common/process_hfield.cpp similarity index 100% rename from FDTD/process_hfield.cpp rename to Common/process_hfield.cpp diff --git a/FDTD/process_hfield.h b/Common/process_hfield.h similarity index 100% rename from FDTD/process_hfield.h rename to Common/process_hfield.h diff --git a/FDTD/processcurrent.cpp b/Common/processcurrent.cpp similarity index 99% rename from FDTD/processcurrent.cpp rename to Common/processcurrent.cpp index 2ebe466..139acc0 100644 --- a/FDTD/processcurrent.cpp +++ b/Common/processcurrent.cpp @@ -17,7 +17,7 @@ #include "tools/global.h" #include "processcurrent.h" -#include "engine_interface_fdtd.h" +#include "FDTD/engine_interface_fdtd.h" #include ProcessCurrent::ProcessCurrent(Operator_Base* op) : ProcessIntegral(op) diff --git a/FDTD/processcurrent.h b/Common/processcurrent.h similarity index 100% rename from FDTD/processcurrent.h rename to Common/processcurrent.h diff --git a/FDTD/processfields.cpp b/Common/processfields.cpp similarity index 99% rename from FDTD/processfields.cpp rename to Common/processfields.cpp index b35ce96..87f2f24 100644 --- a/FDTD/processfields.cpp +++ b/Common/processfields.cpp @@ -19,7 +19,7 @@ #include #include "tools/global.h" #include "processfields.h" -#include "engine_interface_fdtd.h" +#include "FDTD/engine_interface_fdtd.h" ProcessFields::ProcessFields(Operator_Base* op) : Processing(op) { diff --git a/FDTD/processfields.h b/Common/processfields.h similarity index 100% rename from FDTD/processfields.h rename to Common/processfields.h diff --git a/FDTD/processfields_td.cpp b/Common/processfields_td.cpp similarity index 100% rename from FDTD/processfields_td.cpp rename to Common/processfields_td.cpp diff --git a/FDTD/processfields_td.h b/Common/processfields_td.h similarity index 100% rename from FDTD/processfields_td.h rename to Common/processfields_td.h diff --git a/FDTD/processing.cpp b/Common/processing.cpp similarity index 100% rename from FDTD/processing.cpp rename to Common/processing.cpp diff --git a/FDTD/processing.h b/Common/processing.h similarity index 100% rename from FDTD/processing.h rename to Common/processing.h diff --git a/FDTD/processintegral.cpp b/Common/processintegral.cpp similarity index 100% rename from FDTD/processintegral.cpp rename to Common/processintegral.cpp diff --git a/FDTD/processintegral.h b/Common/processintegral.h similarity index 100% rename from FDTD/processintegral.h rename to Common/processintegral.h diff --git a/FDTD/processmodematch.cpp b/Common/processmodematch.cpp similarity index 100% rename from FDTD/processmodematch.cpp rename to Common/processmodematch.cpp diff --git a/FDTD/processmodematch.h b/Common/processmodematch.h similarity index 100% rename from FDTD/processmodematch.h rename to Common/processmodematch.h diff --git a/FDTD/processvoltage.cpp b/Common/processvoltage.cpp similarity index 100% rename from FDTD/processvoltage.cpp rename to Common/processvoltage.cpp diff --git a/FDTD/processvoltage.h b/Common/processvoltage.h similarity index 100% rename from FDTD/processvoltage.h rename to Common/processvoltage.h diff --git a/FDTD/operator.cpp b/FDTD/operator.cpp index 0e96dd3..4b298fd 100644 --- a/FDTD/operator.cpp +++ b/FDTD/operator.cpp @@ -19,7 +19,7 @@ #include "operator.h" #include "engine.h" #include "operator_extension.h" -#include "processfields.h" +#include "Common/processfields.h" #include "tools/array_ops.h" #include "fparser.hh" diff --git a/FDTD/operator_cylinder.cpp b/FDTD/operator_cylinder.cpp index ce4dae7..fb41a11 100644 --- a/FDTD/operator_cylinder.cpp +++ b/FDTD/operator_cylinder.cpp @@ -16,7 +16,7 @@ */ #include "engine.h" -#include "processfields.h" +#include "Common/processfields.h" #include "operator_cylinder.h" #include "operator_extension.h" #include "operator_ext_cylinder.h" diff --git a/FDTD/operator_sse.cpp b/FDTD/operator_sse.cpp index 2bb3aee..7dfd677 100644 --- a/FDTD/operator_sse.cpp +++ b/FDTD/operator_sse.cpp @@ -18,7 +18,7 @@ #include "engine_sse.h" #include "operator_sse.h" #include "tools/array_ops.h" -#include "processfields.h" +//#include "processfields.h" Operator_sse* Operator_sse::New() { diff --git a/openEMS.pro b/openEMS.pro index 6f00cd4..26be764 100644 --- a/openEMS.pro +++ b/openEMS.pro @@ -50,14 +50,6 @@ SOURCES += main.cpp \ FDTD/engine.cpp \ FDTD/operator.cpp \ tools/array_ops.cpp \ - FDTD/processvoltage.cpp \ - FDTD/process_efield.cpp \ - FDTD/process_hfield.cpp \ - FDTD/processing.cpp \ - FDTD/processintegral.cpp \ - FDTD/processfields.cpp \ - FDTD/processfields_td.cpp \ - FDTD/processcurrent.cpp \ openems.cpp \ FDTD/engine_multithread.cpp \ FDTD/operator_cylinder.cpp \ @@ -81,29 +73,31 @@ SOURCES += main.cpp \ FDTD/engine_ext_lorentzmaterial.cpp \ FDTD/operator_ext_pml_sf.cpp \ FDTD/engine_ext_pml_sf.cpp \ - FDTD/processmodematch.cpp \ FDTD/operator_cylindermultigrid.cpp \ FDTD/engine_cylindermultigrid.cpp \ FDTD/engine_ext_cylindermultigrid.cpp \ FDTD/operator_ext_upml.cpp \ FDTD/engine_ext_upml.cpp \ + FDTD/engine_interface_fdtd.cpp +# Common source files +SOURCES += Common/operator_base.cpp \ Common/engine_interface_base.cpp \ - FDTD/engine_interface_fdtd.cpp \ - Common/operator_base.cpp + Common/processmodematch.cpp \ + Common/processvoltage.cpp \ + Common/process_efield.cpp \ + Common/process_hfield.cpp \ + Common/processing.cpp \ + Common/processintegral.cpp \ + Common/processfields.cpp \ + Common/processfields_td.cpp \ + Common/processcurrent.cpp + HEADERS += tools/ErrorMsg.h \ tools/AdrOp.h \ tools/constants.h \ FDTD/engine.h \ FDTD/operator.h \ tools/array_ops.h \ - FDTD/processvoltage.h \ - FDTD/process_efield.h \ - FDTD/process_hfield.h \ - FDTD/processing.h \ - FDTD/processintegral.h \ - FDTD/processfields.h \ - FDTD/processfields_td.h \ - FDTD/processcurrent.h \ openems.h \ FDTD/engine_multithread.h \ FDTD/operator_cylinder.h \ @@ -127,16 +121,26 @@ HEADERS += tools/ErrorMsg.h \ FDTD/engine_ext_lorentzmaterial.h \ FDTD/operator_ext_pml_sf.h \ FDTD/engine_ext_pml_sf.h \ - FDTD/processmodematch.h \ FDTD/operator_cylindermultigrid.h \ FDTD/engine_cylindermultigrid.h \ FDTD/engine_ext_cylindermultigrid.h \ tools/aligned_allocator.h \ FDTD/operator_ext_upml.h \ FDTD/engine_ext_upml.h \ + FDTD/engine_interface_fdtd.h +# Common header files +HEADERS += Common/operator_base.h \ Common/engine_interface_base.h \ - FDTD/engine_interface_fdtd.h \ - Common/operator_base.h + Common/processvoltage.h \ + Common/process_efield.h \ + Common/process_hfield.h \ + Common/processing.h \ + Common/processintegral.h \ + Common/processfields.h \ + Common/processfields_td.h \ + Common/processcurrent.h \ + Common/processmodematch.h + QMAKE_CXXFLAGS_RELEASE = -O3 \ -g \ -march=native diff --git a/openems.cpp b/openems.cpp index 642578c..7ab4d8f 100644 --- a/openems.cpp +++ b/openems.cpp @@ -26,12 +26,12 @@ #include "FDTD/operator_ext_pml_sf.h" #include "FDTD/operator_ext_upml.h" #include "FDTD/engine_interface_fdtd.h" -#include "FDTD/processvoltage.h" -#include "FDTD/processcurrent.h" -#include "FDTD/process_efield.h" -#include "FDTD/process_hfield.h" -#include "FDTD/processmodematch.h" -#include "FDTD/processfields_td.h" +#include "Common/processvoltage.h" +#include "Common/processcurrent.h" +#include "Common/process_efield.h" +#include "Common/process_hfield.h" +#include "Common/processmodematch.h" +#include "Common/processfields_td.h" #include #include #include // only for H5get_libversion()