moved all FDTD extensions to folder FDTD/extensions

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
pull/1/head
Thorsten Liebig 2010-12-06 15:30:47 +01:00
parent 2f531b99c6
commit 70ae86d63f
38 changed files with 84 additions and 82 deletions

View File

@ -16,8 +16,8 @@
*/ */
#include "engine.h" #include "engine.h"
#include "engine_extension.h" #include "extensions/engine_extension.h"
#include "operator_extension.h" #include "extensions/operator_extension.h"
#include "tools/array_ops.h" #include "tools/array_ops.h"
//! \brief construct an Engine instance //! \brief construct an Engine instance

View File

@ -17,7 +17,7 @@
#include "engine_cylindermultigrid.h" #include "engine_cylindermultigrid.h"
#include "operator_cylindermultigrid.h" #include "operator_cylindermultigrid.h"
#include "engine_ext_cylindermultigrid.h" #include "extensions/engine_ext_cylindermultigrid.h"
Engine_CylinderMultiGrid* Engine_CylinderMultiGrid::New(const Operator_CylinderMultiGrid* op, unsigned int numThreads) Engine_CylinderMultiGrid* Engine_CylinderMultiGrid::New(const Operator_CylinderMultiGrid* op, unsigned int numThreads)
{ {

View File

@ -26,7 +26,7 @@
#include "engine_multithread.h" #include "engine_multithread.h"
#include "engine_extension.h" #include "extensions/engine_extension.h"
#include "tools/array_ops.h" #include "tools/array_ops.h"
#include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/posix_time/posix_time.hpp"

View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "engine.h" #include "FDTD/engine.h"
#include "engine_ext_cylinder.h" #include "engine_ext_cylinder.h"
#include "operator_ext_cylinder.h" #include "operator_ext_cylinder.h"

View File

@ -18,9 +18,9 @@
#ifndef ENGINE_CYLINDER_H #ifndef ENGINE_CYLINDER_H
#define ENGINE_CYLINDER_H #define ENGINE_CYLINDER_H
#include "engine.h" #include "FDTD/engine.h"
#include "engine_extension.h" #include "engine_extension.h"
#include "operator_cylinder.h" #include "FDTD/operator_cylinder.h"
class Operator_Ext_Cylinder; class Operator_Ext_Cylinder;

View File

@ -15,9 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "engine.h" #include "FDTD/engine.h"
#include "engine_ext_cylindermultigrid.h" #include "engine_ext_cylindermultigrid.h"
#include "engine_cylindermultigrid.h" #include "FDTD/engine_cylindermultigrid.h"
Engine_Ext_CylinderMultiGrid::Engine_Ext_CylinderMultiGrid(Operator_Extension* op_ext, bool isBase) : Engine_Extension(op_ext) Engine_Ext_CylinderMultiGrid::Engine_Ext_CylinderMultiGrid(Operator_Extension* op_ext, bool isBase) : Engine_Extension(op_ext)
{ {

View File

@ -18,9 +18,9 @@
#ifndef ENGINE_EXT_CYLINDERMULTIGRID_H #ifndef ENGINE_EXT_CYLINDERMULTIGRID_H
#define ENGINE_EXT_CYLINDERMULTIGRID_H #define ENGINE_EXT_CYLINDERMULTIGRID_H
#include "engine_cylindermultigrid.h" #include "FDTD/engine_cylindermultigrid.h"
#include "engine_extension.h" #include "engine_extension.h"
#include "operator_cylindermultigrid.h" #include "FDTD/operator_cylindermultigrid.h"
class Operator_Ext_CylinderMultiGrid; class Operator_Ext_CylinderMultiGrid;

View File

@ -17,8 +17,7 @@
#include "engine_ext_dispersive.h" #include "engine_ext_dispersive.h"
#include "operator_ext_dispersive.h" #include "operator_ext_dispersive.h"
#include "engine.h" #include "FDTD/engine_sse.h"
#include "engine_sse.h"
Engine_Ext_Dispersive::Engine_Ext_Dispersive(Operator_Ext_Dispersive* op_ext_disp) : Engine_Extension(op_ext_disp) Engine_Ext_Dispersive::Engine_Ext_Dispersive(Operator_Ext_Dispersive* op_ext_disp) : Engine_Extension(op_ext_disp)
{ {

View File

@ -19,8 +19,8 @@
#define ENGINE_EXT_DISPERSIVE_H #define ENGINE_EXT_DISPERSIVE_H
#include "engine_extension.h" #include "engine_extension.h"
#include "engine.h" #include "FDTD/engine.h"
#include "operator.h" #include "FDTD/operator.h"
class Operator_Ext_Dispersive; class Operator_Ext_Dispersive;

View File

@ -17,8 +17,7 @@
#include "engine_ext_lorentzmaterial.h" #include "engine_ext_lorentzmaterial.h"
#include "operator_ext_lorentzmaterial.h" #include "operator_ext_lorentzmaterial.h"
#include "engine.h" #include "FDTD/engine_sse.h"
#include "engine_sse.h"
Engine_Ext_LorentzMaterial::Engine_Ext_LorentzMaterial(Operator_Ext_LorentzMaterial* op_ext_lorentz) : Engine_Ext_Dispersive(op_ext_lorentz) Engine_Ext_LorentzMaterial::Engine_Ext_LorentzMaterial(Operator_Ext_LorentzMaterial* op_ext_lorentz) : Engine_Ext_Dispersive(op_ext_lorentz)
{ {

View File

@ -17,8 +17,8 @@
#include "engine_ext_mur_abc.h" #include "engine_ext_mur_abc.h"
#include "operator_ext_mur_abc.h" #include "operator_ext_mur_abc.h"
#include "engine.h" #include "FDTD/engine.h"
#include "engine_sse.h" #include "FDTD/engine_sse.h"
#include "tools/array_ops.h" #include "tools/array_ops.h"
#include "tools/useful.h" #include "tools/useful.h"

View File

@ -19,8 +19,8 @@
#define ENGINE_EXT_MUR_ABC_H #define ENGINE_EXT_MUR_ABC_H
#include "engine_extension.h" #include "engine_extension.h"
#include "engine.h" #include "FDTD/engine.h"
#include "operator.h" #include "FDTD/operator.h"
class Operator_Ext_Mur_ABC; class Operator_Ext_Mur_ABC;

View File

@ -17,8 +17,7 @@
#include "engine_ext_pml_sf.h" #include "engine_ext_pml_sf.h"
#include "operator_ext_pml_sf.h" #include "operator_ext_pml_sf.h"
#include "engine.h" #include "FDTD/engine_sse.h"
#include "engine_sse.h"
#include "tools/array_ops.h" #include "tools/array_ops.h"
/************************************************ Engine_Ext_PML_SF **************************************************************************/ /************************************************ Engine_Ext_PML_SF **************************************************************************/

View File

@ -19,8 +19,8 @@
#define ENGINE_EXT_PML_SF_H #define ENGINE_EXT_PML_SF_H
#include "engine_extension.h" #include "engine_extension.h"
#include "engine.h" #include "FDTD/engine.h"
#include "operator.h" #include "FDTD/operator.h"
class Operator_Ext_PML_SF; class Operator_Ext_PML_SF;
class Operator_Ext_PML_SF_Plane; class Operator_Ext_PML_SF_Plane;

View File

@ -17,8 +17,8 @@
#include "engine_ext_upml.h" #include "engine_ext_upml.h"
#include "operator_ext_upml.h" #include "operator_ext_upml.h"
#include "engine.h" #include "FDTD/engine.h"
#include "engine_sse.h" #include "FDTD/engine_sse.h"
#include "tools/array_ops.h" #include "tools/array_ops.h"
#include "tools/useful.h" #include "tools/useful.h"

View File

@ -19,8 +19,8 @@
#define ENGINE_EXT_UPML_H #define ENGINE_EXT_UPML_H
#include "engine_extension.h" #include "engine_extension.h"
#include "engine.h" #include "FDTD/engine.h"
#include "operator.h" #include "FDTD/operator.h"
class Operator_Ext_UPML; class Operator_Ext_UPML;

View File

@ -17,7 +17,7 @@
#include "engine_extension.h" #include "engine_extension.h"
#include "engine.h" #include "FDTD/engine.h"
Engine_Extension::Engine_Extension(Operator_Extension* op_ext) Engine_Extension::Engine_Extension(Operator_Extension* op_ext)
{ {

View File

@ -16,7 +16,7 @@
*/ */
#include "operator_ext_cylinder.h" #include "operator_ext_cylinder.h"
#include "operator_cylinder.h" #include "FDTD/operator_cylinder.h"
#include "engine_ext_cylinder.h" #include "engine_ext_cylinder.h"
Operator_Ext_Cylinder::Operator_Ext_Cylinder(Operator_Cylinder* op) : Operator_Extension(op) Operator_Ext_Cylinder::Operator_Ext_Cylinder(Operator_Cylinder* op) : Operator_Extension(op)

View File

@ -19,7 +19,7 @@
#define OPERATOR_EXT_CYLINDER_H #define OPERATOR_EXT_CYLINDER_H
#include "operator_extension.h" #include "operator_extension.h"
#include "operator.h" #include "FDTD/operator.h"
class Operator_Cylinder; class Operator_Cylinder;

View File

@ -18,7 +18,7 @@
#ifndef OPERATOR_EXT_DISPERSIVE_H #ifndef OPERATOR_EXT_DISPERSIVE_H
#define OPERATOR_EXT_DISPERSIVE_H #define OPERATOR_EXT_DISPERSIVE_H
#include "operator.h" //#include "operator.h"
#include "operator_extension.h" #include "operator_extension.h"
//! Abstract base class for all dispersive material models, based on an ADE (additional differential equation) //! Abstract base class for all dispersive material models, based on an ADE (additional differential equation)

View File

@ -18,7 +18,7 @@
#ifndef OPERATOR_EXT_LORENTZMATERIAL_H #ifndef OPERATOR_EXT_LORENTZMATERIAL_H
#define OPERATOR_EXT_LORENTZMATERIAL_H #define OPERATOR_EXT_LORENTZMATERIAL_H
#include "operator.h" #include "FDTD/operator.h"
#include "operator_ext_dispersive.h" #include "operator_ext_dispersive.h"
class Operator_Ext_LorentzMaterial : public Operator_Ext_Dispersive class Operator_Ext_LorentzMaterial : public Operator_Ext_Dispersive

View File

@ -18,7 +18,7 @@
#ifndef OPERATOR_EXT_MUR_ABC_H #ifndef OPERATOR_EXT_MUR_ABC_H
#define OPERATOR_EXT_MUR_ABC_H #define OPERATOR_EXT_MUR_ABC_H
#include "operator.h" #include "FDTD/operator.h"
#include "operator_extension.h" #include "operator_extension.h"
class Operator_Ext_Mur_ABC : public Operator_Extension class Operator_Ext_Mur_ABC : public Operator_Extension

View File

@ -17,7 +17,7 @@
#include "operator_ext_pml_sf.h" #include "operator_ext_pml_sf.h"
#include "engine_ext_pml_sf.h" #include "engine_ext_pml_sf.h"
#include "operator_cylinder.h" #include "FDTD/operator_cylinder.h"
#include "tools/array_ops.h" #include "tools/array_ops.h"
#include "fparser.hh" #include "fparser.hh"

View File

@ -18,8 +18,8 @@
#ifndef OPERATOR_EXT_PML_SF_H #ifndef OPERATOR_EXT_PML_SF_H
#define OPERATOR_EXT_PML_SF_H #define OPERATOR_EXT_PML_SF_H
#include "operator.h"
#include "operator_extension.h" #include "operator_extension.h"
#include "FDTD/operator.h"
class FunctionParser; class FunctionParser;

View File

@ -16,7 +16,7 @@
*/ */
#include "operator_ext_upml.h" #include "operator_ext_upml.h"
#include "operator_cylindermultigrid.h" #include "FDTD/operator_cylindermultigrid.h"
#include "engine_ext_upml.h" #include "engine_ext_upml.h"
#include "tools/array_ops.h" #include "tools/array_ops.h"
#include "fparser.hh" #include "fparser.hh"

View File

@ -18,7 +18,7 @@
#ifndef OPERATOR_EXT_UPML_H #ifndef OPERATOR_EXT_UPML_H
#define OPERATOR_EXT_UPML_H #define OPERATOR_EXT_UPML_H
#include "operator.h" #include "FDTD/operator.h"
#include "operator_extension.h" #include "operator_extension.h"
class FunctionParser; class FunctionParser;

View File

@ -16,8 +16,7 @@
*/ */
#include "operator_extension.h" #include "operator_extension.h"
#include "FDTD/operator.h"
#include "operator.h"
Operator_Extension::Operator_Extension(Operator* op) Operator_Extension::Operator_Extension(Operator* op)
{ {

View File

@ -18,7 +18,7 @@
#include <fstream> #include <fstream>
#include "operator.h" #include "operator.h"
#include "engine.h" #include "engine.h"
#include "operator_extension.h" #include "extensions/operator_extension.h"
#include "Common/processfields.h" #include "Common/processfields.h"
#include "tools/array_ops.h" #include "tools/array_ops.h"
#include "fparser.hh" #include "fparser.hh"

View File

@ -18,8 +18,8 @@
#include "engine.h" #include "engine.h"
#include "Common/processfields.h" #include "Common/processfields.h"
#include "operator_cylinder.h" #include "operator_cylinder.h"
#include "operator_extension.h" #include "extensions/operator_extension.h"
#include "operator_ext_cylinder.h" #include "extensions/operator_ext_cylinder.h"
Operator_Cylinder* Operator_Cylinder::New(unsigned int numThreads) Operator_Cylinder* Operator_Cylinder::New(unsigned int numThreads)
{ {

View File

@ -17,7 +17,7 @@
#include "operator_cylindermultigrid.h" #include "operator_cylindermultigrid.h"
#include "engine_cylindermultigrid.h" #include "engine_cylindermultigrid.h"
#include "operator_ext_cylinder.h" #include "extensions/operator_ext_cylinder.h"
#include "tools/useful.h" #include "tools/useful.h"
Operator_CylinderMultiGrid::Operator_CylinderMultiGrid(vector<double> Split_Radii) : Operator_Cylinder() Operator_CylinderMultiGrid::Operator_CylinderMultiGrid(vector<double> Split_Radii) : Operator_Cylinder()

View File

@ -44,6 +44,7 @@ win32 {
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\' QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\'
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../fparser\' QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../fparser\'
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../tinyxml\' QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../tinyxml\'
SOURCES += main.cpp \ SOURCES += main.cpp \
tools/ErrorMsg.cpp \ tools/ErrorMsg.cpp \
tools/AdrOp.cpp \ tools/AdrOp.cpp \
@ -55,30 +56,33 @@ SOURCES += main.cpp \
FDTD/operator_cylinder.cpp \ FDTD/operator_cylinder.cpp \
FDTD/engine_sse.cpp \ FDTD/engine_sse.cpp \
FDTD/operator_sse.cpp \ FDTD/operator_sse.cpp \
FDTD/operator_extension.cpp \
FDTD/engine_extension.cpp \
FDTD/engine_ext_mur_abc.cpp \
FDTD/operator_ext_mur_abc.cpp \
FDTD/excitation.cpp \
FDTD/operator_ext_cylinder.cpp \
FDTD/engine_ext_cylinder.cpp \
FDTD/operator_sse_compressed.cpp \ FDTD/operator_sse_compressed.cpp \
FDTD/engine_sse_compressed.cpp \ FDTD/engine_sse_compressed.cpp \
FDTD/operator_multithread.cpp \ FDTD/operator_multithread.cpp \
tools/global.cpp \ tools/global.cpp \
tools/useful.cpp \ tools/useful.cpp \
FDTD/operator_ext_dispersive.cpp \ FDTD/excitation.cpp \
FDTD/operator_ext_lorentzmaterial.cpp \
FDTD/engine_ext_dispersive.cpp \
FDTD/engine_ext_lorentzmaterial.cpp \
FDTD/operator_ext_pml_sf.cpp \
FDTD/engine_ext_pml_sf.cpp \
FDTD/operator_cylindermultigrid.cpp \ FDTD/operator_cylindermultigrid.cpp \
FDTD/engine_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 FDTD/engine_interface_fdtd.cpp
# FDTD/extensions source files
SOURCES += FDTD/extensions/engine_extension.cpp \
FDTD/extensions/operator_ext_dispersive.cpp \
FDTD/extensions/operator_ext_lorentzmaterial.cpp \
FDTD/extensions/engine_ext_dispersive.cpp \
FDTD/extensions/engine_ext_lorentzmaterial.cpp \
FDTD/extensions/operator_ext_pml_sf.cpp \
FDTD/extensions/engine_ext_pml_sf.cpp \
FDTD/extensions/engine_ext_cylindermultigrid.cpp \
FDTD/extensions/operator_ext_upml.cpp \
FDTD/extensions/engine_ext_upml.cpp \
FDTD/extensions/operator_extension.cpp \
FDTD/extensions/engine_ext_mur_abc.cpp \
FDTD/extensions/operator_ext_mur_abc.cpp \
FDTD/extensions/operator_ext_cylinder.cpp \
FDTD/extensions/engine_ext_cylinder.cpp
# Common source files # Common source files
SOURCES += Common/operator_base.cpp \ SOURCES += Common/operator_base.cpp \
Common/engine_interface_base.cpp \ Common/engine_interface_base.cpp \
@ -103,31 +107,34 @@ HEADERS += tools/ErrorMsg.h \
FDTD/operator_cylinder.h \ FDTD/operator_cylinder.h \
FDTD/engine_sse.h \ FDTD/engine_sse.h \
FDTD/operator_sse.h \ FDTD/operator_sse.h \
FDTD/operator_extension.h \
FDTD/engine_extension.h \
FDTD/engine_ext_mur_abc.h \
FDTD/operator_ext_mur_abc.h \
FDTD/excitation.h \ FDTD/excitation.h \
FDTD/operator_ext_cylinder.h \
FDTD/engine_ext_cylinder.h \
FDTD/operator_sse_compressed.h \ FDTD/operator_sse_compressed.h \
FDTD/engine_sse_compressed.h \ FDTD/engine_sse_compressed.h \
FDTD/operator_multithread.h \ FDTD/operator_multithread.h \
tools/global.h \ tools/global.h \
tools/useful.h \ tools/useful.h \
FDTD/operator_ext_dispersive.h \
FDTD/operator_ext_lorentzmaterial.h \
FDTD/engine_ext_dispersive.h \
FDTD/engine_ext_lorentzmaterial.h \
FDTD/operator_ext_pml_sf.h \
FDTD/engine_ext_pml_sf.h \
FDTD/operator_cylindermultigrid.h \ FDTD/operator_cylindermultigrid.h \
FDTD/engine_cylindermultigrid.h \ FDTD/engine_cylindermultigrid.h \
FDTD/engine_ext_cylindermultigrid.h \
tools/aligned_allocator.h \ tools/aligned_allocator.h \
FDTD/operator_ext_upml.h \ FDTD/engine_interface_fdtd.h
FDTD/engine_ext_upml.h \
FDTD/engine_interface_fdtd.h # FDTD/extensions header files
HEADERS += FDTD/operator_extension.h \
FDTD/extensions/engine_extension.h \
FDTD/extensions/engine_ext_mur_abc.h \
FDTD/extensions/operator_ext_mur_abc.h \
FDTD/extensions/operator_ext_cylinder.h \
FDTD/extensions/engine_ext_cylinder.h \
FDTD/extensions/operator_ext_dispersive.h \
FDTD/extensions/operator_ext_lorentzmaterial.h \
FDTD/extensions/engine_ext_dispersive.h \
FDTD/extensions/engine_ext_lorentzmaterial.h \
FDTD/extensions/operator_ext_pml_sf.h \
FDTD/extensions/engine_ext_pml_sf.h \
FDTD/extensions/engine_ext_cylindermultigrid.h \
FDTD/extensions/operator_ext_upml.h \
FDTD/extensions/engine_ext_upml.h
# Common header files # Common header files
HEADERS += Common/operator_base.h \ HEADERS += Common/operator_base.h \
Common/engine_interface_base.h \ Common/engine_interface_base.h \

View File

@ -22,9 +22,10 @@
#include "FDTD/operator_cylindermultigrid.h" #include "FDTD/operator_cylindermultigrid.h"
#include "FDTD/engine_multithread.h" #include "FDTD/engine_multithread.h"
#include "FDTD/operator_multithread.h" #include "FDTD/operator_multithread.h"
#include "FDTD/operator_ext_mur_abc.h" #include "FDTD/extensions/operator_ext_mur_abc.h"
#include "FDTD/operator_ext_pml_sf.h" #include "FDTD/extensions/operator_ext_pml_sf.h"
#include "FDTD/operator_ext_upml.h" #include "FDTD/extensions/operator_ext_upml.h"
#include "FDTD/extensions/operator_ext_lorentzmaterial.h"
#include "FDTD/engine_interface_fdtd.h" #include "FDTD/engine_interface_fdtd.h"
#include "Common/processvoltage.h" #include "Common/processvoltage.h"
#include "Common/processcurrent.h" #include "Common/processcurrent.h"
@ -37,8 +38,6 @@
#include <H5Cpp.h> // only for H5get_libversion() #include <H5Cpp.h> // only for H5get_libversion()
#include <boost/version.hpp> // only for BOOST_LIB_VERSION #include <boost/version.hpp> // only for BOOST_LIB_VERSION
#include "FDTD/operator_ext_lorentzmaterial.h"
//external libs //external libs
#include "tinyxml.h" #include "tinyxml.h"
#include "ContinuousStructure.h" #include "ContinuousStructure.h"