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

Merge branch 'nextRelease' of ssh://git.code.sf.net/p/openfoam-extend/OpenFOAM-1.6-ext into nextRelease

Browse source
This commit is contained in:
Hrvoje Jasak 2013-11-04 14:11:40 +00:00
commit 97ebf4e31e
25 changed files with 107 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
applications/solvers/solidMechanics/utilities/smoothMesh/smoothMesh.C
View file

@ -32,6 +32,7 @@ Description
#include "argList.H"
#include "timeSelector.H"
#include "objectRegistry.H"
#include "Time.H"
#include "fvMesh.H"
#include "boolList.H"

11
etc/bashrc
View file

@ -118,7 +118,7 @@ done
: ${WM_OSTYPE:=POSIX}; export WM_OSTYPE
# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
# Compiler: set to Gcc or Icc (for Intel's icc)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
: ${WM_COMPILER:=Gcc}; export WM_COMPILER
@ -219,6 +219,9 @@ Darwin)
# this makes certain things easier
export WM_ARCH_BASE=darwin
# Remove limit of open files
ulimit -n 1000
case `uname -p` in
powerpc)
export WM_ARCH=darwinPpc
@ -324,12 +327,6 @@ Darwin)
fi
fi
fi
if [ -z "$WM_CC" ]
then
# nobody set the compiler
export WM_CC="gcc"
export WM_CXX="g++"
fi
;;
SunOS)

3
etc/cshrc
View file

@ -208,6 +208,9 @@ case Darwin:
# this makes certain things easier
setenv WM_ARCH_BASE darwin
# Remove limit on number of open files
ulimit -n 1000
switch (`uname -p`)
case powerpc:
setenv WM_ARCH darwinPpc

1
src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/convexSetAlgorithm/convexSetAlgorithm.C
View file

@ -35,6 +35,7 @@ Author
\*---------------------------------------------------------------------------*/
#include "objectRegistry.H"
#include "Time.H"
#include "IOMap.H"
#include "meshOps.H"

1
src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/dynamicTopoFvMeshReOrder.C
View file

@ -25,6 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "objectMap.H"
#include "objectRegistry.H"
#include "coupledInfo.H"
#include "dynamicTopoFvMesh.H"

1
src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/edgeBisect.C
View file

@ -25,6 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "Stack.H"
#include "objectRegistry.H"
#include "triFace.H"
#include "objectMap.H"
#include "changeMap.H"

1
src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/edgeCollapse.C
View file

@ -25,6 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "Stack.H"
#include "objectRegistry.H"
#include "triFace.H"
#include "objectMap.H"
#include "changeMap.H"

102
src/solidModels/fvPatchFields/solidContact/solidContactFvPatchVectorField.C
View file

