Merge branch 'master' of ssh://hunt//home/noisy3/OpenFOAM/OpenFOAM-dev

applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H

@@ -88,7 +88,7 @@
     Info<< "Calculating field g.h\n" << endl;
     volScalarField gh("gh", g & mesh.C());
 
-    surfaceScalarField ghf("gh", g & mesh.Cf());
+    surfaceScalarField ghf("ghf", g & mesh.Cf());
 
     volScalarField p_rgh
     (

applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H

@@ -1,7 +1,7 @@
 rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
-surfaceScalarField rhorAUf(rAU.name(), fvc::interpolate(rho*rAU));
+surfaceScalarField rhorAUf(rAU.name() + 'f', fvc::interpolate(rho*rAU));
 U = rAU*UEqn.H();
 
 surfaceScalarField phiU

applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/Make/options

@@ -9,7 +9,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/combustionModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
@@ -18,6 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
+    -I$(LIB_SRC)/combustionModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/regionModels/pyrolysisModels/lnInclude \

applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/createFields.H

@@ -110,7 +110,7 @@
     Info<< "Calculating field g.h\n" << endl;
     volScalarField gh("gh", g & mesh.C());
 
-    surfaceScalarField ghf("gh", g & mesh.Cf());
+    surfaceScalarField ghf("ghf", g & mesh.Cf());
 
     volScalarField p_rgh
     (

applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/pEqn.H

@@ -1,7 +1,7 @@
 rho = thermo.rho();
 
 volScalarField rAU(1.0/UEqn.A());
-surfaceScalarField rhorAUf(rAU.name(), fvc::interpolate(rho*rAU));
+surfaceScalarField rhorAUf(rAU.name() + 'f', fvc::interpolate(rho*rAU));
 U = rAU*UEqn.H();
 
 surfaceScalarField phiU

applications/utilities/miscellaneous/foamDebugSwitches/Make/options

@@ -62,7 +62,6 @@ EXE_LIBS = \
     -lsurfaceFilmModels \
     -lsurfMesh \
     -lsystemCall \
-    -ltabulatedWallFunctions \
     -lthermalPorousZone \
     -lthermophysicalFunctions \
     -ltopoChangerFvMesh \

bin/paraFoam

@@ -229,7 +229,8 @@ else
         echo "created temporary '$caseFile'"
     }
 
-    paraview --data="$caseFile" "$@"
+    # For now filter out any ld.so errors. Caused by non-system compiler?
+    paraview --data="$caseFile" "$@" 2>&1 | fgrep -v 'Inconsistency detected by ld.so'
 fi
 
 

bin/tools/MakefileDirs

@@ -36,7 +36,7 @@
 application: $(FOAM_TARGETS)
 
 $(FOAM_TARGETS):
-	@(cd $@ && $(FOAM_APP))
+	+@(cd $@ && $(FOAM_APP))
 
 
 #------------------------------------------------------------------------------

bin/tools/RunFunctions

@@ -62,13 +62,13 @@ runParallel()
         shift
         echo "Running $APP_RUN in parallel on $PWD using $nProcs processes"
 
-        if [ "$WM_SCHEDULER" ]
+        #if [ "$WM_SCHEDULER" ]
-        then
+        #then
-            echo "$PWD: $WM_SCHEDULER -np $nProcs" 1>&2
+        #    echo "$PWD: $WM_SCHEDULER -np $nProcs" 1>&2
-            $WM_SCHEDULER -np $nProcs "( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )"
+        #    $WM_SCHEDULER -np $nProcs "( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )"
-        else
+        #else
             ( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )
-        fi
+        #fi
     fi
 }
 

src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C

@@ -130,7 +130,6 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
             dimensionedScalar("zero", dimEnergy/dimTemperature, 0.0)
         )
     )
-
 {
     if (this->solution().active())
     {

src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C

@@ -205,6 +205,9 @@ void Foam::SurfaceFilmModel<CloudType>::inject(TrackData& td)
                         tetPtI
                     );
 
+                // Check/set new parcel thermo properties
+                td.cloud().setParcelThermoProperties(*pPtr, 0.0);
+
                 setParcelProperties(*pPtr, j);
 
                 // Check new parcel properties