Commit d9931658 authored by Andrew Heather's avatar Andrew Heather
Browse files

Merge branch 'olesenm'

parents 7eae1531 1a0da12d
......@@ -35,6 +35,7 @@ core
lnInclude
# build folders - anywhere
linux*Clang*/
linux*Gcc*/
linux*Icc*/
linuxming*/
......
......@@ -325,8 +325,8 @@ void Foam::MULES::limiter
const fvMesh& mesh = psi.mesh();
const unallocLabelList& owner = mesh.owner();
const unallocLabelList& neighb = mesh.neighbour();
const labelUList& owner = mesh.owner();
const labelUList& neighb = mesh.neighbour();
tmp<volScalarField::DimensionedInternalField> tVsc = mesh.Vsc();
const scalarField& V = tVsc();
......
......@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
(list3 |= list2).printBits(Info);
}
Info<< "\noperator|= with UList<label>\n";
Info<< "\noperator|= with labelUList\n";
{
PackedBoolList list3 = list1;
(list3 |= list2Labels).printBits(Info);
......@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
(list3 += list2).printBits(Info);
}
Info<< "\noperator+= with UList<label>\n";
Info<< "\noperator+= with labelUList\n";
{
PackedBoolList list3 = list1;
(list3 += list2Labels).printBits(Info);
......@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
(list3 -= list2).printBits(Info);
}
Info<< "\noperator-= with UList<label>\n";
Info<< "\noperator-= with labelUList\n";
{
PackedBoolList list3 = list1;
(list3 -= list2Labels).printBits(Info);
......
......@@ -124,8 +124,8 @@ void Foam::fluentFvMesh::writeFluentMesh() const
fluentMeshFile
<< "))" << std::endl << std::endl;
const unallocLabelList& own = owner();
const unallocLabelList& nei = neighbour();
const labelUList& own = owner();
const labelUList& nei = neighbour();
const faceList& fcs = faces();
......
......@@ -138,7 +138,7 @@ Foam::label Foam::checkTopology
{
if (patches[patchI].coupled())
{
const unallocLabelList& owners = patches[patchI].faceCells();
const labelUList& owners = patches[patchI].faceCells();
forAll(owners, i)
{
......
......@@ -128,7 +128,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
// Distribute internal faces
labelListList newCellFaces(oldCells.size());
const unallocLabelList& oldOwnerStart = lduAddr().ownerStartAddr();
const labelUList& oldOwnerStart = lduAddr().ownerStartAddr();
forAll(newCellFaces, cellI)
{
......@@ -168,7 +168,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
curInsBouFace = false;
// Get faceCells for face insertion
const unallocLabelList& curFaceCells = curPatch.faceCells();
const labelUList& curFaceCells = curPatch.faceCells();
const label curStart = curPatch.start();
forAll(curPatch, faceI)
......
......@@ -164,7 +164,7 @@ void Foam::domainDecomposition::decomposeMesh()
// Normal patch. Add faces to processor where the cell
// next to the face lives
const unallocLabelList& patchFaceCells =
const labelUList& patchFaceCells =
patches[patchi].faceCells();
forAll(patchFaceCells, facei)
......@@ -185,9 +185,9 @@ void Foam::domainDecomposition::decomposeMesh()
patches[patchi]
);
// cyclic: check opposite side on this processor
const unallocLabelList& patchFaceCells = pp.faceCells();
const labelUList& patchFaceCells = pp.faceCells();
const unallocLabelList& nbrPatchFaceCells =
const labelUList& nbrPatchFaceCells =
pp.neighbPatch().faceCells();
forAll(patchFaceCells, facei)
......@@ -259,8 +259,8 @@ void Foam::domainDecomposition::decomposeMesh()
);
// cyclic: check opposite side on this processor
const unallocLabelList& patchFaceCells = pp.faceCells();
const unallocLabelList& nbrPatchFaceCells =
const labelUList& patchFaceCells = pp.faceCells();
const labelUList& nbrPatchFaceCells =
pp.neighbPatch().faceCells();
// Store old sizes. Used to detect which inter-proc patches
......
......@@ -30,7 +30,7 @@ License
Foam::fvFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer
(
const unallocLabelList& addressingSlice,
const labelUList& addressingSlice,
const label addressingOffset
)
:
......@@ -48,7 +48,7 @@ Foam::fvFieldDecomposer::processorVolPatchFieldDecomposer::
processorVolPatchFieldDecomposer
(
const fvMesh& mesh,
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
)
:
directAddressing_(addressingSlice.size())
......@@ -95,7 +95,7 @@ processorVolPatchFieldDecomposer
Foam::fvFieldDecomposer::processorSurfacePatchFieldDecomposer::
processorSurfacePatchFieldDecomposer
(
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
)
:
addressing_(addressingSlice.size()),
......@@ -171,7 +171,7 @@ Foam::fvFieldDecomposer::fvFieldDecomposer
processorSurfacePatchFieldDecomposerPtrs_[patchi] =
new processorSurfacePatchFieldDecomposer
(
static_cast<const unallocLabelList&>
static_cast<const labelUList&>
(
procMesh_.boundary()[patchi].patchSlice
(
......
......@@ -71,7 +71,7 @@ public:
//- Construct given addressing
patchFieldDecomposer
(
const unallocLabelList& addressingSlice,
const labelUList& addressingSlice,
const label addressingOffset
);
......@@ -88,7 +88,7 @@ public:
return true;
}
const unallocLabelList& directAddressing() const
const labelUList& directAddressing() const
{
return directAddressing_;
}
......@@ -112,7 +112,7 @@ public:
processorVolPatchFieldDecomposer
(
const fvMesh& mesh,
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
);
......@@ -128,7 +128,7 @@ public:
return true;
}
const unallocLabelList& directAddressing() const
const labelUList& directAddressing() const
{
return directAddressing_;
}
......@@ -149,7 +149,7 @@ public:
//- Construct given addressing
processorSurfacePatchFieldDecomposer
(
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
);
......
......@@ -88,7 +88,7 @@ public:
return true;
}
const unallocLabelList& directAddressing() const
const labelUList& directAddressing() const
{
return directAddressing_;
}
......
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# scotch/bashrc
#
# Description
# Setup file for scotch include/libraries.
# Sourced during wmake process only.
#
# Note
# A csh version is not needed, since the values here are only sourced
# during the wmake process
#------------------------------------------------------------------------------
export SCOTCH_VERSION=scotch_5.1.10b
export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION
# -----------------------------------------------------------------------------
......@@ -87,8 +87,7 @@ _foamSource()
# Add in preset user or site preferences:
foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh` && _foamSource $foamPrefs
unset foamPrefs
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh`
# Evaluate command-line parameters
while [ $# -gt 0 ]
......@@ -259,13 +258,8 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh
# Source user setup files for optional packages
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
paraview3=`$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/bashrc` \
&& _foamSource $paraview3
unset paraview3
ensight=`$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/bashrc` \
&& _foamSource $ensight
unset ensight
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/bashrc`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/bashrc`
# Clean environment paths again. Only remove duplicates
......
......@@ -69,14 +69,10 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
# Source files, possibly with some verbosity
alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Sourcing: \!*"; source \!*'
alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Sourcing: \!*"; if (\!* != "") source \!*'
# Add in preset user or site preferences:
set foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile prefs.csh`
if ( $status == 0 ) then
_foamSource $foamPrefs
endif
unset foamPrefs
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.csh`
# Evaluate command-line parameters
while ( $#argv > 0 )
......@@ -255,17 +251,8 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.csh
# Source user setup files for optional packages
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
set paraview3=`$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/cshrc`
if ( $status == 0 ) then
_foamSource $paraview3
endif
unset paraview3
set ensight=`$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/cshrc`
if ( $status == 0 ) then
_foamSource $ensight
endif
unset ensight
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/cshrc`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/cshrc`
# Clean environment paths again. Only remove duplicates
......
......@@ -37,6 +37,8 @@ alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
# prefix to MANPATH
alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}'
#------------------------------------------------------------------------------
# location of the jobControl directory
setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
......
......@@ -60,6 +60,7 @@ _foamAddMan()
done
}
#------------------------------------------------------------------------------
# location of the jobControl directory
export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl
......
......@@ -79,7 +79,7 @@ public:
inline static List<Keyed<T> > createList
(
const List<T>&,
const List<label>& keys
const labelUList& keys
);
......
......@@ -90,13 +90,13 @@ Foam::Keyed<T>::createList(const List<T>& lst, const label key)
template<class T>
inline Foam::List<Foam::Keyed<T> >
Foam::Keyed<T>::createList(const List<T>& lst, const List<label>& keys)
Foam::Keyed<T>::createList(const List<T>& lst, const labelUList& keys)
{
if (lst.size() != keys.size())
{
FatalErrorIn
(
"Foam::Keyed<T>::createList(const List<T>&, const List<label>&)"
"Foam::Keyed<T>::createList(const List<T>&, const labelUList&)"
)
<< "size mismatch adding keys to a list:" << nl
<< "List has size " << lst.size()
......
......@@ -65,7 +65,7 @@ public:
(
const UList<T>& posList,
const UList<T>& negList,
const UList<label>&
const labelUList&
);
//- Construct given the complete list and by transferring addressing
......@@ -100,7 +100,7 @@ public:
// Edit
//- Reset addressing
inline void resetAddressing(const UList<label>&);
inline void resetAddressing(const labelUList&);
inline void resetAddressing(const Xfer<List<label> >&);
......
......@@ -30,7 +30,7 @@ inline Foam::BiIndirectList<T>::BiIndirectList
(
const UList<T>& posList,
const UList<T>& negList,
const UList<label>& addr
const labelUList& addr
)
:
posList_(const_cast<UList<T>&>(posList)),
......@@ -94,7 +94,7 @@ inline const Foam::List<Foam::label>& Foam::BiIndirectList<T>::addressing()
template<class T>
inline void Foam::BiIndirectList<T>::resetAddressing
(
const UList<label>& addr
const labelUList& addr
)
{
addressing_ = addr;
......
......@@ -59,7 +59,7 @@ Foam::CompactListList<T, Container>::CompactListList(const List<Container>& ll)
template<class T, class Container>
Foam::CompactListList<T, Container>::CompactListList
(
const UList<label>& rowSizes
const labelUList& rowSizes
)
:
size_(rowSizes.size()),
......@@ -80,7 +80,7 @@ Foam::CompactListList<T, Container>::CompactListList
template<class T, class Container>
Foam::CompactListList<T, Container>::CompactListList
(
const UList<label>& rowSizes,
const labelUList& rowSizes,
const T& t
)
:
......@@ -178,7 +178,7 @@ void Foam::CompactListList<T, Container>::setSize
template<class T, class Container>
void Foam::CompactListList<T, Container>::setSize(const UList<label>& rowSizes)
void Foam::CompactListList<T, Container>::setSize(const labelUList& rowSizes)
{
size_ = rowSizes.size();
offsets_.setSize(rowSizes.size()+1);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment