diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/run_fluid.sh b/applications/test/multiWorld/chtMultiRegionSimpleFoam/run_fluid.sh
index 37ec3a924bce13e82118bfccbbfa6209d236ae78..7cd6d2f3819ef476215816193fdc7c972eedabc6 100755
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/run_fluid.sh
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/run_fluid.sh
@@ -1,6 +1,8 @@
-#!/bin/bash
-#. /home/mattijs/OpenFOAM/OpenFOAM-plus.feature-localWorld/etc/bashrc
-. $WM_PROJECT_DIR/etc/bashrc
-#cd /home/mattijs/OpenFOAM/OpenFOAM-plus.feature-localWorld/applications/test/multiWorld/chtMultiRegionSimpleFoam
-chtMultiRegionSimpleFoam -case ./fluid -world fluid 2>&1 | tee run_fluid.log
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+#------------------------------------------------------------------------------
+
+chtMultiRegionSimpleFoam -case fluid -world fluid 2>&1 | tee run_fluid.log
read dummy
+
+#------------------------------------------------------------------------------
diff --git a/applications/test/multiWorld/chtMultiRegionSimpleFoam/run_solid.sh b/applications/test/multiWorld/chtMultiRegionSimpleFoam/run_solid.sh
index 274ab99ffdd942e52c151ab36397dab00ff4939e..6b2cd99aab1df70d8868b662675ffe4ceff95c09 100755
--- a/applications/test/multiWorld/chtMultiRegionSimpleFoam/run_solid.sh
+++ b/applications/test/multiWorld/chtMultiRegionSimpleFoam/run_solid.sh
@@ -1,6 +1,8 @@
-#!/bin/bash
-. $WM_PROJECT_DIR/etc/bashrc
-#. /home/mattijs/OpenFOAM/OpenFOAM-plus.feature-localWorld/etc/bashrc
-#cd /home/mattijs/OpenFOAM/OpenFOAM-plus.feature-localWorld/applications/test/multiWorld/chtMultiRegionSimpleFoam
-chtMultiRegionSimpleFoam -case ./solid -world solid 2>&1 | tee run_solid.log
+#!/bin/sh
+cd "${0%/*}" || exit # Run from this directory
+#------------------------------------------------------------------------------
+
+chtMultiRegionSimpleFoam -case solid -world solid 2>&1 | tee run_solid.log
read dummy
+
+#------------------------------------------------------------------------------
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
index d7b9101a62baf84323ed47e9e35f13e88910cce7..596d8d25b44b0026ec17e0a0b76e9e0a9c44eb8a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
@@ -84,7 +84,7 @@ void Foam::mappedPatchFieldBase<Type>::storeField
Pout<< "*** STORING :"
<< " field:" << fieldName
<< " values:" << flatOutput(subFld)
- << " as:" << subObr.objectPath() << endl;
+ << " as:" << subObr.objectPath() << endl;
}
mappedPatchBase::storeField
@@ -202,7 +202,7 @@ void Foam::mappedPatchFieldBase<Type>::initRetrieveField
<< flatOutput(receiveFld)
<< " from:" << flatOutput(fld)
<< " constructMap:" << flatOutput(constructMap)
- << " as:" << subObr.objectPath() << endl;
+ << " as:" << subObr.objectPath() << endl;
}
mappedPatchBase::storeField
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H
index 62c62e3da4d4aee4a0756c3c389d299de8b1f3b4..9963792117b4f9e5000fd32123db7369dd2edbe0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.H
@@ -32,13 +32,14 @@ Description
area-weighted average.
Example usage:
-
+ \verbatim
{
field T; // default is same as fvPatchField
setAverage false;
average 1.0; // only if setAverage=true
interpolationScheme cellPoint; // default is cell
}
+ \endverbatim
\table
Property | Description | Required | Default
@@ -64,7 +65,7 @@ SourceFiles
namespace Foam
{
-// Forward declarations
+// Forward Declarations
class mappedPatchBase;
template<class> class interpolation;
class mapDistribute;
@@ -203,7 +204,7 @@ public:
//- Map optional weightField (given by name) onto *this patch
virtual void mappedWeightField
- (
+ (
const word& weightFieldName,
tmp<scalarField>& thisWeights,
tmp<scalarField>& nbrWeights
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 48395a973849496326f6ed0394e314660d24ff06..626341fcd584b2ec5c8f34d0d809e039ad9e595d 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -203,7 +203,7 @@ void Foam::mappedPatchBase::collectSamples
const pointField& facePoints,
pointField& samples, // All samples
labelList& patchFaceWorlds, // Per sample: wanted world
- labelList& patchFaceProcs, // Per sample: originating processor
+ labelList& patchFaceProcs, // Per sample: originating processor
labelList& patchFaces, // Per sample: originating patchFace index
pointField& patchFc // Per sample: originating centre
) const
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
index deed76ff46840e1205e039c02a52c5a9740028f7..f47d52d09c5c6cec3fb54b3c2fd85f28b3817380 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.H
@@ -312,7 +312,7 @@ protected:
// and project them onto the face-diagonal-decomposition triangles.
tmp<pointField> facePoints(const polyPatch&) const;
- //- Collect single list of samples and originating processor+face +
+ //- Collect single list of samples and originating processor+face +
// wanted world
void collectSamples
(
diff --git a/src/optimisation/adjointOptimisation/adjoint/Make/files b/src/optimisation/adjointOptimisation/adjoint/Make/files
index 1978c62fa08bfa68a958e017089bc544b5b71f74..b18b9abec6365d1a6cfb45e9934ade9f1f3d8b79 100644
--- a/src/optimisation/adjointOptimisation/adjoint/Make/files
+++ b/src/optimisation/adjointOptimisation/adjoint/Make/files
@@ -92,10 +92,10 @@ $(NURBS)/NURBSbasis/NURBSbasis.C
$(NURBS)/NURBS3DCurve/NURBS3DCurve.C
$(NURBS)/NURBS3DSurface/NURBS3DSurface.C
NURBS3D=$(NURBS)/NURBS3DVolume
-$(NURBS3D)/controlPointsDefinition/controlPointsDefinition/controlPointsDefinition.C
-$(NURBS3D)/controlPointsDefinition/axisAligned/axisAligned.C
-$(NURBS3D)/controlPointsDefinition/fromFile/fromFile.C
-$(NURBS3D)/controlPointsDefinition/transformBox/transformBox.C
+$(NURBS3D)/controlPointsDefinition/controlPointsDefinition/controlPointsDefinition.C
+$(NURBS3D)/controlPointsDefinition/axisAligned/axisAligned.C
+$(NURBS3D)/controlPointsDefinition/fromFile/fromFile.C
+$(NURBS3D)/controlPointsDefinition/transformBox/transformBox.C
$(NURBS3D)/NURBS3DVolume/NURBS3DVolume.C
$(NURBS3D)/cartesian/NURBS3DVolumeCartesian.C
$(NURBS3D)/cylindrical/NURBS3DVolumeCylindrical.C
diff --git a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/controlDict
index 4869701b0647fdc24f5cbfd4ccc5dcb344599bb4..1d601f14cdffa893eb5e0021aa9fc48223bb6a28 100644
--- a/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/airRecirculationRoom/steady/system/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: v2011 |
+| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -53,7 +53,7 @@ functions
fieldMinMax
{
type fieldMinMax;
- functionObjectLibs (fieldFunctionObjects);
+ libs (fieldFunctionObjects);
fields ( U p T);
mode magnitude;
writeControl timeStep;