exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge /u/hjasak/foam-extend-3.1/ branch HrvojeJasak into nextRelease

Browse source 
http://sourceforge.net/p/openfoam-extend/foam-extend-3.1/merge-requests/108/
This commit is contained in:
Hrvoje Jasak 2015-09-13 13:06:25 +00:00
commit 93c0efd29a
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
etc/bashrc.mingw
View file

@ -26,7 +26,8 @@
# etc/bashrc.mingw # etc/bashrc.mingw
# #
# Description # 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. # Calls the main etc/bashrc script.
# Sourced from ~/.profile or ~/.bashrc # Sourced from ~/.profile or ~/.bashrc
# #
@ -62,11 +63,12 @@ add_to_path() {
export PATH=$SUBVERSION_HOME/bin:$PATH export PATH=$SUBVERSION_HOME/bin:$PATH
export PATH=$GIT_HOME/cmd:$PATH export PATH=$GIT_HOME/cmd:$PATH
#export PATH=$PERL_HOME/bin:$PATH #export PATH=$PERL_HOME/bin:$PATH
export PATH=$PARAVIEW_HOME/bin:$PATH
export PATH=$CMAKE_HOME/bin:$PATH export PATH=$CMAKE_HOME/bin:$PATH
export PATH=$MPI_ROOTDIR/bin:$PATH
export PATH=$PEXPORTS_HOME/bin:$PATH export PATH=$PEXPORTS_HOME/bin:$PATH
export PATH=$MINGW_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
} }
# }}} # }}}

12
src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C
View file

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