@ -158,39 +158,61 @@ solidContactFvPatchVectorField::solidContactFvPatchVectorField
slaveFaceZoneID_(patch().boundaryMesh().mesh().faceZones().findZoneID(slaveFaceZoneName_)),
masterFaceZonePatchPtr_
(
master_ ?
new PrimitivePatch<face, List, pointField>
master_ ?
new PrimitivePatch<face, Foam::List, pointField>
(
patch().boundaryMesh().mesh().faceZones()[masterFaceZoneID_]()
.localFaces(),
patch().boundaryMesh().mesh().faceZones()[masterFaceZoneID_]()
.localPoints()
)
:
NULL
),
slaveFaceZonePatchPtr_
(
patch().boundaryMesh().mesh().faceZones()[masterFaceZoneID_]().localFaces(),
patch().boundaryMesh().mesh().faceZones()[masterFaceZoneID_]().localPoints()
)
:
NULL),
slaveFaceZonePatchPtr_
(
master_ ?
new PrimitivePatch<face, List, pointField>
master_ ?
new PrimitivePatch<face, Foam::List, pointField>
(
patch().boundaryMesh().mesh().faceZones()[slaveFaceZoneID_]()
.localFaces(),
patch().boundaryMesh().mesh().faceZones()[slaveFaceZoneID_]()
.localPoints()
)
:
NULL
),
interpolationMethod_
(
patch().boundaryMesh().mesh().faceZones()[slaveFaceZoneID_]().localFaces(),
patch().boundaryMesh().mesh().faceZones()[slaveFaceZoneID_]().localPoints()
)
:
NULL),
interpolationMethod_( master_ ? dict.lookup("interpolationMethod") : word("interpolationMethodUndefinedForSlave")),
slaveToMasterPatchToPatchInterpolatorPtr_(NULL),
slaveToMasterGgiInterpolatorPtr_(NULL),
masterFaceZonePatchInterpolatorPtr_
(
master_ ?
new PrimitivePatchInterpolation< PrimitivePatch<face, List, pointField> >(*masterFaceZonePatchPtr_)
:
NULL),
slaveFaceZonePatchInterpolatorPtr_
(
master_ ?
new PrimitivePatchInterpolation< PrimitivePatch<face, List, pointField> >(*slaveFaceZonePatchPtr_)
:
NULL),
master_ ?
dict.lookup("interpolationMethod")
:
word("interpolationMethodUndefinedForSlave")
),
slaveToMasterPatchToPatchInterpolatorPtr_(NULL),
slaveToMasterGgiInterpolatorPtr_(NULL),
masterFaceZonePatchInterpolatorPtr_
(
master_
?
new PrimitivePatchInterpolation
<
PrimitivePatch<face, Foam::List, pointField>
>(*masterFaceZonePatchPtr_)
:
NULL
),
slaveFaceZonePatchInterpolatorPtr_
(
master_
?
new PrimitivePatchInterpolation
<
PrimitivePatch<face, Foam::List, pointField>
>(*slaveFaceZonePatchPtr_)
:
NULL
),
oldMasterFaceZonePoints_
(
master_ ?
@ -334,8 +356,8 @@ solidContactFvPatchVectorField::solidContactFvPatchVectorField
slaveToMasterPatchToPatchInterpolatorPtr_ =
new PatchToPatchInterpolation
<
PrimitivePatch<face, List, pointField>,
PrimitivePatch<face, List, pointField>
PrimitivePatch<face, Foam::List, pointField>,
PrimitivePatch<face, Foam::List, pointField>
>
(
*slaveFaceZonePatchPtr_, // from zone
@ -349,7 +371,7 @@ solidContactFvPatchVectorField::solidContactFvPatchVectorField
Info << "\tInterpolation of traction from slave to master: ggi" << endl;
slaveToMasterGgiInterpolatorPtr_ =
// new ggiZoneInterpolation
new GGIInterpolation< PrimitivePatch< face, List, pointField >, PrimitivePatch< face, List, pointField > >
new GGIInterpolation< PrimitivePatch< face, Foam::List, pointField >, PrimitivePatch< face, Foam::List, pointField > >
(
// masterFaceZonePatch, // master zone
// slaveFaceZonePatch, // slave zone
@ -964,7 +986,7 @@ void solidContactFvPatchVectorField::moveFaceZonePatches()
// create new face zone patches with deformed points
masterFaceZonePatchPtr_ =
new PrimitivePatch<face, List, pointField>
new PrimitivePatch<face, Foam::List, pointField>
(
mesh.faceZones()[masterFaceZoneID_]().localFaces(),
globalMasterNewPoints
@ -978,7 +1000,7 @@ void solidContactFvPatchVectorField::moveFaceZonePatches()
// );
slaveFaceZonePatchPtr_ =
new PrimitivePatch<face, List, pointField>
new PrimitivePatch<face, Foam::List, pointField>
(
mesh.faceZones()[slaveFaceZoneID_]().localFaces(),
globalSlaveNewPoints
@ -1019,7 +1041,7 @@ void solidContactFvPatchVectorField::moveFaceZonePatches()
{
delete slaveToMasterPatchToPatchInterpolatorPtr_;
slaveToMasterPatchToPatchInterpolatorPtr_ =
new PatchToPatchInterpolation<PrimitivePatch<face, List, pointField>, PrimitivePatch<face, List, pointField> >
new PatchToPatchInterpolation<PrimitivePatch<face, Foam::List, pointField>, PrimitivePatch<face, Foam::List, pointField> >
(
*slaveFaceZonePatchPtr_, // from zone
*masterFaceZonePatchPtr_, // to zone
@ -1031,7 +1053,7 @@ void solidContactFvPatchVectorField::moveFaceZonePatches()
{
delete slaveToMasterGgiInterpolatorPtr_;
slaveToMasterGgiInterpolatorPtr_ =
new GGIInterpolation< PrimitivePatch< face, List, pointField >, PrimitivePatch< face, List, pointField > >
new GGIInterpolation< PrimitivePatch< face, Foam::List, pointField >, PrimitivePatch< face, Foam::List, pointField > >
(
*masterFaceZonePatchPtr_, // master zone
*slaveFaceZonePatchPtr_, // slave zone
@ -1048,10 +1070,10 @@ void solidContactFvPatchVectorField::moveFaceZonePatches()
// and primitive patch interpolators
delete masterFaceZonePatchInterpolatorPtr_;
masterFaceZonePatchInterpolatorPtr_ =
new PrimitivePatchInterpolation< PrimitivePatch<face, List, pointField> >(*masterFaceZonePatchPtr_);
new PrimitivePatchInterpolation< PrimitivePatch<face, Foam::List, pointField> >(*masterFaceZonePatchPtr_);
delete slaveFaceZonePatchInterpolatorPtr_;
slaveFaceZonePatchInterpolatorPtr_ =
new PrimitivePatchInterpolation< PrimitivePatch<face, List, pointField> >(*slaveFaceZonePatchPtr_);
new PrimitivePatchInterpolation< PrimitivePatch<face, Foam::List, pointField> >(*slaveFaceZonePatchPtr_);
// Also maybe I should correct motion for 2D models
// OK for now

58
src/solidModels/fvPatchFields/solidContact/solidContactFvPatchVectorField.H
View file

@ -108,31 +108,31 @@ class solidContactFvPatchVectorField
// pointField slaveFaceZonePatchPoints_;
// faceList masterFaceZonePatchFaces_;
// faceList slaveFaceZonePatchFaces_;
// PrimitivePatch<face, List, const pointField&>* masterFaceZonePatchPtr_;
// PrimitivePatch<face, List, const pointField&>* slaveFaceZonePatchPtr_;
// PrimitivePatch<face, Foam::List, const pointField&>* masterFaceZonePatchPtr_;
// PrimitivePatch<face, Foam::List, const pointField&>* slaveFaceZonePatchPtr_;
// these patches keep a local copy of the points and faces
PrimitivePatch<face, List, pointField>* masterFaceZonePatchPtr_;
PrimitivePatch<face, List, pointField>* slaveFaceZonePatchPtr_;
PrimitivePatch<face, Foam::List, pointField>* masterFaceZonePatchPtr_;
PrimitivePatch<face, Foam::List, pointField>* slaveFaceZonePatchPtr_;
// method to interpolate traction from slave to master
word interpolationMethod_;
//- zoneToZone or ggiZone for interpolation of traction from slave to master
//zoneToZoneInterpolation* slaveToMasterPatchToPatchInterpolatorPtr_;
PatchToPatchInterpolation< PrimitivePatch<face, List, pointField>,
PrimitivePatch<face, List, pointField>
PatchToPatchInterpolation< PrimitivePatch<face, Foam::List, pointField>,
PrimitivePatch<face, Foam::List, pointField>
>* slaveToMasterPatchToPatchInterpolatorPtr_;
// we call it slaveToMasterGgi but it can interpolate either direction
// ggiZoneInterpolation* slaveToMasterGgiInterpolatorPtr_;
GGIInterpolation< PrimitivePatch< face, List, pointField >,
PrimitivePatch< face, List, pointField >
GGIInterpolation< PrimitivePatch< face, Foam::List, pointField >,
PrimitivePatch< face, Foam::List, pointField >
>* slaveToMasterGgiInterpolatorPtr_;
// To interpolate value for the face zone patch faces to vertices
// and vice versa
PrimitivePatchInterpolation< PrimitivePatch<face, List, pointField>
PrimitivePatchInterpolation< PrimitivePatch<face, Foam::List, pointField>
>* masterFaceZonePatchInterpolatorPtr_;
PrimitivePatchInterpolation< PrimitivePatch<face, List, pointField>
PrimitivePatchInterpolation< PrimitivePatch<face, Foam::List, pointField>
>* slaveFaceZonePatchInterpolatorPtr_;
//- old face zone points
@ -273,32 +273,38 @@ public:
}
//- Return masterFaceZonePatch pointer
PrimitivePatch<face, List, pointField>* masterFaceZonePatchPtr() const
PrimitivePatch<face, Foam::List, pointField>*
masterFaceZonePatchPtr() const
{
return masterFaceZonePatchPtr_;
}
//- Return masterFaceZonePatch pointer
PrimitivePatch<face, List, pointField>* slaveFaceZonePatchPtr() const
PrimitivePatch<face, Foam::List, pointField>*
slaveFaceZonePatchPtr() const
{
return slaveFaceZonePatchPtr_;
}
//- Return patchToPatch interpolator pointer
PatchToPatchInterpolation< PrimitivePatch<face, List, pointField>,
PrimitivePatch<face, List, pointField>
>* slaveToMasterPatchToPatchInterpolatorPtr() const
{
return slaveToMasterPatchToPatchInterpolatorPtr_;
}
PatchToPatchInterpolation
<
PrimitivePatch<face, Foam::List, pointField>,
PrimitivePatch<face, Foam::List, pointField>
>* slaveToMasterPatchToPatchInterpolatorPtr() const
{
return slaveToMasterPatchToPatchInterpolatorPtr_;
}
//- Return GGI interpolator pointer
GGIInterpolation< PrimitivePatch< face, List, pointField >,
PrimitivePatch< face, List, pointField >
>* slaveToMasterGgiInterpolatorPtr() const
{
return slaveToMasterGgiInterpolatorPtr_;
}
GGIInterpolation
<
PrimitivePatch< face, Foam::List, pointField >,
PrimitivePatch< face, Foam::List, pointField >
>* slaveToMasterGgiInterpolatorPtr() const
{
return slaveToMasterGgiInterpolatorPtr_;
}
//- Return correction frequency
label correctionFreq() const
@ -365,13 +371,13 @@ public:
// Return const reference to stickSlipField
const scalarField& stickSlipField() const
{
if(!stickSlipFieldPtr_)
if (!stickSlipFieldPtr_)
{
FatalError << "solidContact::stickSlipField() pointer"
<< " is NULL" << exit(FatalError);
}
return stickSlipFieldPtr_->boundaryField()[patch().index()];
return stickSlipFieldPtr_->boundaryField()[patch().index()];
}
//- Write

1
wmake/rules/darwinIntel64/ARCHITECTURE_TESTED
View file

@ -1 +0,0 @@
by bgschaid. 2010-10-05

3
wmake/rules/darwinIntel64/X
View file

@ -1,3 +0,0 @@
XFLAGS =
XINC = $(XFLAGS) -I/usr/X11R6/include
XLIBS = -L/usr/X11R6/lib -lXext -lX11

16
wmake/rules/darwinIntel64/c
View file

@ -1,16 +0,0 @@
.SUFFIXES: .c .h
cWARN = -Wall
cc = $(WM_CC) $(WM_CXXFLAGS)
include $(RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC -Ddarwin
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) -dynamiclib -flat_namespace -undefined suppress
LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs

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

@ -1,22 +0,0 @@
.SUFFIXES: .C .cxx .cc .cpp
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-overloaded-virtual -Wno-unsequenced -Wno-c++11-extensions -Wno-unused-comparison
CC = $(WM_CXX) $(WM_CXXFLAGS)
include $(RULES)/c++$(WM_COMPILE_OPTION)
ptFLAGS = -DNoRepository -ftemplate-depth-200
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -Ddarwin
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) -lpthread
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

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

@ -1,2 +0,0 @@
c++DBUG = -ggdb2 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

4
wmake/rules/darwinIntel64/c++Opt
View file

@ -1,4 +0,0 @@
c++DBUG =
c++OPT = -O3
#c++OPT = -march=nocona -O3
# -ftree-vectorize -ftree-vectorizer-verbose=3

2
wmake/rules/darwinIntel64/c++Prof
View file

@ -1,2 +0,0 @@
c++DBUG = -pg
c++OPT = -O2

2
wmake/rules/darwinIntel64/cDebug
View file

@ -1,2 +0,0 @@
cDBUG = -ggdb -DFULLDEBUG
cOPT = -O1 -fdefault-inline -finline-functions

2
wmake/rules/darwinIntel64/cOpt
View file

@ -1,2 +0,0 @@
cDBUG =
cOPT = -O3

2
wmake/rules/darwinIntel64/cProf
View file

@ -1,2 +0,0 @@
cDBUG = -pg
cOPT = -O2

10
wmake/rules/darwinIntel64/general
View file

@ -1,10 +0,0 @@
CPP = cpp $(GFLAGS)
LD = ld
PROJECT_LIBS = -l$(WM_PROJECT)
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++

3
wmake/rules/darwinIntel64/mplib
View file

@ -1,3 +0,0 @@
PFLAGS =
PINC =
PLIBS =

3
wmake/rules/darwinIntel64/mplibMACPORTOPENMPI
View file

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

3
wmake/rules/darwinIntel64/mplibOPENMPI
View file

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

1
wmake/rules/darwinIntel64/mplibSYSTEMOPENMPI
View file

@ -1 +0,0 @@
PFLAGS = -DOMPI_SKIP_MPICXX

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

@ -1,6 +1,6 @@
.SUFFIXES: .C .cxx .cc .cpp
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-overloaded-virtual -Wno-unsequenced -Wno-c++11-extensions -Wno-unused-comparison
CC = $(WM_CXX) $(WM_CXXFLAGS)