zcy
/
openEMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

silenced some warnings; reformatted pro-file

pull/1/head
Sebastian Held 2012-06-17 20:29:31 +02:00
parent 6390b11e53
commit bd28d77e3b
9 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FDTD/extensions/operator_ext_conductingsheet.h
View File

@ -36,7 +36,7 @@ public:
virtual bool BuildExtension(); virtual bool BuildExtension();
virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;} virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {UNUSED(closedAlpha); UNUSED(R0_included); return true;}
virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;} virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;}
virtual string GetExtensionName() const {return string("Conducting Sheet Extension");} virtual string GetExtensionName() const {return string("Conducting Sheet Extension");}

2
FDTD/extensions/operator_ext_cylinder.h
View File

@ -35,7 +35,7 @@ public:
virtual Engine_Extension* CreateEngineExtention(); virtual Engine_Extension* CreateEngineExtention();
virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;} virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {UNUSED(closedAlpha); UNUSED(R0_included); return true;}
virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;} virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;}
virtual std::string GetExtensionName() const {return std::string("Extension for the Cylinder-Coords Operator");} virtual std::string GetExtensionName() const {return std::string("Extension for the Cylinder-Coords Operator");}

2
FDTD/extensions/operator_ext_excitation.h
View File

@ -36,7 +36,7 @@ public:
virtual Engine_Extension* CreateEngineExtention(); virtual Engine_Extension* CreateEngineExtention();
virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;} virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {UNUSED(closedAlpha); UNUSED(R0_included); return true;}
virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;} virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;}
virtual string GetExtensionName() const {return string("Excitation Extension");} virtual string GetExtensionName() const {return string("Excitation Extension");}

2
FDTD/extensions/operator_ext_lorentzmaterial.h
View File

@ -34,7 +34,7 @@ public:
virtual Engine_Extension* CreateEngineExtention(); virtual Engine_Extension* CreateEngineExtention();
virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;} virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {UNUSED(closedAlpha); UNUSED(R0_included); return true;}
virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;} virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return true;}
virtual string GetExtensionName() const {return string("Drude/Lorentz Dispersive Material Extension");} virtual string GetExtensionName() const {return string("Drude/Lorentz Dispersive Material Extension");}

3
FDTD/extensions/operator_ext_pml_sf.cpp
View File

