From 0cc8a4f81656ef5aac7ff9683a6a8e051c6ab41a Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 7 Mar 2013 12:55:52 +0000 Subject: [PATCH] ENH: Updating changes from 2.2.0 --- src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C | 2 +- src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H | 2 +- .../pyrolysisModels/reactingOneDim/reactingOneDim.C | 2 +- .../pyrolysisModels/reactingOneDim/reactingOneDim.H | 2 +- .../buoyantSimpleFoam/buoyantCavity/validation/createGraphs | 6 +++--- tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/therm.dat | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C index 3cd4874317..0c2066f686 100644 --- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C +++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H index 055965d359..dbbf3e4fa1 100644 --- a/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H +++ b/src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C index 813b16c4a6..43e2017b02 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H index c663941b44..d323f952f5 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs index 4baed11dac..d176101331 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------- # License @@ -83,7 +83,7 @@ type -P gnuplot &>/dev/null || { exit 1 } -SETSDIR="../sets" +SETSDIR="../postProcessing/sets" if [ ! -d $SETSDIR ] then @@ -93,7 +93,7 @@ fi # paths to data LATESTTIME=`ls $SETSDIR` -OFDATAROOT=../sets/$LATESTTIME +OFDATAROOT=$SETSDIR/$LATESTTIME EXPTDATAROOT=./exptData diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/therm.dat b/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/therm.dat index b0fcfd816f..acd597870e 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/therm.dat +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/therm.dat @@ -6,7 +6,7 @@ C7H16 P10/85C 7.H 16. 0. 0.G 200.000 6000.000 1000. 1 -2.49753662E-07 9.84877715E-11-2.67688904E+04-1.59096837E+01-2.25846141E+04 4 O2 ATcT06O 2. 0. 0. 0.G 200.000 6000.000 1000. 1 3.45852381E+00 1.04045351E-03-2.79664041E-07 3.11439672E-11-8.55656058E-16 2 - 1.0dev 63E+04 4.15264119E+00 3.78535371E+00-3.21928540E-03 1.12323443E-05 3 + 1.02229063E+04 4.15264119E+00 3.78535371E+00-3.21928540E-03 1.12323443E-05 3 -1.17254068E-08 4.17659585E-12 1.02922572E+04 3.27320239E+00 1.13558105E+04 4 N2 G 8/02N 2. 0. 0. 0.G 200.000 6000.000 1000. 1 2.95257637E+00 1.39690040E-03-4.92631603E-07 7.86010195E-11-4.60755204E-15 2