Initial patched files for debian package
This commit is contained in:
parent
f3f7bbbe7c
commit
31a8b096f1
11 changed files with 33 additions and 34 deletions
2
Allwmake
2
Allwmake
|
@ -14,7 +14,7 @@ fi
|
||||||
|
|
||||||
# build ThirdParty sources
|
# build ThirdParty sources
|
||||||
#( cd $WM_THIRD_PARTY_DIR && ./Allwmake )
|
#( cd $WM_THIRD_PARTY_DIR && ./Allwmake )
|
||||||
( cd $WM_THIRD_PARTY_DIR && ./AllMake )
|
# ( cd $WM_THIRD_PARTY_DIR && ./AllMake )
|
||||||
|
|
||||||
# build OpenFOAM libraries and applications
|
# build OpenFOAM libraries and applications
|
||||||
src/Allwmake
|
src/Allwmake
|
||||||
|
|
|
@ -50,6 +50,7 @@ foamInstall=$HOME/$WM_PROJECT
|
||||||
# foamInstall=~$WM_PROJECT
|
# foamInstall=~$WM_PROJECT
|
||||||
# foamInstall=/usr/local/$WM_PROJECT
|
# foamInstall=/usr/local/$WM_PROJECT
|
||||||
# foamInstall=/opt/$WM_PROJECT
|
# foamInstall=/opt/$WM_PROJECT
|
||||||
|
# foamInstall=/usr/lib
|
||||||
#
|
#
|
||||||
# END OF (NORMAL) USER EDITABLE PART
|
# END OF (NORMAL) USER EDITABLE PART
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -77,7 +78,7 @@ export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION
|
||||||
# Location of third-party software
|
# Location of third-party software
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
#: ${WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION}; export WM_THIRD_PARTY_DIR
|
#: ${WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION}; export WM_THIRD_PARTY_DIR
|
||||||
: ${WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty}; export WM_THIRD_PARTY_DIR
|
# : ${WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty}; export WM_THIRD_PARTY_DIR
|
||||||
|
|
||||||
# Source files, possibly with some verbosity
|
# Source files, possibly with some verbosity
|
||||||
_foamSource()
|
_foamSource()
|
||||||
|
@ -312,14 +313,14 @@ export PATH LD_LIBRARY_PATH MANPATH
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
_foamSource $WM_PROJECT_DIR/etc/settings.sh
|
_foamSource $WM_PROJECT_DIR/etc/settings.sh
|
||||||
_foamSource $WM_PROJECT_DIR/etc/aliases.sh
|
# _foamSource $WM_PROJECT_DIR/etc/aliases.sh
|
||||||
|
|
||||||
|
|
||||||
# Source user setup files for optional packages
|
# Source user setup files for optional packages
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
|
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
|
||||||
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
|
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
|
||||||
_foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
|
# _foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
|
||||||
|
|
||||||
|
|
||||||
# Clean environment paths again. Only remove duplicates
|
# Clean environment paths again. Only remove duplicates
|
||||||
|
|
|
@ -49,6 +49,7 @@ set foamInstall = $HOME/$WM_PROJECT
|
||||||
# set foamInstall = ~$WM_PROJECT
|
# set foamInstall = ~$WM_PROJECT
|
||||||
# set foamInstall = /usr/local/$WM_PROJECT
|
# set foamInstall = /usr/local/$WM_PROJECT
|
||||||
# set foamInstall = /opt/$WM_PROJECT
|
# set foamInstall = /opt/$WM_PROJECT
|
||||||
|
# set foamInstall = /usr/lib
|
||||||
#
|
#
|
||||||
# END OF (NORMAL) USER EDITABLE PART
|
# END OF (NORMAL) USER EDITABLE PART
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
@ -304,7 +305,7 @@ setenv MANPATH `$cleanProg "$MANPATH" "$foamOldDirs"`
|
||||||
# Source project setup files
|
# Source project setup files
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
_foamSource $WM_PROJECT_DIR/etc/settings.csh
|
_foamSource $WM_PROJECT_DIR/etc/settings.csh
|
||||||
_foamSource $WM_PROJECT_DIR/etc/aliases.csh
|
# _foamSource $WM_PROJECT_DIR/etc/aliases.csh
|
||||||
|
|
||||||
# Source user setup files for optional packages
|
# Source user setup files for optional packages
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
|
@ -37,7 +37,7 @@ alias _foamAddPath 'set path=(\!* $path)'
|
||||||
alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
|
alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
|
||||||
|
|
||||||
# location of the jobControl directory
|
# location of the jobControl directory
|
||||||
setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
|
setenv FOAM_JOB_DIR $HOME/$WM_PROJECT/jobControl
|
||||||
|
|
||||||
# wmake configuration
|
# wmake configuration
|
||||||
setenv WM_DIR $WM_PROJECT_DIR/wmake
|
setenv WM_DIR $WM_PROJECT_DIR/wmake
|
||||||
|
@ -52,18 +52,18 @@ setenv WM_DECOMP_LIBS "-lfaceDecompFiniteElement -lfaceDecompositionMotionSolver
|
||||||
|
|
||||||
# base configuration
|
# base configuration
|
||||||
setenv FOAM_APP $WM_PROJECT_DIR/applications
|
setenv FOAM_APP $WM_PROJECT_DIR/applications
|
||||||
setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
|
setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin
|
||||||
setenv FOAM_LIB $WM_PROJECT_DIR/lib
|
setenv FOAM_LIB $WM_PROJECT_DIR/lib
|
||||||
setenv FOAM_LIBBIN $WM_PROJECT_DIR/lib/$WM_OPTIONS
|
setenv FOAM_LIBBIN $WM_PROJECT_DIR/lib/$WM_OPTIONS
|
||||||
setenv FOAM_SRC $WM_PROJECT_DIR/src
|
setenv FOAM_SRC $WM_PROJECT_DIR/src
|
||||||
|
|
||||||
# shared site configuration - similar naming convention as ~OpenFOAM expansion
|
# shared site configuration - similar naming convention as ~OpenFOAM expansion
|
||||||
setenv FOAM_SITE_APPBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS
|
setenv FOAM_SITE_APPBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin
|
||||||
setenv FOAM_SITE_LIBBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS
|
setenv FOAM_SITE_LIBBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib
|
||||||
|
|
||||||
# user configuration
|
# user configuration
|
||||||
setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
|
setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin
|
||||||
setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
|
setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib
|
||||||
|
|
||||||
# convenience
|
# convenience
|
||||||
setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
|
setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
|
||||||
|
|
|
@ -57,7 +57,7 @@ _foamAddLib()
|
||||||
|
|
||||||
|
|
||||||
# location of the jobControl directory
|
# location of the jobControl directory
|
||||||
export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl
|
export FOAM_JOB_DIR=$HOME/$WM_PROJECT/jobControl
|
||||||
|
|
||||||
# wmake configuration
|
# wmake configuration
|
||||||
export WM_DIR=$WM_PROJECT_DIR/wmake
|
export WM_DIR=$WM_PROJECT_DIR/wmake
|
||||||
|
@ -72,18 +72,18 @@ export WM_DECOMP_LIBS="-lfaceDecompFiniteElement -lfaceDecompositionMotionSolver
|
||||||
|
|
||||||
# base configuration
|
# base configuration
|
||||||
export FOAM_APP=$WM_PROJECT_DIR/applications
|
export FOAM_APP=$WM_PROJECT_DIR/applications
|
||||||
export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
|
export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin
|
||||||
export FOAM_LIB=$WM_PROJECT_DIR/lib
|
export FOAM_LIB=$WM_PROJECT_DIR/lib
|
||||||
export FOAM_LIBBIN=$WM_PROJECT_DIR/lib/$WM_OPTIONS
|
export FOAM_LIBBIN=$WM_PROJECT_DIR/lib
|
||||||
export FOAM_SRC=$WM_PROJECT_DIR/src
|
export FOAM_SRC=$WM_PROJECT_DIR/src
|
||||||
|
|
||||||
# shared site configuration - similar naming convention as ~OpenFOAM expansion
|
# shared site configuration - similar naming convention as ~OpenFOAM expansion
|
||||||
export FOAM_SITE_APPBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS
|
export FOAM_SITE_APPBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin
|
||||||
export FOAM_SITE_LIBBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS
|
export FOAM_SITE_LIBBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib
|
||||||
|
|
||||||
# user configuration
|
# user configuration
|
||||||
export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
|
export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin
|
||||||
export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
|
export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib
|
||||||
|
|
||||||
# convenience
|
# convenience
|
||||||
export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
|
export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
EXE_INC = \
|
EXE_INC = \
|
||||||
-I$(METIS_DIR)/include \
|
-I/usr/include/metis \
|
||||||
-I../decompositionMethods/lnInclude \
|
-I../decompositionMethods/lnInclude \
|
||||||
-I../scotchDecomp/lnInclude
|
-I../scotchDecomp/lnInclude
|
||||||
|
|
||||||
LIB_LIBS = \
|
LIB_LIBS = \
|
||||||
-L$(FOAM_LIBBIN)/dummy \
|
-L$(FOAM_LIBBIN)/dummy \
|
||||||
-L$(METIS_DIR)/lib -lmetis \
|
-L$(METIS_DIR)/lib -lmetis
|
||||||
-L$(METIS_DIR)/lib -lGKlib
|
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,13 @@ include $(RULES)/mplib$(WM_MPLIB)
|
||||||
|
|
||||||
EXE_INC = \
|
EXE_INC = \
|
||||||
$(PFLAGS) $(PINC) \
|
$(PFLAGS) $(PINC) \
|
||||||
-I$(PARMETIS_DIR)/include/ParMETISLib \
|
-I/usr/include/parmetis \
|
||||||
-I$(PARMETIS_DIR)/include \
|
-I/usr/include/metis \
|
||||||
-I../decompositionMethods/lnInclude \
|
-I../decompositionMethods/lnInclude \
|
||||||
-I../metisDecomp/lnInclude \
|
-I../metisDecomp/lnInclude \
|
||||||
-I../scotchDecomp/lnInclude
|
-I../scotchDecomp/lnInclude
|
||||||
|
|
||||||
LIB_LIBS = \
|
LIB_LIBS = \
|
||||||
-L$(FOAM_MPI_LIBBIN) \
|
-L$(FOAM_MPI_LIBBIN) \
|
||||||
-L$(PARMETIS_DIR)/lib -lmetis-parmetis \
|
-L$(PARMETIS_DIR)/lib -lmetis \
|
||||||
-L$(PARMETIS_DIR)/lib -lparmetis
|
-L$(PARMETIS_DIR)/lib -lparmetis
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
EXE_INC = \
|
EXE_INC = \
|
||||||
-I$(SCOTCH_DIR)/include \
|
-I/usr/include/scotch \
|
||||||
-I../decompositionMethods/lnInclude
|
-I../decompositionMethods/lnInclude
|
||||||
|
|
||||||
LIB_LIBS = \
|
LIB_LIBS = \
|
||||||
-L$(SCOTCH_DIR)/lib -lscotch \
|
-lscotch \
|
||||||
-L$(SCOTCH_DIR)/lib -lscotcherrexit
|
-lscotcherrexit
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
EXE_INC = \
|
EXE_INC = \
|
||||||
-I$(MESQUITE_DIR)/include \
|
|
||||||
-I$(LIB_SRC)/meshTools/lnInclude \
|
-I$(LIB_SRC)/meshTools/lnInclude \
|
||||||
-I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
|
-I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
|
||||||
|
|
||||||
LIB_LIBS = \
|
LIB_LIBS = \
|
||||||
-lmeshTools \
|
-lmeshTools \
|
||||||
-ldynamicMesh \
|
-ldynamicMesh \
|
||||||
-L$(MESQUITE_DIR)/lib -lmesquite
|
-lmesquite
|
||||||
|
|
|
@ -7,9 +7,9 @@ TYPE_REAL=-DTYPE_REAL
|
||||||
|
|
||||||
EXE_INC = \
|
EXE_INC = \
|
||||||
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
||||||
-I$(PARMGRIDGEN_DIR)/include/Lib \
|
-I/usr/include/mgridgen \
|
||||||
-I$(PARMGRIDGEN_DIR)/include/IMlib \
|
|
||||||
$(TYPE_REAL)
|
$(TYPE_REAL)
|
||||||
|
|
||||||
LIB_LIBS = \
|
LIB_LIBS = \
|
||||||
-L$(PARMGRIDGEN_DIR)/lib -lMGridGen
|
-lMGridGen \
|
||||||
|
-lIMlib
|
||||||
|
|
|
@ -58,7 +58,7 @@ WM_SCRIPTS = $(WM_DIR)/scripts
|
||||||
|
|
||||||
LIB_SRC = $(WM_PROJECT_DIR)/src
|
LIB_SRC = $(WM_PROJECT_DIR)/src
|
||||||
LIB_DIR = $(WM_PROJECT_DIR)/lib
|
LIB_DIR = $(WM_PROJECT_DIR)/lib
|
||||||
LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS)
|
LIB_WM_OPTIONS_DIR = $(LIB_DIR)
|
||||||
OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS)
|
OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS)
|
||||||
CLASSES_DIR = $(MAKE_DIR)/classes
|
CLASSES_DIR = $(MAKE_DIR)/classes
|
||||||
|
|
||||||
|
|
Reference in a new issue