Commit 400ca6bc authored by Knut's avatar Knut

Merge remote-tracking branch 'origin/master' into output

parents cdae0cb9 600f277a
......@@ -62,7 +62,7 @@ a4.dvi: a4.tex $(TEXSRC) $(PROTEXSRC)
html: a4.dvi
mkdir -p html
latex2html -dir html a4.tex
latex2html -dir html a4.tex -local_icons
# Generate the protex dependend latex files (from the source code)
$(PROTEXSRC):
......
......@@ -779,7 +779,7 @@
!-----------------------------------------------------------------------
!BOP
!
! !IROUTINE: REALTYPE function adv_interfacial_reconstruction -
! !IROUTINE: adv_interfacial_reconstruction -
!
! !INTERFACE:
REALTYPE function adv_interfacial_reconstruction(scheme,cfl,fuu,fu,fd)
......@@ -848,7 +848,7 @@
!-----------------------------------------------------------------------
!BOP
!
! !IROUTINE: REALTYPE function adv_interfacial_reconstruction_p2 -
! !IROUTINE: adv_interfacial_reconstruction_p2 -
!
! !INTERFACE:
REALTYPE function adv_interfacial_reconstruction_p2(cfl,fu,deltafu,deltaf)
......@@ -883,7 +883,7 @@
#ifdef _POINTER_REMAP_
!BOP
!
! !IROUTINE: LOGICAL function test_pointer_remap
! !IROUTINE: test_pointer_remap -
!
! !INTERFACE:
logical function test_pointer_remap()
......
......@@ -153,6 +153,17 @@ if(WIN32)
list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..")
list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH2;Path]")
list(APPEND _MPI_PREFIX_PATH "$ENV{ProgramW6432}/MPICH2/")
# We first attempt to locate the msmpi.lib. Should be find it, we'll assume that the MPI present is indeed
# Microsoft MPI.
if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
set(MPI_MSMPI_LIB_PATH "$ENV{MSMPI_LIB64}")
set(MPI_MSMPI_INC_PATH_EXTRA "$ENV{MSMPI_INC}/x64")
else()
set(MPI_MSMPI_LIB_PATH "$ENV{MSMPI_LIB32}")
set(MPI_MSMPI_INC_PATH_EXTRA "$ENV{MSMPI_INC}/x86")
endif()
list(APPEND _MPI_PREFIX_PATH "$ENV{MSMPI_INC}/")
list(APPEND _MPI_PREFIX_PATH "${MPI_MSMPI_LIB_PATH}/")
endif()
# Build a list of prefixes to search for MPI.
......@@ -403,6 +414,7 @@ function (interrogate_mpi_compiler lang try_libs)
set(MPI_INCLUDE_PATH_WORK ${MPI_HEADER_PATH})
# Decide between 32-bit and 64-bit libraries for Microsoft's MPI
# This is for MS-MPI pre version 8 (which changed the architecture strings - but that's handled through MPI_MSMPI_INC_PATH_EXTRA)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
set(MS_MPI_ARCH_DIR amd64)
else()
......@@ -410,7 +422,11 @@ function (interrogate_mpi_compiler lang try_libs)
endif()
# Recent versions of MS-MPI also store a header file in architecture-specific subdirectory.
list(APPEND MPI_INCLUDE_PATH_WORK ${MPI_HEADER_PATH}/${MS_MPI_ARCH_DIR})
if(EXISTS "${MPI_MSMPI_INC_PATH_EXTRA}/mpifptr.h")
list(APPEND MPI_INCLUDE_PATH_WORK "${MPI_MSMPI_INC_PATH_EXTRA}")
elseif(EXISTS ${MPI_HEADER_PATH}/${MS_MPI_ARCH_DIR})
list(APPEND MPI_INCLUDE_PATH_WORK ${MPI_HEADER_PATH}/${MS_MPI_ARCH_DIR})
endif()
set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
find_library(MPI_LIB
......
......@@ -2,7 +2,7 @@
!-----------------------------------------------------------------------
!BOP
!
! !ROUTINE: REALTYPE function pos() - ....
! !ROUTINE: pos() -
!
! !INTERFACE:
REALTYPE function pos(a)
......
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