Commit 11fee16f authored by Ruben Undheim's avatar Ruben Undheim

Rebase patches

parent fa69a08d
......@@ -139,7 +139,7 @@ index 9482dde..8eea1e8 100644
}
diff --git a/openEMS/Common/processmodematch.cpp b/openEMS/Common/processmodematch.cpp
index 620257d..7cd22f8 100644
index 85d2d58..851912d 100644
--- a/openEMS/Common/processmodematch.cpp
+++ b/openEMS/Common/processmodematch.cpp
@@ -123,7 +123,7 @@ void ProcessModeMatch::InitProcess()
......@@ -165,7 +165,7 @@ index fc46d85..d64c21c 100644
return false;
}
diff --git a/openEMS/FDTD/operator.cpp b/openEMS/FDTD/operator.cpp
index a7582aa..2dec2d3 100644
index 259b1fb..54d4aad 100644
--- a/openEMS/FDTD/operator.cpp
+++ b/openEMS/FDTD/operator.cpp
@@ -450,7 +450,7 @@ Grid_Path Operator::FindPath(double start[], double stop[])
......@@ -179,7 +179,7 @@ index a7582aa..2dec2d3 100644
{
@@ -1397,7 +1397,7 @@ bool Operator::AverageMatCellCenter(int ny, const unsigned int* pos, double* Eff
for (int n=0; n<4; ++n)
if (isnan(EffMat[n]) || isinf(EffMat[n]))
if (std::isnan(EffMat[n]) || std::isinf(EffMat[n]))
{
- cerr << "Operator::" << __func__ << ": Error, an effective material parameter is not a valid result, this should NOT have happend... exit..." << endl;
+ cerr << "Operator::" << __func__ << ": Error, an effective material parameter is not a valid result, this should NOT have happened... exit..." << endl;
......@@ -188,7 +188,7 @@ index a7582aa..2dec2d3 100644
}
@@ -1510,7 +1510,7 @@ bool Operator::AverageMatQuarterCell(int ny, const unsigned int* pos, double* Ef
for (int n=0; n<4; ++n)
if (isnan(EffMat[n]) || isinf(EffMat[n]))
if (std::isnan(EffMat[n]) || std::isinf(EffMat[n]))
{
- cerr << "Operator::" << __func__ << ": Error, An effective material parameter is not a valid result, this should NOT have happend... exit..." << endl;
+ cerr << "Operator::" << __func__ << ": Error, An effective material parameter is not a valid result, this should NOT have happened... exit..." << endl;
......
......@@ -24,7 +24,7 @@ index 9d516d5..d7670c1 100644
ADD_DEFINITIONS( -DH5_USE_16_API )
diff --git a/openEMS/CMakeLists.txt b/openEMS/CMakeLists.txt
index 898f280..5504590 100644
index 3325abb..e0a143a 100644
--- a/openEMS/CMakeLists.txt
+++ b/openEMS/CMakeLists.txt
@@ -108,7 +108,7 @@ find_package(TinyXML REQUIRED)
......
......@@ -20,10 +20,10 @@ index d5a72c9..2d4b11b 100644
#
diff --git a/openEMS/CMakeLists.txt b/openEMS/CMakeLists.txt
index 5504590..794a498 100644
index e0a143a..c98449b 100644
--- a/openEMS/CMakeLists.txt
+++ b/openEMS/CMakeLists.txt
@@ -184,6 +184,7 @@ TARGET_LINK_LIBRARIES( openEMS
@@ -176,6 +176,7 @@ TARGET_LINK_LIBRARIES( openEMS
${Boost_LIBRARIES}
${vtk_LIBS}
${MPI_LIBRARIES}
......
From: =?utf-8?q?Stefan_Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Tue, 27 Mar 2018 02:28:22 +0200
Subject: Guard xmmintrin.h include so it is only used when necessary
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
The x86/SSE specific code for Flush-To-Zero is only used when
SSE_CORRECT_DENORMALS is not defined. Guarding the include allows the
code to compile on e.g. ARM.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
---
openEMS/FDTD/engine_multithread.cpp | 3 +++
openEMS/FDTD/engine_sse.cpp | 3 +++
2 files changed, 6 insertions(+)
diff --git a/openEMS/FDTD/engine_multithread.cpp b/openEMS/FDTD/engine_multithread.cpp
index 7370198..7ebe0d7 100644
--- a/openEMS/FDTD/engine_multithread.cpp
+++ b/openEMS/FDTD/engine_multithread.cpp
@@ -32,7 +32,10 @@
#include "boost/date_time/posix_time/posix_time.hpp"
#include "boost/date_time/gregorian/gregorian.hpp"
#include <iomanip>
+
+#ifndef SSE_CORRECT_DENORMALS
#include <xmmintrin.h>
+#endif
//! \brief construct an Engine_Multithread instance
//! it's the responsibility of the caller to free the returned pointer
diff --git a/openEMS/FDTD/engine_sse.cpp b/openEMS/FDTD/engine_sse.cpp
index 660e6d6..2e06685 100644
--- a/openEMS/FDTD/engine_sse.cpp
+++ b/openEMS/FDTD/engine_sse.cpp
@@ -15,7 +15,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef SSE_CORRECT_DENORMALS
#include <xmmintrin.h>
+#endif
+
#include "engine_sse.h"
//! \brief construct an Engine_sse instance
......@@ -4,4 +4,3 @@
0004-link-more.patch
0005-Deletede-CVS-dir-lintian.patch
0006-Don-t-exit-from-library.patch
0007-Guard-xmmintrin.h-include-so-it-is-only-used-when-ne.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment