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

Compilation tweaks for mingw

Browse source
This commit is contained in:
Dominik Christ 2015-08-04 13:39:06 +01:00
parent 0d734cb9c0
commit 7367164292
32 changed files with 820 additions and 833 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ThirdParty/mingwBuild/configure_OpenMPI.sh vendored
View file

@ -64,4 +64,3 @@ else
cd $current_dir cd $current_dir
echo "Exported libraries left in directory /tmp/$tmp" echo "Exported libraries left in directory /tmp/$tmp"
fi fi

1
ThirdParty/mingwBuild/x64/patches/pthreads-w32-2-9-1-release/Pre-built.2/include/sched.h vendored
View file

@ -180,4 +180,3 @@ PTW32_DLLPORT int __cdecl sched_getscheduler (pid_t pid);
#undef PTW32_SCHED_LEVEL_MAX #undef PTW32_SCHED_LEVEL_MAX
#endif /* !_SCHED_H */ #endif /* !_SCHED_H */

12
etc/bashrc.mingw
View file

@ -47,9 +47,9 @@ set_system_paths() {
export PARAVIEW_HOME=$PROGRAMS_HOME/ParaView-4.3.1 export PARAVIEW_HOME=$PROGRAMS_HOME/ParaView-4.3.1
#export PERL_HOME=$PROGRAMS_HOME/strawberry-perl-5.20.2.1-64bit/perl #export PERL_HOME=$PROGRAMS_HOME/strawberry-perl-5.20.2.1-64bit/perl
export PEXPORTS_HOME=$PROGRAMS_HOME/pexports export PEXPORTS_HOME=$PROGRAMS_HOME/pexports
export PYTHON_HOME=$PROGRAMS_HOME/Python27 #export PYTHON_HOME=$PROGRAMS_HOME/Python27
export SUBVERSION_HOME=$PROGRAMS_HOME/svn-win32-1.8.13 #export SUBVERSION_HOME=$PROGRAMS_HOME/svn-win32-1.8.13
export WGET_HOME=$PROGRAMS_HOME/wget export WGET_HOME=$PROGRAMS_HOME/wget-1.11.4-1
export ZIP_HOME="/c/Program Files/7-Zip" export ZIP_HOME="/c/Program Files/7-Zip"
} }
@ -58,13 +58,13 @@ add_to_path() {
echo "Adding user-defined installed system tools to PATH ..." echo "Adding user-defined installed system tools to PATH ..."
export PATH=$ZIP_HOME:$PATH export PATH=$ZIP_HOME:$PATH
export PATH=$WGET_HOME/bin:$PATH export PATH=$WGET_HOME/bin:$PATH
export PATH=$PYTHON_HOME:$PATH #export PATH=$PYTHON_HOME:$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=$CMAKE_HOME/bin:$PATH export PATH=$CMAKE_HOME/bin:$PATH
export PATH=$MPI_ROOTDIR/bin:$PATH export PATH=$MPI_ROOTDIR/bin:$PATH
export PATH=$PEXPORTS_HOME:$PATH export PATH=$PEXPORTS_HOME/bin:$PATH
export PATH=$MINGW_HOME/bin:$PATH export PATH=$MINGW_HOME/bin:$PATH
} }
# }}} # }}}

7
etc/settings.sh
View file

@ -504,13 +504,6 @@ esac
_foamAddLib $FOAM_MPI_LIBBIN _foamAddLib $FOAM_MPI_LIBBIN
# Add DLLs on PATH for Windows (cannot use LD_LIBRARY_PATH)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if [ "$WM_ARCH_BASE" == "mingw" ]
then
_foamAddPath $FOAM_LIBBIN $FOAM_LIBBIN/$mpi_version
fi
# Set the minimum MPI buffer size (used by all platforms except SGI MPI) # Set the minimum MPI buffer size (used by all platforms except SGI MPI)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
minBufferSize=20000000 minBufferSize=20000000

4
src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/vectorGaussDivScheme.H
View file

@ -50,13 +50,13 @@ namespace fv
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<> template<> inline
tmp<BlockLduSystem<vector, scalar> > gaussDivScheme<vector>::fvmUDiv tmp<BlockLduSystem<vector, scalar> > gaussDivScheme<vector>::fvmUDiv
( (
const GeometricField<vector, fvPatchField, volMesh>& const GeometricField<vector, fvPatchField, volMesh>&
) const; ) const;
template<> template<> inline
tmp<BlockLduSystem<vector, scalar> > gaussDivScheme<vector>::fvmUDiv tmp<BlockLduSystem<vector, scalar> > gaussDivScheme<vector>::fvmUDiv
( (
const surfaceScalarField& flux, const surfaceScalarField& flux,

2
src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
View file

@ -24,5 +24,3 @@ EXE_INC = \
LIB_LIBS = \ LIB_LIBS = \
-L$(PARMGRIDGEN_LIB_DIR) -lMGridGen -L$(PARMGRIDGEN_LIB_DIR) -lMGridGen
endif endif

1
wmake/rules/MINGW32_NT-6.1Gcc/ARCHITECTURE_TESTED
View file

@ -1,2 +1 @@
by bgschaid. 2010-10-06 on Centos 5.5 with gcc 4.1 by bgschaid. 2010-10-06 on Centos 5.5 with gcc 4.1

1
wmake/rules/MINGW32_NT-6.1Gcc/mplibQSMPI
View file

@ -1,4 +1,3 @@
PFLAGS = PFLAGS =
PINC = -I$(MPI_ARCH_PATH)/include PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpi