From 5a655495dc0fa05de7144b25bc28218e40b28286 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 29 Sep 2010 10:49:35 +0100
Subject: [PATCH] bubbleFoam: Cleaned-up createPhi

---
 .../multiphase/bubbleFoam/createPhia.H        | 49 ++++++++++---------
 .../multiphase/bubbleFoam/createPhib.H        | 49 ++++++++++---------
 2 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/applications/solvers/multiphase/bubbleFoam/createPhia.H b/applications/solvers/multiphase/bubbleFoam/createPhia.H
index ac0418c5dc..2b2781d753 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 bdf4c46bcc..84db6492b6 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();