diff --git a/applications/solvers/multiphase/bubbleFoam/createPhia.H b/applications/solvers/multiphase/bubbleFoam/createPhia.H
index ac0418c5dc93bb35f67f4c730356a89e480ae8d2..2b2781d753aded5e07bd4407478e4efdac612e84 100644
--- a/applications/solvers/multiphase/bubbleFoam/createPhia.H
+++ b/applications/solvers/multiphase/bubbleFoam/createPhia.H
@@ -6,24 +6,26 @@
IOobject::NO_READ
);
-
- surfaceScalarField* phiaPtr;
+ autoPtr<surfaceScalarField> phiaPtr(NULL);
if (phiaHeader.headerOk())
{
Info<< "Reading face flux field phia\n" << endl;
- phiaPtr = new surfaceScalarField
+ phiaPtr.reset
(
- IOobject
+ new surfaceScalarField
(
- "phia",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
+ IOobject
+ (
+ "phia",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
);
}
else
@@ -44,19 +46,22 @@
}
}
- phiaPtr = new surfaceScalarField
+ phiaPtr.reset
(
- IOobject
+ new surfaceScalarField
(
- "phia",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- fvc::interpolate(Ua) & mesh.Sf(),
- phiTypes
+ IOobject
+ (
+ "phia",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ fvc::interpolate(Ua) & mesh.Sf(),
+ phiTypes
+ )
);
}
- surfaceScalarField& phia = *phiaPtr;
+ surfaceScalarField& phia = phiaPtr();
diff --git a/applications/solvers/multiphase/bubbleFoam/createPhib.H b/applications/solvers/multiphase/bubbleFoam/createPhib.H
index bdf4c46bcc44fc78cedc9c8a7e34d57c3b3839b1..84db6492b649bc05ed5f03642093b0487890029b 100644
--- a/applications/solvers/multiphase/bubbleFoam/createPhib.H
+++ b/applications/solvers/multiphase/bubbleFoam/createPhib.H
@@ -6,24 +6,26 @@
IOobject::NO_READ
);
-
- surfaceScalarField* phibPtr;
+ autoPtr<surfaceScalarField> phibPtr(NULL);
if (phibHeader.headerOk())
{
Info<< "Reading face flux field phib\n" << endl;
- phibPtr = new surfaceScalarField
+ phibPtr.reset
(
- IOobject
+ new surfaceScalarField
(
- "phib",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
+ IOobject
+ (
+ "phib",
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
+ )
);
}
else
@@ -44,19 +46,22 @@
}
}
- phibPtr = new surfaceScalarField
+ phibPtr.reset
(
- IOobject
+ new surfaceScalarField
(
- "phib",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- fvc::interpolate(Ub) & mesh.Sf(),
- phiTypes
+ IOobject
+ (
+ "phib",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ fvc::interpolate(Ub) & mesh.Sf(),
+ phiTypes
+ )
);
}
- surfaceScalarField& phib = *phibPtr;
+ surfaceScalarField& phib = phibPtr();
diff --git a/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
index f25716d0e8d2b8875eeb1494280919b2006eb7ea..4ea4c4d9899793ab2e50a136b075c1b6fb47b46e 100644
--- a/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
+++ b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
@@ -80,7 +80,7 @@ Foam::threePhaseMixture::threePhaseMixture
viscosityModel::New
(
"nu3",
- subDict(phase2Name_),
+ subDict(phase3Name_),
U,
phi
)
diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index 51965e47d61340249d1936d48da21787bb7554e9..e160fa59e8fbaf85f91fa4714f024deb8f4f54cb 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -50,9 +50,9 @@ do
done
-# set VERSION and MAJOR (version) variables if not already set
-[ -n "$ParaView_VERSION" ] || ParaView_VERSION=3.8.0
-[ -n "$ParaView_MAJOR" ] || ParaView_MAJOR=unknown
+# set VERSION and MAJOR (version) variables
+ParaView_VERSION=3.8.0
+ParaView_MAJOR=unknown
# if needed, set MAJOR version to correspond to VERSION
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
@@ -95,4 +95,5 @@ fi
unset cleaned cmake paraviewInstDir paraviewPython
+
# -----------------------------------------------------------------------------
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index a69608c9d32a55a88fc4565a2479ec725438d696..cdbe92277a00d566c761f9ba06c9bbead9b4affb 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -48,9 +48,9 @@ foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
endif
end
-# set VERSION and MAJOR (version) variables if not already set
-if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.8.0
-if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR unknown
+# set VERSION and MAJOR (version) variables
+setenv ParaView_VERSION 3.8.0
+setenv ParaView_MAJOR unknown
# if needed, set MAJOR version to correspond to VERSION
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
@@ -91,4 +91,5 @@ endif
unset cleaned cmake paraviewInstDir paraviewPython
+
# -----------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index ad866d049b7d1f4731b2b14ba013244646eb342a..e5c050b44ff804065d1a308035647d271952825b 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -32,7 +32,7 @@
#------------------------------------------------------------------------------
export WM_PROJECT=OpenFOAM
-[ -z "$WM_PROJECT_VERSION" ] && export WM_PROJECT_VERSION=dev
+export WM_PROJECT_VERSION=dev
################################################################################
# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
diff --git a/etc/cellModels b/etc/cellModels
index eb6f1b9507980263a15411bc0ba0b84ed76f9c45..a90eaa94e7227bfce45c83b9cb0995a25decaeab 100644
--- a/etc/cellModels
+++ b/etc/cellModels
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: 1.7 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/controlDict b/etc/controlDict
index 691e9701243f8512384196967f259417dfd986a2..f989950f269b3a26591d6ecb586540429e011961 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: 1.7 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/cshrc b/etc/cshrc
index 9f55d62ab625334f9d5a93dda715b9b6631d0b99..7ceff2ff58e44ae2e8fe9eafc2da590dafd91190 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -31,7 +31,7 @@
#------------------------------------------------------------------------------
setenv WM_PROJECT OpenFOAM
-if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
+setenv WM_PROJECT_VERSION dev
################################################################################
# USER EDITABLE PART. Note changes made here may be lost with the next upgrade