diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C index 345c34e27b..64be631833 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -231,11 +231,7 @@ void Foam::LocalInteraction::info(Ostream& os) << ", " << mps[i] << nl; } - if - ( - this->owner().solution().transient() - && this->owner().db().time().outputTime() - ) + if (this->outputTime()) { this->setModelProperty("nEscape", npe); this->setModelProperty("massEscape", mpe); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C index 94470c710c..b0b296dd88 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -214,11 +214,7 @@ void Foam::StandardWallInteraction::info(Ostream& os) << " - escape = " << npe << ", " << mpe << nl << " - stick = " << nps << ", " << mps << nl; - if - ( - this->owner().solution().transient() - && this->owner().db().time().outputTime() - ) + if (this->outputTime()) { this->setModelProperty("nEscape", npe); this->setModelProperty("massEscape", mpe); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C index 0732e5004e..45bb7b26a8 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C @@ -275,9 +275,30 @@ void Foam::SurfaceFilmModel::setParcelProperties template -void Foam::SurfaceFilmModel::info(Ostream& os) const +void Foam::SurfaceFilmModel::info(Ostream& os) { - // do nothing + label nTrans0 = + this->template getModelProperty