Updates for consistency with turbulence model selection

applications/utilities/errorEstimation/simpleFoamResidual/Make/options

@@ -1,13 +1,12 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
     -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
-    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lincompressibleTransportModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
     -lfiniteVolume \
+    -lincompressibleRASModels \
+    -lincompressibleTransportModels \
     -lmeshTools

applications/utilities/errorEstimation/simpleFoamResidual/simpleFoamResidual.C

@@ -35,7 +35,7 @@ Description
 
 #include "fvCFD.H"
 #include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -88,9 +88,9 @@ int main(int argc, char *argv[])
 
             singlePhaseTransportModel laminarTransport(U, phi);
 
-            autoPtr<incompressible::turbulenceModel> turbulence
+            autoPtr<incompressible::RASModel> turbulence
             (
-                incompressible::turbulenceModel::New(U, phi, laminarTransport)
+                incompressible::RASModel::New(U, phi, laminarTransport)
             );
 
             Info<< "    Calculating uResidual" << endl;