From b6fe187ca5534182e80f2e7276a1eea0f4d8d2b1 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 8 Jan 2013 12:54:22 +0000 Subject: [PATCH 1/3] STYLE: Minor code formatting --- .../parcels/Templates/ThermoParcel/ThermoParcelIO.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C index 7009e577ec..b2d3989135 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,7 +111,7 @@ void Foam::ThermoParcel::writeFields(const CloudType& c) { ParcelType::writeFields(c); - label np = c.size(); + label np = c.size(); IOField T(c.fieldIOobject("T", IOobject::NO_READ), np); IOField Cp(c.fieldIOobject("Cp", IOobject::NO_READ), np); From 606b1f6af2f4b4ed4253627f005a5a670a014aab Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 8 Jan 2013 12:54:45 +0000 Subject: [PATCH 2/3] BUG: Surface film now registered to time --- .../SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C index 45bb7b26a8..9284d7f0ff 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -133,7 +133,7 @@ void Foam::SurfaceFilmModel::inject(TrackData& td) // Retrieve the film model from the owner database const regionModels::surfaceFilmModels::surfaceFilmModel& filmModel = - this->owner().db().objectRegistry::template lookupObject + this->owner().mesh().time().objectRegistry::template lookupObject ( "surfaceFilmProperties" From 0437d43581756b57ab5d77265e7ee05c07f38e8b Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 8 Jan 2013 12:54:57 +0000 Subject: [PATCH 3/3] ENH: tutorial updates --- .../hotBoxes/constant/surfaceFilmProperties | 3 +++ .../rivuletPanel/constant/surfaceFilmProperties | 2 ++ 2 files changed, 5 insertions(+) diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties index 96e33c1d68..c6a1bcbfc1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties @@ -80,6 +80,9 @@ thermoSingleLayerCoeffs variance 100; } } + + zeroForcePatches + (); } injectionModels diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties index 8440f3f479..90792e87a6 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties @@ -55,6 +55,8 @@ kinematicSingleLayerCoeffs variance 100; } } + + zeroForcePatches (); } surfaceShearCoeffs