Changeset 62f19a

Timestamp:

Sep 11, 2011, 4:17:52 PM (14 years ago)

Author:

Michael Hofmann <michael.hofmann@…>

Children:

c2f74f

Parents:

d0b958

Message:

vmg: minor fixes

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@942 5161e1c8-67bf-11de-9fd5-51895aff932f

Files:

• configure.ac (modified) (3 diffs)
• src/base/helper.hpp (modified) (1 diff)
• src/base/index.hpp (modified) (1 diff)

configure.ac

@@ -30 +30 @@
 AM_MISSING_PROG([DOXYGEN], [doxygen])
 
+# Get the C MPI compiler, because the following AC_FC_WRAPPERS macro works better if CC is from the same "family" as FC (which is MPI).
+AX_PROG_CC_MPI(,,AC_MSG_FAILURE([The VMG solver requires an MPI C compiler.]))
+
 # Do not even look for a non-MPI C++ compiler if MPICXX is set.
 AX_PROG_CXX_MPI(,[AC_DEFINE([HAVE_MPI], [1],
@@ -41 +44 @@
 AC_LANG_PUSH([Fortran])
 # Do not even look for a non-MPI Fortran compiler if MPIFC is set.
-AX_PROG_FC_MPI(,,AC_MSG_FAILURE([The PP3MG solver requires an MPI Fortran compiler.]))
+AX_PROG_FC_MPI(,,AC_MSG_FAILURE([The VMG solver requires an MPI Fortran compiler.]))
 
 # Find out how to call Fortran functions from C.
@@ -47 +50 @@
 AC_LANG_POP([Fortran])
 
+# Check for the restrict keyword.
+AC_C_RESTRICT
 
 AM_OPTIONS_VTK

src/base/helper.hpp

@@ -105 +105 @@
 
   inline void MdM(int nn, vmg_float u,
-                  vmg_float * __restrict__ tbl, vmg_float * __restrict__ dtbl)
+                  vmg_float * restrict tbl, vmg_float * restrict dtbl)
   {
     int i, n, m;

src/base/index.hpp

@@ -46 +46 @@
 
   const Index Abs() {return Index(abs(i[0]), abs(i[1]), abs(i[2]));}
-  int Length() const {return sqrt(i[0]*i[0]+i[1]*i[1]+i[2]*i[2]);}
+  int Length() const {return sqrt(double(i[0]*i[0]+i[1]*i[1]+i[2]*i[2]));}
   int Max() const {return std::max(std::max(i[0],i[1]),i[2]);}
   int Min() const {return std::min(std::min(i[0],i[1]),i[2]);}