From 3d90d53230ad9af4bc0c1ea11976f42851e1c294 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 6 Jun 2011 11:44:07 +0100 Subject: [PATCH 1/9] ENH: MakefileDirs: specify non-make command --- bin/tools/MakefileDirs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tools/MakefileDirs b/bin/tools/MakefileDirs index b67656b6e8..7dda83a399 100644 --- a/bin/tools/MakefileDirs +++ b/bin/tools/MakefileDirs @@ -36,7 +36,7 @@ application: $(FOAM_TARGETS) $(FOAM_TARGETS): - @(cd $@ && $(FOAM_APP)) + +@(cd $@ && $(FOAM_APP)) #------------------------------------------------------------------------------ From 5ebf3704528c7198ba28c91b94a0008e5b61e9ab Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 6 Jun 2011 11:45:38 +0100 Subject: [PATCH 2/9] ENH: paraFoam: filter out dlclose error --- bin/paraFoam | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/paraFoam b/bin/paraFoam index a57505f5f9..48eab6ebe0 100755 --- a/bin/paraFoam +++ b/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 From 4f4decc4b949006ee647aa129c078b5679d0b98e Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 6 Jun 2011 12:21:33 +0100 Subject: [PATCH 3/9] ENH: RunFunctions: disable scheduler for parallel run --- bin/tools/RunFunctions | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions index bc5ebb5f32..909d902b8a 100644 --- a/bin/tools/RunFunctions +++ b/bin/tools/RunFunctions @@ -62,13 +62,13 @@ runParallel() shift echo "Running $APP_RUN in parallel on $PWD using $nProcs processes" - if [ "$WM_SCHEDULER" ] - then - 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 )" - else + #if [ "$WM_SCHEDULER" ] + #then + # 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 )" + #else ( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 ) - fi + #fi fi } From fc2b2bcc9feb1efe41b398d4101db65b624d6f6b Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 6 Jun 2011 12:40:54 +0100 Subject: [PATCH 4/9] BUG: Corrected location of combustionModels --- .../lagrangian/reactingParcelFilmPyrolysisFoam/Make/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/Make/options index 7782cc45cc..49ab493077 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/Make/options +++ b/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 \ From 5b70bb7f88cb535ad54c95d1a832b30a92003022 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 6 Jun 2011 12:41:17 +0100 Subject: [PATCH 5/9] BUG: Avoid DB name clashes --- applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H | 2 +- .../solvers/lagrangian/reactingParcelFilmPyrolysisFoam/pEqn.H | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H index bbfb5be051..5c7a4ae33e 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H +++ b/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 diff --git a/applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/pEqn.H index bbfb5be051..5c7a4ae33e 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/pEqn.H +++ b/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 From 0e802a595e66dbaaba3599040b839128924e9487 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 6 Jun 2011 12:41:35 +0100 Subject: [PATCH 6/9] STYLE: Minor code formatting --- .../intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C index 81a14410a5..f11c29d554 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C @@ -130,7 +130,6 @@ Foam::ThermoCloud::ThermoCloud dimensionedScalar("zero", dimEnergy/dimTemperature, 0.0) ) ) - { if (this->solution().active()) { From ba6f1c4dd4ccc7c4f27d5b20968ff3ce5378e32c Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 6 Jun 2011 12:54:25 +0100 Subject: [PATCH 7/9] BUG: Make/options: tabulatedWallFunctions not yet built. --- .../utilities/miscellaneous/foamDebugSwitches/Make/options | 1 - 1 file changed, 1 deletion(-) diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index d307293921..99eae02e71 100644 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options +++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options @@ -62,7 +62,6 @@ EXE_LIBS = \ -lsurfaceFilmModels \ -lsurfMesh \ -lsystemCall \ - -ltabulatedWallFunctions \ -lthermalPorousZone \ -lthermophysicalFunctions \ -ltopoChangerFvMesh \ From f872a9760d3358ac3dc1771eff0069f7c6fcff25 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 6 Jun 2011 13:31:46 +0100 Subject: [PATCH 8/9] BUG: Avoid name clashes in db --- .../solvers/lagrangian/reactingParcelFilmFoam/createFields.H | 2 +- .../lagrangian/reactingParcelFilmPyrolysisFoam/createFields.H | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H index a5a87c73ef..e2db33f1f7 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H +++ b/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 ( diff --git a/applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/createFields.H index 96a3457b83..f1e152dc32 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmPyrolysisFoam/createFields.H +++ b/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 ( From d88bedb3ce66a4cd556d169eba78405430e84d11 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 6 Jun 2011 14:28:32 +0100 Subject: [PATCH 9/9] BUG: Corrected injection of new film parcel thermo particles --- .../SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C index cb0bc500a3..6a423cd5b6 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C @@ -205,6 +205,9 @@ void Foam::SurfaceFilmModel::inject(TrackData& td) tetPtI ); + // Check/set new parcel thermo properties + td.cloud().setParcelThermoProperties(*pPtr, 0.0); + setParcelProperties(*pPtr, j); // Check new parcel properties