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

Compilation fixes

Browse source
This commit is contained in:
Franjo Juretic 2015-07-14 14:14:43 +02:00 committed by Dominik Christ
parent eff9a36c3b
commit d21a37312b
26 changed files with 95 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/utilities/mesh/cfMesh/FLMAToSurface/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/FMSToSurface/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(FOAM_SRC)/meshTools/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I$(FOAM_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/FMSToVTK/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(FOAM_SRC)/meshTools/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I$(FOAM_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/cartesian2DMesh/Make/options
View file

@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude
EXE_LIBS = \
-lmeshTools \

2
applications/utilities/mesh/cfMesh/cartesianMesh/Make/options
View file

@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude
EXE_LIBS = \
-lmeshTools \

2
applications/utilities/mesh/cfMesh/checkSurfaceMesh/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/copySurfaceParts/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/extrudeEdgesInto2DSurface/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/generateBoundaryLayers/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/importSurfaceAsSubset/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/improveMeshQuality/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/improveSymmetryPlanes/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/mergeSurfacePatches/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(FOAM_SRC)/meshTools/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I$(FOAM_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/meshToFPMA/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/pMesh/Make/options
View file

@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude
EXE_LIBS = \
-lmeshTools \

2
applications/utilities/mesh/cfMesh/patchesToSubsets/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/preparePar/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(FOAM_SRC)/meshTools/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I$(FOAM_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/removeSurfaceFacets/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

70
applications/utilities/mesh/cfMesh/renameEntries.py Normal file
View file

@ -0,0 +1,70 @@
import os, sys, string, subprocess, re
from os.path import join, getsize
origString = "#include \"OF_dlLibraryTable.H\""
newString = ""
def CollectSourceDirectories(rootDirectory) :
sourceDirectories = []
for root,dirs,files in os.walk(rootDirectory) :
for dirname in dirs :
if dirname.find("Make") != -1 :
sourceDirectories.append(root)
return sourceDirectories
def ReplaceStrings(sourceDir) :
global newString, origString
try :
# read the content of the file
options = []
for root,dirs,files in os.walk(sourceDir) :
for file in files :
if file == "options" or file == "files":
fName = join(root, file)
file = open(fName, 'raU')
lines = file.readlines()
file.close()
hasString = False
for line in lines :
if origString in line :
hasString = True
break
if hasString == False :
continue
newlines = []
for line in lines :
newlines.append(string.replace(line, origString, newString))
# write processed file
newFile = open(fName, 'wa')
for line in newlines :
newFile.write(line)
newFile.close()
except :
print "Cannot open options file",options
# start of the workflow
# find the root of the installation
if len(sys.argv) == 4 :
startDir = sys.argv[1]
origString = sys.argv[2]
newString = sys.argv[3]
else :
startDir = sys.argv[1]
print "Installation directory is",startDir
print "Orig string",origString
print "New string",newString
# find directories containing source files
print "Finding directories containing source files"
sourceDirectories = CollectSourceDirectories(startDir)
print "Number of directories with source files is", len(sourceDirectories)
# check which souce directories contain declareRunTimeSelectionTable
for dir in sourceDirectories :
ReplaceStrings(dir)

2
applications/utilities/mesh/cfMesh/scaleMesh/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/scaleSurfaceMesh/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/subsetToPatch/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(FOAM_SRC)/meshTools/lnInclude \
-I$(FOAM_SRC)/triSurface/lnInclude \
-I$(FOAM_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/surfaceFeatureEdges/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/surfaceGenerateBoundingBox/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/surfaceToFMS/Make/options
View file

@ -1,5 +1,5 @@
EXE_INC = \
-I../../meshLibrary/lnInclude \
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude

2
applications/utilities/mesh/cfMesh/tetMesh/Make/options
View file

@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
-I$(LIB_SRC)/mesh/cfMesh/meshLibrary/lnInclude
EXE_LIBS = \
-lmeshTools \