Merge branch 'nextRelease' into nr/testHarness_subProjects

ThirdParty/mingwBuild/build.sh

@@ -221,9 +221,9 @@ build_library() {
             export EXTRA_SYSTEM_HOME=
             ;;
 
-        scotch_6.0.0)
+        scotch_6.0.4)
             export PTHREADS_HOME=$BUILD_DIR/pthreads-w32-2-9-1-release
-            download $PACKAGE.tar.gz https://gforge.inria.fr/frs/download.php/31831 > $LOG_FILE 2>&1
+            download $PACKAGE.tar.gz https://gforge.inria.fr/frs/download.php/34618 > $LOG_FILE 2>&1
             extract "$PACKAGE.tar.gz" gzip >> $LOG_FILE 2>&1
             patch $PACKAGE
             cd $PACKAGE/src
@@ -263,7 +263,7 @@ build_libraries() {
     build_library metis-5.1.0
     build_library parmetis-4.0.3
     build_library ParMGridGen-1.0
-    build_library scotch_6.0.0
+    build_library scotch_6.0.4
     build_library mesquite-2.1.2
 }
 

ThirdParty/mingwBuild/x64/patches/scotch_6.0.4/src/Makefile.inc

@@ -0,0 +1,70 @@
+# This make include file is intended for building under MinGW32. As is,
+# it relies on :
+#   - pthread-win32 (http://sourceware.org/pthreads-win32/),
+#   - zlib (http://www.zlib.net/)
+#   - mpich2 (http://www.mcs.anl.gov/research/projects/mpich2/).
+# It must be adapted to reflect your environment, in particular
+# installation root directories, include path and library name.
+# Since all files are linked with the MPI libraries, this file is
+# for compiling PT-Scotch only. To compile Scotch, remove the
+# -DSCOTCH_PTSCOTCH flag, as well as all references to MPI in the
+# CFLAGS and CLIBFLAGS	=
+#LDFLAGS variables.
+
+#MPI_ROOTDIR		= /c/Programs/OpenMPI_v1.6.1-x64
+
+EXE			=
+LIB			= .a
+OBJ			= .o
+
+MAKE			= make
+AR			= ar
+ARFLAGS			= -ruv
+CAT			= cat
+CCS			= gcc
+CCP			= mpicc
+CCD			= mpicc -I$(MPI_ROOTDIR)/include
+
+#--- Compiler/loader flags
+CFLAGS_CPL		= -O0 -g3 --std=c99
+CFLAGS_INC		=
+CFLAGS_DEF		= -DCOMMON_RANDOM_FIXED_SEED -DCOMMON_STUB_FORK -DSCOTCH_PTSCOTCH -DSCOTCH_RENAME -D'pipe(pfds)=_pipe(pfds,1024,0x8000)' -DHAVE_STDINT_H=0 -DHAVE_UINT_T=1
+CLIBFLAGS	=
+LDFLAGS   		=
+
+PGMFILES=$(PROGRAMFILES)
+
+#--- MPI
+CFLAGS_INC	+= -I$(MPI_ROOTDIR)/include
+#--- Comment/Uncomment for threaded MPI
+CLIBFLAGS	=
+LDFLAGS    	+= -L$(MPI_ROOTDIR)/bin -lm -lmpi -lmpid
+#CLIBFLAGS	=
+#LDFLAGS    	+= -L$(MPI_ROOTDIR)/lib -lm -lmpich2mt
+
+#--- Pthread : Uncomment for pthread support
+#PTHREAD_ROOTDIR		= $(PGMFILES)/pthread-win32
+#CFLAGS_INC		+= -I$(PTHREAD_ROOTDIR)/include
+#CLIBFLAGS	=
+LDFLAGS		+= -L$(PTHREADS_HOME)/Pre-built.2/lib/x64 -lpthreadGC2
+
+#--- zlib: Uncomment for compressed files
+#ZLIB_ROOTDIR		= $(PGMFILES)/zlib-1.2.3
+#CFLAGS_INC	+= -I$(ZLIB_ROOTDIR)/include
+#CLIBFLAGS	=
+LDFLAGS	+= -lz
+
+#--- COMMON_PTHREAD: Uncomment for compressed files
+#CFLAGS_DEF	+= -DCOMMON_PTHREAD -DCOMMON_FILE_COMPRESS_GZ
+
+#--- SCOTCH_PTHREAD: Uncomment for threaded MPI
+#CFLAGS_DEF	+= -DSCOTCH_PTHREAD
+
+CFLAGS		= $(CFLAGS_CPL) $(CFLAGS_INC) $(CFLAGS_DEF)
+CP			= cp
+LEX			= flex -Pscotchyy -olex.yy.c
+LN			= cp
+MKDIR			= mkdir
+MV			= mv
+RANLIB			= ranlib
+YACC			= bison -pscotchyy -y -b y

etc/bashrc.mingw

@@ -26,7 +26,8 @@
 #     etc/bashrc.mingw
 #
 # Description
-#     Startup file for FOAM for use with MSYS shell for MinGW-based builds on Windows.
+#     Startup file for FOAM for use with MSYS shell for MinGW-based build
+#     on Microsoft Windows 7 and 8.1.
 #     Calls the main etc/bashrc script.
 #     Sourced from ~/.profile or ~/.bashrc
 #
@@ -62,11 +63,12 @@ add_to_path() {
     export PATH=$SUBVERSION_HOME/bin:$PATH
     export PATH=$GIT_HOME/cmd:$PATH
     #export PATH=$PERL_HOME/bin:$PATH
+    export PATH=$PARAVIEW_HOME/bin:$PATH
     export PATH=$CMAKE_HOME/bin:$PATH
-    export PATH=$MPI_ROOTDIR/bin:$PATH
     export PATH=$PEXPORTS_HOME/bin:$PATH
     export PATH=$MINGW_HOME/bin:$PATH
-    export PATH=$PARAVIEW_HOME/bin:$PATH
+#   MPI comes last to enforce the path
+    export PATH=$MPI_ROOTDIR/bin:$PATH
 }
 # }}}
 

src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C

@@ -195,7 +195,8 @@ void Foam::ggiPolyPatch::calcPatchToPatch() const
         if (debug)
         {
             InfoIn("void ggiPolyPatch::calcPatchToPatch() const")
-                << "Calculating patch to patch interpolation" << endl;
+                << "Calculating patch to patch interpolation for patch"
+                << name() << endl;
         }
 
         // Create interpolation for zones
@@ -258,6 +259,13 @@ void Foam::ggiPolyPatch::calcReconFaceCellCentres() const
             << abort(FatalError);
     }
 
+    if (debug)
+    {
+        InfoIn("void ggiPolyPatch::calcReconFaceCellCentres() const")
+            << "Calculating recon centres for patch"
+            << name() << endl;
+    }
+
     // Create neighbouring face centres using interpolation
     if (master())
     {
@@ -366,7 +374,7 @@ void Foam::ggiPolyPatch::calcSendReceive() const
     if (debug)
     {
         Pout<< "ggiPolyPatch::calcSendReceive() const for patch "
-            << index() << endl;
+            << name() << endl;
     }
 
     if (!Pstream::parRun())