@ -398,6 +398,9 @@ Engine_Extension* Operator_Ext_PML_SF_Plane::CreateEngineExtention()
bool Operator_Ext_PML_SF_Plane::IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const bool Operator_Ext_PML_SF_Plane::IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const
{ {
UNUSED(closedAlpha);
UNUSED(R0_included);
if (m_ny==2) if (m_ny==2)
{ {
Operator_Cylinder* op_cyl = dynamic_cast<Operator_Cylinder*>(m_Op); Operator_Cylinder* op_cyl = dynamic_cast<Operator_Cylinder*>(m_Op);

2
FDTD/extensions/operator_ext_upml.h
View File

@ -36,7 +36,7 @@ public:
virtual ~Operator_Ext_UPML(); virtual ~Operator_Ext_UPML();
//! Returns always true, Create_UPML method will take care of creating a valid pml for the cylindrical fdtd //! Returns always true, Create_UPML method will take care of creating a valid pml for the cylindrical fdtd
virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return true;} virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const { UNUSED(closedAlpha); UNUSED(R0_included); return true;}
//! Returns always true if base grid, Create_UPML will create proper child pml extensions. //! Returns always true if base grid, Create_UPML will create proper child pml extensions.
virtual bool IsCylindricalMultiGridSave(bool child) const {if (child) return false; return true;} virtual bool IsCylindricalMultiGridSave(bool child) const {if (child) return false; return true;}

4
FDTD/extensions/operator_extension.h
View File

@ -44,14 +44,14 @@ public:
Create a clone of this extension, will return NULL if this is impossible (e.g. derived extension has no clone method and copy-constructor)... Create a clone of this extension, will return NULL if this is impossible (e.g. derived extension has no clone method and copy-constructor)...
BuildExtension has to be called separatly! BuildExtension has to be called separatly!
*/ */
virtual Operator_Extension* Clone(Operator* op) {return NULL;} virtual Operator_Extension* Clone(Operator* op) {UNUSED(op); return NULL;}
virtual bool BuildExtension() {return true;} virtual bool BuildExtension() {return true;}
virtual Engine_Extension* CreateEngineExtention() {return 0;} virtual Engine_Extension* CreateEngineExtention() {return 0;}
//! The cylindrical operator will check whether the extension is save to use. Default is false. Derive this method to override. //! The cylindrical operator will check whether the extension is save to use. Default is false. Derive this method to override.
virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {return false;} virtual bool IsCylinderCoordsSave(bool closedAlpha, bool R0_included) const {UNUSED(closedAlpha); UNUSED(R0_included); return false;}
//! The cylindrical multi grid operator will check whether the extension is save to use. Default is false. Derive this method to override. //! The cylindrical multi grid operator will check whether the extension is save to use. Default is false. Derive this method to override.
virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return false;} virtual bool IsCylindricalMultiGridSave(bool child) const {UNUSED(child); return false;}

2
main.cpp
View File

@ -46,7 +46,7 @@ int main(int argc, char *argv[])
openEMS FDTD; openEMS FDTD;
#endif #endif
#ifdef _LP64 || _WIN64 #if defined(_LP64) || defined(_WIN64)
string bits = "64bit"; string bits = "64bit";
#else #else
string bits = "32bit"; string bits = "32bit";

68
openEMS.pro
View File

@ -6,8 +6,7 @@ CONFIG -= app_bundle qt
TEMPLATE = app TEMPLATE = app
OBJECTS_DIR = obj OBJECTS_DIR = obj
INCLUDEPATH += . INCLUDEPATH += .
INCLUDEPATH += ../CSXCAD \ INCLUDEPATH += ../CSXCAD ../fparser
../fparser
CONFIG += debug_and_release CONFIG += debug_and_release
@ -51,8 +50,8 @@ win32 {
# vtk # vtk
INCLUDEPATH += $$WIN32_LIB_ROOT/vtk \ INCLUDEPATH += $$WIN32_LIB_ROOT/vtk \
$$WIN32_LIB_ROOT/vtk/Common \ $$WIN32_LIB_ROOT/vtk/Common \
$$WIN32_LIB_ROOT/vtk/Filtering \ $$WIN32_LIB_ROOT/vtk/Filtering \
$$WIN32_LIB_ROOT/vtk/IO $$WIN32_LIB_ROOT/vtk/IO
LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering
} }
!win32 { !win32 {
@ -61,7 +60,7 @@ win32 {
LIBS += -L../CSXCAD -lCSXCAD LIBS += -L../CSXCAD -lCSXCAD
LIBS += -lboost_thread-mt LIBS += -lboost_thread-mt
LIBS += -lhdf5 -lhdf5_cpp LIBS += -lhdf5 -lhdf5_cpp
### vtk ### ### vtk ###
INCLUDEPATH += /usr/include/vtk-5.2 \ INCLUDEPATH += /usr/include/vtk-5.2 \
/usr/include/vtk-5.4 \ /usr/include/vtk-5.4 \
/usr/include/vtk-5.6 \ /usr/include/vtk-5.6 \
@ -71,11 +70,14 @@ win32 {
INCLUDEPATH += /usr/include/CSXCAD INCLUDEPATH += /usr/include/CSXCAD
LIBS += -lvtkCommon \ LIBS += -lvtkCommon \
-lvtkIO \ -lvtkIO \
-lvtksys \ -lvtksys \
-lvtkFiltering -lvtkFiltering
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\'
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../fparser\'
} }
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\'
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../fparser\' # vtk includes deprecated header files; silence the corresponding warning
QMAKE_CXXFLAGS += -Wno-deprecated
# hdf5 compat # hdf5 compat
DEFINES += H5_USE_16_API DEFINES += H5_USE_16_API
@ -99,9 +101,9 @@ SOURCES += FDTD/engine.cpp \
FDTD/excitation.cpp \ FDTD/excitation.cpp \
FDTD/operator_cylindermultigrid.cpp \ FDTD/operator_cylindermultigrid.cpp \
FDTD/engine_cylindermultigrid.cpp \ FDTD/engine_cylindermultigrid.cpp \
FDTD/engine_interface_fdtd.cpp \ FDTD/engine_interface_fdtd.cpp \
FDTD/engine_interface_sse_fdtd.cpp \ FDTD/engine_interface_sse_fdtd.cpp \
FDTD/engine_interface_cylindrical_fdtd.cpp FDTD/engine_interface_cylindrical_fdtd.cpp
# FDTD/extensions source files # FDTD/extensions source files
SOURCES += FDTD/extensions/engine_extension.cpp \ SOURCES += FDTD/extensions/engine_extension.cpp \
@ -138,13 +140,13 @@ SOURCES += Common/operator_base.cpp \
Common/processfields_sar.cpp Common/processfields_sar.cpp
# tools # tools
SOURCES += tools/global.cpp \ SOURCES += tools/global.cpp \
tools/useful.cpp \ tools/useful.cpp \
tools/array_ops.cpp \ tools/array_ops.cpp \
tools/ErrorMsg.cpp \ tools/ErrorMsg.cpp \
tools/AdrOp.cpp \ tools/AdrOp.cpp \
tools/vtk_file_writer.cpp \ tools/vtk_file_writer.cpp \
tools/hdf5_file_writer.cpp tools/hdf5_file_writer.cpp
#### HEADERS ################################################################ #### HEADERS ################################################################
HEADERS += openems.h HEADERS += openems.h
@ -204,24 +206,20 @@ HEADERS += Common/operator_base.h \
# tools # tools
HEADERS += tools/ErrorMsg.h \ HEADERS += tools/ErrorMsg.h \
tools/AdrOp.h \ tools/AdrOp.h \
tools/constants.h \ tools/constants.h \
tools/array_ops.h \ tools/array_ops.h \
tools/global.h \ tools/global.h \
tools/useful.h \ tools/useful.h \
tools/aligned_allocator.h \ tools/aligned_allocator.h \
tools/vtk_file_writer.h \ tools/vtk_file_writer.h \
tools/hdf5_file_writer.h tools/hdf5_file_writer.h
!packaging { !packaging {
# if packaging is not set in CONFIG, set some default flags # if packaging is not set in CONFIG, set some default flags
# if packaging is enabled, give the flags on the qmake comandline # if packaging is enabled, give the flags on the qmake comandline
QMAKE_CXXFLAGS_RELEASE = -O3 \ QMAKE_CXXFLAGS_RELEASE = -O3 -g -march=native
-g \ QMAKE_CXXFLAGS_DEBUG = -O0 -g -march=native
-march=native
QMAKE_CXXFLAGS_DEBUG = -O0 \
-g \
-march=native
} }
MPI_SUPPORT { MPI_SUPPORT {