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

Hot fixes

Browse source
This commit is contained in:
Hrvoje Jasak 2011-09-22 15:16:44 +01:00
parent f2f983ac70
commit 86b1af3367
9 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
etc/settings.sh
View file

@ -480,8 +480,8 @@ export MPI_BUFFER_SIZE
# Load cmake # Load cmake
# ~~~~~~~~~~ # ~~~~~~~~~~
[ -z "$CMAKE_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/cmake-2.8.3/platforms/$WM_OPTIONS ] && { [ -z "$CMAKE_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/cmake-2.8.5 ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.3/platforms/$WM_OPTIONS/etc/cmake-2.8.3.sh _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.5/platforms/$WM_OPTIONS/etc/cmake-2.8.5.sh
} }
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " CMAKE_DIR is initialized to: $CMAKE_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo " CMAKE_DIR is initialized to: $CMAKE_DIR"
@ -533,8 +533,10 @@ export MPI_BUFFER_SIZE
# Load ParaView # Load ParaView
# ~~~~~~~~~~~~~ # ~~~~~~~~~~~~~
[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.10.1/platforms/$WM_OPTIONS ] && { #[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.10.1/platforms/$WM_OPTIONS ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.10.1/platforms/$WM_OPTIONS/etc/ParaView-3.10.1.sh # _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.10.1/platforms/$WM_OPTIONS/etc/ParaView-3.10.1.sh
[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.sh
} }
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " PARAVIEW_DIR is initialized to: $PARAVIEW_DIR" [ "$FOAM_VERBOSE" -a "$PS1" ] && echo " PARAVIEW_DIR is initialized to: $PARAVIEW_DIR"

2
src/dynamicMesh/meshMotion/Allwmake
View file

@ -3,10 +3,10 @@ cd ${0%/*} || exit 1 # run from this directory
set -x set -x
# Make meshMotion solvers # Make meshMotion solvers
wmake libso solidBodyMotion
wmake libso fvMotionSolver wmake libso fvMotionSolver
wmake libso RBFMotionSolver wmake libso RBFMotionSolver
wmake libso mesquiteMotionSolver wmake libso mesquiteMotionSolver
(cd tetDecompositionMotionSolver ; ./Allwmake) (cd tetDecompositionMotionSolver ; ./Allwmake)
wmake libso solidBodyMotion
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

2
tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean
View file

@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
cd wingMotion_snappyHexMesh cd wingMotion_snappyHexMesh
cleanCase cleanCase
rm front.sMesh rm -f front.sMesh
cd ../wingMotion2D_simpleFoam cd ../wingMotion2D_simpleFoam

1
wmake/rules/darwinIntel64/c++
View file

@ -18,4 +18,5 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) -lpthread LINK_LIBS = $(c++DBUG) -lpthread
LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup
# LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lOpenFOAM -L$(FOAM_MPI_LIBBIN) -lPstream
LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_MPI_LIBBIN) -lPstream LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_MPI_LIBBIN) -lPstream

2
wmake/rules/linux64Gcc/c++
View file

@ -18,4 +18,4 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed

2
wmake/rules/linux64Icc/c
View file

@ -10,7 +10,7 @@ cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
LINK_LIBS = $(cDBUG) LINK_LIBS = $(cDBUG) -L$(IA32ROOT)/lib
LINKLIBSO = $(cc) $(cFLAGS) -shared LINKLIBSO = $(cc) $(cFLAGS) -shared
LINKEXE = $(cc) $(cFLAGS) LINKEXE = $(cc) $(cFLAGS)

2
wmake/rules/linux64Icc/c++
View file

@ -15,7 +15,7 @@ cxxtoo = $(Ctoo)
cctoo = $(Ctoo) cctoo = $(Ctoo)
cpptoo = $(Ctoo) cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) LINK_LIBS = $(c++DBUG) -L$(IA64ROOT)/lib
LINKLIBSO = $(CC) $(c++FLAGS) -shared LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) LINKEXE = $(CC) $(c++FLAGS)

2
wmake/rules/linux64Icc/c++Debug
View file

@ -1,2 +1,2 @@
c++DBUG = -g -DFULLDEBUG -O0 c++DBUG = -g -DFULLDEBUG -O0
c++OPT = c++OPT = -fp-model precise

2
wmake/rules/linux64Icc/c++Opt
View file

@ -1,3 +1,3 @@
c++DBUG = c++DBUG =
#c++OPT = -O3 -xP -no-prec-div #c++OPT = -O3 -xP -no-prec-div
c++OPT = -ansi-alias -O3 -fno-alias -fargument-noalias-global -unroll0 c++OPT = -ansi-alias -O3 -fno-alias -fp-model precise -fargument-noalias-global -unroll0