moved all processing classes to Common/

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>

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

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
 

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 <iomanip>
 
 ProcessCurrent::ProcessCurrent(Operator_Base* op) : ProcessIntegral(op)

Common/processfields.cpp

@@ -19,7 +19,7 @@
 #include <H5Cpp.h>
 #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)
 {

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"
 

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"

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()
 {

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/processmodematch.cpp \
-    Common/operator_base.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/processvoltage.h \
-    Common/operator_base.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

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 "Common/processvoltage.h"
-#include "FDTD/processcurrent.h"
+#include "Common/processcurrent.h"
-#include "FDTD/process_efield.h"
+#include "Common/process_efield.h"
-#include "FDTD/process_hfield.h"
+#include "Common/process_hfield.h"
-#include "FDTD/processmodematch.h"
+#include "Common/processmodematch.h"
-#include "FDTD/processfields_td.h"
+#include "Common/processfields_td.h"
 #include <sys/time.h>
 #include <time.h>
 #include <H5Cpp.h> // only for H5get_libversion()