From da109eed3195f97dcf5abab68729143d2ed709a3 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 8 Dec 2010 11:51:45 +0000
Subject: [PATCH] ENH: sampledSet, sampledSurface : remove default value for
 interpolation scheme and writer

---
 .../postProcessing/sampling/sample/sampleDict     | 15 +++------------
 src/sampling/sampledSet/sampledSets/sampledSets.C | 13 ++-----------
 .../sampledSurfaces/sampledSurfaces.C             | 13 ++-----------
 3 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index 0dd02c0d58..2c7bbe35af 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  1.7.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -95,18 +95,9 @@ sets
         type        face;
         axis        x;
 
-        //- flangeHex
-        //start       (0 20  -20);
-        //end         (0 20   10);
-
-        //- nablaCavity
-        //start       (-1 0.05 0.005);
-        //end         ( 1 0.05 0.005);
-
         //- cavity
-        start       (0.001 0.5101  0.00501);
-        end         (2.01 0.5101  0.00501);
-        nPoints     10;
+        start       (0.0001 0.0525 0.00501);
+        end         (0.0999 0.0525 0.00501);
     }
 
     somePoints
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index cbe7654771..28e7a88288 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -234,17 +234,8 @@ void Foam::sampledSets::read(const dictionary& dict)
     dict_.lookup("fields") >> fieldSelection_;
     clearFieldGroups();
 
-    interpolationScheme_ = dict.lookupOrDefault<word>
-    (
-        "interpolationScheme",
-        "cell"
-    );
-    writeFormat_ = dict.lookupOrDefault<word>
-    (
-        "setFormat",
-        "null"
-    );
-
+    dict.lookup("interpolationScheme") >> interpolationScheme_;
+    dict.lookup("setFormat") >> writeFormat_;
 
     PtrList<sampledSet> newList
     (
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index cfb7cb4d96..c4fcc7663a 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -220,17 +220,8 @@ void Foam::sampledSurfaces::read(const dictionary& dict)
     dict.lookup("fields") >> fieldSelection_;
     clearFieldGroups();
 
-    interpolationScheme_ = dict.lookupOrDefault<word>
-    (
-        "interpolationScheme",
-        "cell"
-    );
-    writeFormat_ = dict.lookupOrDefault<word>
-    (
-        "surfaceFormat",
-        "null"
-    );
-
+    dict.lookup("interpolationScheme") >> interpolationScheme_;
+    dict.lookup("surfaceFormat") >> writeFormat_;
 
     // define the generic (geometry) writer
     genericFormatter_ = surfaceWriter<bool>::New(writeFormat_);