diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index b3a80ede2cd312277c79f5a1f183eec1b3286aae..3cde03d85da57228690ffb68dfceccb69b0702e3 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -3,7 +3,7 @@
#+TITLE: OpenFOAM C++ Style Guide
#+AUTHOR: OpenFOAM Foundation
#+DATE: 2011-2016
-#+LINK: http://OpenFOAM.org
+#+LINK: http://OpenFOAM.com
#+OPTIONS: author:nil ^:{}
#+STARTUP: hidestars
#+STARTUP: odd
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions
index bba8feecfbaaf812a1804ed8316d9a80dc683e6a..df68b121e782788dfd15c7f734c3af09b9d715a4 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/buoyant/wallOptions
@@ -43,8 +43,8 @@ heatTransfer
type compressible::turbulentTemperatureCoupledBaffleMixed;
value ${:VALUE.T};
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
}
}
}
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions
index 81450fc91f1d206afd32344069071963fb061f60..fd2a703afab10ba8591f1ff1795df1effb1a17ca 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/fluid/compressible/wallOptions
@@ -60,8 +60,8 @@ heatTransfer
type compressible::turbulentTemperatureCoupledBaffleMixed;
value ${:VALUE.T};
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
}
}
}
diff --git a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions
index 9ea2973bff4e4d2eac255f25ae164724f6806de9..e1fed46905d76331c3da4120bb3c4f855a18982f 100644
--- a/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions
+++ b/etc/caseDicts/createZeroDirectoryTemplates/boundaryConditions/solid/wallOptions
@@ -39,8 +39,8 @@ heatTransfer
type compressible::turbulentTemperatureCoupledBaffleMixed;
value ${:VALUE.T};
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
}
}
}
diff --git a/etc/caseDicts/postProcessing/fields/CourantNo b/etc/caseDicts/postProcessing/fields/CourantNo
index 4204ba83df6c87ba5df3112b67e70c10bdba5c0a..b787de8881ebdebe8c6db3d1f591b9786ae924e3 100644
--- a/etc/caseDicts/postProcessing/fields/CourantNo
+++ b/etc/caseDicts/postProcessing/fields/CourantNo
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/MachNo b/etc/caseDicts/postProcessing/fields/MachNo
index ca02b41d6deb7c42812b843706013bcbae03f54e..624f9146020870a0a97d82f71f70b11c44daa361 100644
--- a/etc/caseDicts/postProcessing/fields/MachNo
+++ b/etc/caseDicts/postProcessing/fields/MachNo
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/PecletNo b/etc/caseDicts/postProcessing/fields/PecletNo
index 4db8558e33d766e85f0fc7540c1a869e785ed924..49aeeed4c97cde0c74dd5feda19c1225a1d7aab8 100644
--- a/etc/caseDicts/postProcessing/fields/PecletNo
+++ b/etc/caseDicts/postProcessing/fields/PecletNo
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/R b/etc/caseDicts/postProcessing/fields/R
index c85005ddc5fd71b30c2985660e7496548a7ad4e3..bb3cb05bdbb4c17f96c63b5e3c4bb1ae0fe30045 100644
--- a/etc/caseDicts/postProcessing/fields/R
+++ b/etc/caseDicts/postProcessing/fields/R
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/XiReactionRate b/etc/caseDicts/postProcessing/fields/XiReactionRate
index 7013a0d9e06a25c3d68049a8bf401654fe1d560e..19f978d7dfd0e396cad916b700c14a0b581ad919 100644
--- a/etc/caseDicts/postProcessing/fields/XiReactionRate
+++ b/etc/caseDicts/postProcessing/fields/XiReactionRate
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/components b/etc/caseDicts/postProcessing/fields/components
index e6ee7372ae9f6804d41d4a413aafd77d61f07fa7..3098e00898adc5ab82d34c98f9cc00c800cb01ee 100644
--- a/etc/caseDicts/postProcessing/fields/components
+++ b/etc/caseDicts/postProcessing/fields/components
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/div b/etc/caseDicts/postProcessing/fields/div
index c13a9e694df3c1ed5f02cc4464ef65e11c403342..450a8ff987748e8653fff73885e4c13f62095820 100644
--- a/etc/caseDicts/postProcessing/fields/div
+++ b/etc/caseDicts/postProcessing/fields/div
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/enstrophy b/etc/caseDicts/postProcessing/fields/enstrophy
index 2693f08d73b7edeeac7131e5bc6006279fb7b2e2..7a7fc19aa140ef26900aac76dba1c722e7add826 100644
--- a/etc/caseDicts/postProcessing/fields/enstrophy
+++ b/etc/caseDicts/postProcessing/fields/enstrophy
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/flowType b/etc/caseDicts/postProcessing/fields/flowType
index a242afb181840ddc4bc10735b9d6b44afd72f92b..44253d510bfdf827b7cd8c57a1d98ea171e50a05 100644
--- a/etc/caseDicts/postProcessing/fields/flowType
+++ b/etc/caseDicts/postProcessing/fields/flowType
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/grad b/etc/caseDicts/postProcessing/fields/grad
index 9e3dab749b4725a511857b94095fa24498384053..64c2b278f71a171773caebc04cc43e7c4c42bbc4 100644
--- a/etc/caseDicts/postProcessing/fields/grad
+++ b/etc/caseDicts/postProcessing/fields/grad
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/mag b/etc/caseDicts/postProcessing/fields/mag
index 5f3d448a15cc9c95d46573e119a792c0b2fa7d88..8ed2e5a7cb77572d8f04e8534e0801a8b7faa457 100644
--- a/etc/caseDicts/postProcessing/fields/mag
+++ b/etc/caseDicts/postProcessing/fields/mag
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/magSqr b/etc/caseDicts/postProcessing/fields/magSqr
index 8a1c6c8e21e2ae5554265d2d1afd67e0fba7f77c..9ffe3cc1d4386ce0d8db37c08cfedc10083f103f 100644
--- a/etc/caseDicts/postProcessing/fields/magSqr
+++ b/etc/caseDicts/postProcessing/fields/magSqr
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/randomise b/etc/caseDicts/postProcessing/fields/randomise
index 490e2b0bc4b0c1c8f5d99eeb530f0edf6a75887a..d6c36678a537c7b16e964894c76a1bbe66fcf477 100644
--- a/etc/caseDicts/postProcessing/fields/randomise
+++ b/etc/caseDicts/postProcessing/fields/randomise
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/randomise.cfg b/etc/caseDicts/postProcessing/fields/randomise.cfg
index f4a8f49f5a66964a534ff30669bc167cb6426b68..bc2a0c639479a5c19c6842b7b6db04fa1ac9b40a 100644
--- a/etc/caseDicts/postProcessing/fields/randomise.cfg
+++ b/etc/caseDicts/postProcessing/fields/randomise.cfg
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/fields/streamFunction b/etc/caseDicts/postProcessing/fields/streamFunction
index 362e8f0dbb60ed4e917f572b3d756ccd270f5569..125692f7aa3cbc55312083cb36d4981e7ca5e3f3 100644
--- a/etc/caseDicts/postProcessing/fields/streamFunction
+++ b/etc/caseDicts/postProcessing/fields/streamFunction
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/turbulenceFields b/etc/caseDicts/postProcessing/fields/turbulenceFields
index c49d351c3e1101414c8272e817b2c75f4d925209..8945cbe0eeea4ba8bd8eccb0619e58fd7f3a1d47 100644
--- a/etc/caseDicts/postProcessing/fields/turbulenceFields
+++ b/etc/caseDicts/postProcessing/fields/turbulenceFields
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/vorticity b/etc/caseDicts/postProcessing/fields/vorticity
index 78bc9763099664fa55e79ac48533db0bd7fc763d..4edd87fc948bf79b7a022f0fa23c9fa89fcb7a45 100644
--- a/etc/caseDicts/postProcessing/fields/vorticity
+++ b/etc/caseDicts/postProcessing/fields/vorticity
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/wallHeatFlux b/etc/caseDicts/postProcessing/fields/wallHeatFlux
index 9e7ef4a69bfc7ef27ea4b89f1a66f065681d637d..84a773e4643e9da1b1ccb61d28436774148abfd5 100644
--- a/etc/caseDicts/postProcessing/fields/wallHeatFlux
+++ b/etc/caseDicts/postProcessing/fields/wallHeatFlux
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/wallShearStress b/etc/caseDicts/postProcessing/fields/wallShearStress
index 95d66dfac6a620dbd814fa9512b780c11f4bec63..a1802f4fc5d1ecd32fb5e3e80dcc6a95a04a3a77 100644
--- a/etc/caseDicts/postProcessing/fields/wallShearStress
+++ b/etc/caseDicts/postProcessing/fields/wallShearStress
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/writeCellCentres b/etc/caseDicts/postProcessing/fields/writeCellCentres
index f8824910c7c37f63d81ec440b14c1f8b8af699ba..c68960077b16a0e11b131e285cc37c1c50e42402 100644
--- a/etc/caseDicts/postProcessing/fields/writeCellCentres
+++ b/etc/caseDicts/postProcessing/fields/writeCellCentres
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/writeCellVolumes b/etc/caseDicts/postProcessing/fields/writeCellVolumes
index bff6f9ec6d0e9183094c4b620fd3475a64de2f3d..23965cd7aaafa59fe6f374b0e02922709bbe6a8e 100644
--- a/etc/caseDicts/postProcessing/fields/writeCellVolumes
+++ b/etc/caseDicts/postProcessing/fields/writeCellVolumes
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/writeObjects b/etc/caseDicts/postProcessing/fields/writeObjects
index 4d43d713cce241d027519d4e68c741b1b1020279..d0e949e3393137a78c9ff87cc8c86a9c92f4e593 100644
--- a/etc/caseDicts/postProcessing/fields/writeObjects
+++ b/etc/caseDicts/postProcessing/fields/writeObjects
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/fields/yPlus b/etc/caseDicts/postProcessing/fields/yPlus
index 894971a8e552d16006a7794e2f07cf090c84b311..eeef037791985706af6ed5eec80955b6a52d97a7 100644
--- a/etc/caseDicts/postProcessing/fields/yPlus
+++ b/etc/caseDicts/postProcessing/fields/yPlus
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
index d5d71b7fc78663c0dc555c96566a8cc4a8a0ad40..132f56d75c44b1ac4a1c5fbe38372f2bad1ecdb2 100644
--- a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
+++ b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg
index 5574f2a6ddf657b953a1f48bb84fff045fee5a97..75f0e1f282eb583d71d7c04f927f124644facb7d 100644
--- a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg
+++ b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg
index 1b6fe1dc62a54548418a51dde37fbc584850b5a3..420edca39daa7afa1fda6567070d0de9a21befd2 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZone.cfg
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg
index e84c077a29f3eeb191bef2af070fb5b391ce656b..d8a92f0c07d33538e9f12c477cc3a8d76637473e 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patch.cfg
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage b/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage
index 6ab61f5f9c21d1532001edb6aa09d09a901b856c..5ad1f3ca7e59232510b312ba076d0ffb8aa19e43 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patchAverage
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate b/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate
index f2c457246870e8f454bb44700ef21db6f24f476c..e1e0efd904ca45c8fea69d4368895ebfd9f9dc97 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patchIntegrate
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg
index 2d8535259d9bfe1e10912c030ab054d0d700e736..009a1bd156022178143ddf65f113009829ef7bc8 100644
--- a/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg
+++ b/etc/caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 40a626c30fc07abce97c9e45948e7d96df06b571..97d94cadfd10d5145cbc2b9a77ffaa2e1d0f3b17 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -139,10 +139,10 @@ class functionObject
// Private Member Functions
//- Disallow default bitwise copy construct
- functionObject(const functionObject&);
+ functionObject(const functionObject&) = delete;
//- Disallow default bitwise assignment
- void operator=(const functionObject&);
+ void operator=(const functionObject&) = delete;
public:
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
index 9af84c0f87609c5eeea1494c8498c2b20d9465e4..e9be6e3487ee72f6ad37584d6b7461ead5b9381c 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
@@ -80,10 +80,11 @@ protected:
const ObjectType& lookupObject(const word& fieldName) const;
//- Store the given field in the objectRegistry under the given name
+ // Note: sets the fieldName to tfield().name() if not already set
template<class ObjectType>
bool store
(
- const word& fieldName,
+ word& fieldName,
const tmp<ObjectType>& tfield,
bool cacheable = false
);
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C
index 76327e4d20acef37f750e58810ed0d831fef4d26..5c803a73df2089628b03d1b24e36fb790d12c76e 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C
@@ -51,7 +51,7 @@ const ObjectType& Foam::functionObjects::regionFunctionObject::lookupObject
template<class ObjectType>
bool Foam::functionObjects::regionFunctionObject::store
(
- const word& fieldName,
+ word& fieldName,
const tmp<ObjectType>& tfield,
bool cacheable
)
@@ -90,6 +90,10 @@ bool Foam::functionObjects::regionFunctionObject::store
{
tfield.ref().rename(fieldName);
}
+ else
+ {
+ fieldName = tfield().name();
+ }
obr_.objectRegistry::store(tfield.ptr());
}
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
index 4b36d81b9708bd4dccdcde8fe69a5ce814c94abc..de625085cdfb9290b4bb76ed9d716ea4ff9672ab 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
@@ -54,7 +54,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class filteredLinear2Limiter Declaration
+ Class filteredLinear2Limiter Declaration
\*---------------------------------------------------------------------------*/
template<class LimiterFunc>
@@ -64,7 +64,7 @@ class filteredLinear2Limiter
{
// Private data
- // Scaling corefficient for the gradient ratio,
+ // Scaling coefficient for the gradient ratio,
// 0 = linear
// 1 = fully limited
scalar k_;
diff --git a/src/functionObjects/field/Q/Q.H b/src/functionObjects/field/Q/Q.H
index 586fd13d12d6d23351c38fca13699970a33b1f78..a40e71f758aed04daaa24b9935e92eab2af7ba24 100644
--- a/src/functionObjects/field/Q/Q.H
+++ b/src/functionObjects/field/Q/Q.H
@@ -46,7 +46,7 @@ Usage
Q1
{
type Q;
- functionObjectLibs ("libutilityFunctionObjects.so");
+ libs ("libutilityFunctionObjects.so");
...
}
\endverbatim
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index 6828d13e1399dcc7e35367fefef438dc8c512aef..c4114c0745b06a5877f3dee354f01276d1baf24f 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -135,19 +135,19 @@ void Foam::functionObjects::externalCoupled::removeReadFiles() const
Log << type() << ": removing all read files" << endl;
- forAll(regionGroupNames_, regionI)
+ forAll(regionGroupNames_, regioni)
{
- const word& compName = regionGroupNames_[regionI];
+ const word& compName = regionGroupNames_[regioni];
const labelList& groups = regionToGroups_[compName];
forAll(groups, i)
{
- label groupI = groups[i];
- const wordRe& groupName = groupNames_[groupI];
+ label groupi = groups[i];
+ const wordRe& groupName = groupNames_[groupi];
- forAll(groupReadFields_[groupI], fieldI)
+ forAll(groupReadFields_[groupi], fieldi)
{
- const word& fieldName = groupReadFields_[groupI][fieldI];
+ const word& fieldName = groupReadFields_[groupi][fieldi];
rm
(
groupDir(commsDir_, compName, groupName)
@@ -168,19 +168,19 @@ void Foam::functionObjects::externalCoupled::removeWriteFiles() const
Log << type() << ": removing all write files" << endl;
- forAll(regionGroupNames_, regionI)
+ forAll(regionGroupNames_, regioni)
{
- const word& compName = regionGroupNames_[regionI];
+ const word& compName = regionGroupNames_[regioni];
const labelList& groups = regionToGroups_[compName];
forAll(groups, i)
{
- label groupI = groups[i];
- const wordRe& groupName = groupNames_[groupI];
+ label groupi = groups[i];
+ const wordRe& groupName = groupNames_[groupi];
- forAll(groupReadFields_[groupI], fieldI)
+ forAll(groupReadFields_[groupi], fieldi)
{
- const word& fieldName = groupReadFields_[groupI][fieldI];
+ const word& fieldName = groupReadFields_[groupi][fieldi];
rm
(
groupDir(commsDir_, compName, groupName)
@@ -252,20 +252,20 @@ void Foam::functionObjects::externalCoupled::readColumns
// Read data from file and send to destination processor
- for (label procI = 0; procI < Pstream::nProcs(); procI++)
+ for (label proci = 0; proci < Pstream::nProcs(); proci++)
{
// Temporary storage
List<scalarField> values(nColumns);
- // Number of rows to read for processor procI
- label procNRows = globalFaces.localSize(procI);
+ // Number of rows to read for processor proci
+ label procNRows = globalFaces.localSize(proci);
- forAll(values, columnI)
+ forAll(values, columni)
{
- values[columnI].setSize(procNRows);
+ values[columni].setSize(procNRows);
}
- for (label rowI = 0; rowI < procNRows; rowI++)
+ for (label rowi = 0; rowi < procNRows; rowi++)
{
// Get a line
do
@@ -273,8 +273,8 @@ void Foam::functionObjects::externalCoupled::readColumns
if (!masterFilePtr().good())
{
FatalIOErrorInFunction(masterFilePtr())
- << "Trying to read data for processor " << procI
- << " row " << rowI
+ << "Trying to read data for processor " << proci
+ << " row " << rowi
<< ". Does your file have as many rows as there are"
<< " patch faces (" << globalFaces.size()
<< ") ?" << exit(FatalIOError);
@@ -285,14 +285,14 @@ void Foam::functionObjects::externalCoupled::readColumns
IStringStream lineStr(line);
- for (label columnI = 0; columnI < nColumns; columnI++)
+ for (label columni = 0; columni < nColumns; columni++)
{
- lineStr >> values[columnI][rowI];
+ lineStr >> values[columni][rowi];
}
}
- // Send to procI
- UOPstream str(procI, pBufs);
+ // Send to proci
+ UOPstream str(proci, pBufs);
str << values;
}
}
@@ -322,14 +322,14 @@ void Foam::functionObjects::externalCoupled::readLines
// Read line from file and send to destination processor
- for (label procI = 0; procI < Pstream::nProcs(); procI++)
+ for (label proci = 0; proci < Pstream::nProcs(); proci++)
{
- // Number of rows to read for processor procI
- label procNRows = globalFaces.localSize(procI);
+ // Number of rows to read for processor proci
+ label procNRows = globalFaces.localSize(proci);
- UOPstream toProc(procI, pBufs);
+ UOPstream toProc(proci, pBufs);
- for (label rowI = 0; rowI < procNRows; rowI++)
+ for (label rowi = 0; rowi < procNRows; rowi++)
{
// Get a line
do
@@ -337,8 +337,8 @@ void Foam::functionObjects::externalCoupled::readLines
if (!masterFilePtr().good())
{
FatalIOErrorInFunction(masterFilePtr())
- << "Trying to read data for processor " << procI
- << " row " << rowI
+ << "Trying to read data for processor " << proci
+ << " row " << rowi
<< ". Does your file have as many rows as there are"
<< " patch faces (" << globalFaces.size()
<< ") ?" << exit(FatalIOError);
@@ -358,7 +358,7 @@ void Foam::functionObjects::externalCoupled::readLines
// Read lines from PstreamBuffers
UIPstream str(Pstream::masterNo(), pBufs);
- for (label rowI = 0; rowI < nRows; rowI++)
+ for (label rowi = 0; rowi < nRows; rowi++)
{
string line(str);
lines << line.c_str() << nl;
@@ -399,9 +399,9 @@ void Foam::functionObjects::externalCoupled::writeGeometry
DynamicList<face> allMeshesFaces;
DynamicField<point> allMeshesPoints;
- forAll(meshes, meshI)
+ forAll(meshes, meshi)
{
- const fvMesh& mesh = meshes[meshI];
+ const fvMesh& mesh = meshes[meshi];
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
const labelList patchIDs
@@ -422,9 +422,9 @@ void Foam::functionObjects::externalCoupled::writeGeometry
{
const polyPatch& p = pbm[patchIDs[i]];
- forAll(p, pI)
+ forAll(p, pi)
{
- allFaceIDs.append(p.start()+pI);
+ allFaceIDs.append(p.start()+pi);
}
}
@@ -445,18 +445,18 @@ void Foam::functionObjects::externalCoupled::writeGeometry
uniquePointIDs
);
- label procI = Pstream::myProcNo();
+ label proci = Pstream::myProcNo();
List<pointField> collectedPoints(Pstream::nProcs());
- collectedPoints[procI] = pointField(mesh.points(), uniquePointIDs);
+ collectedPoints[proci] = pointField(mesh.points(), uniquePointIDs);
Pstream::gatherList(collectedPoints);
List<faceList> collectedFaces(Pstream::nProcs());
- faceList& patchFaces = collectedFaces[procI];
+ faceList& patchFaces = collectedFaces[proci];
patchFaces = allPatch.localFaces();
- forAll(patchFaces, faceI)
+ forAll(patchFaces, facei)
{
- inplaceRenumber(pointToGlobal, patchFaces[faceI]);
+ inplaceRenumber(pointToGlobal, patchFaces[facei]);
}
Pstream::gatherList(collectedFaces);
@@ -465,19 +465,19 @@ void Foam::functionObjects::externalCoupled::writeGeometry
// Append and renumber
label nPoints = allMeshesPoints.size();
- forAll(collectedPoints, procI)
+ forAll(collectedPoints, proci)
{
- allMeshesPoints.append(collectedPoints[procI]);
+ allMeshesPoints.append(collectedPoints[proci]);
}
face newFace;
- forAll(collectedFaces, procI)
+ forAll(collectedFaces, proci)
{
- const faceList& procFaces = collectedFaces[procI];
+ const faceList& procFaces = collectedFaces[proci];
- forAll(procFaces, faceI)
+ forAll(procFaces, facei)
{
- const face& f = procFaces[faceI];
+ const face& f = procFaces[facei];
newFace.setSize(f.size());
forAll(f, fp)
@@ -487,7 +487,7 @@ void Foam::functionObjects::externalCoupled::writeGeometry
allMeshesFaces.append(newFace);
}
- nPoints += collectedPoints[procI].size();
+ nPoints += collectedPoints[proci].size();
}
}
@@ -573,10 +573,10 @@ void Foam::functionObjects::externalCoupled::checkOrder
void Foam::functionObjects::externalCoupled::readData()
{
- forAll(regionGroupNames_, regionI)
+ forAll(regionGroupNames_, regioni)
{
- const word& compName = regionGroupNames_[regionI];
- const wordList& regionNames = regionGroupRegions_[regionI];
+ const word& compName = regionGroupNames_[regioni];
+ const wordList& regionNames = regionGroupRegions_[regioni];
// Get the meshes for the region-group
UPtrList<const fvMesh> meshes(regionNames.size());
@@ -590,13 +590,13 @@ void Foam::functionObjects::externalCoupled::readData()
forAll(groups, i)
{
- label groupI = groups[i];
- const wordRe& groupName = groupNames_[groupI];
- const wordList& fieldNames = groupReadFields_[groupI];
+ label groupi = groups[i];
+ const wordRe& groupName = groupNames_[groupi];
+ const wordList& fieldNames = groupReadFields_[groupi];
- forAll(fieldNames, fieldI)
+ forAll(fieldNames, fieldi)
{
- const word& fieldName = fieldNames[fieldI];
+ const word& fieldName = fieldNames[fieldi];
bool ok = readData<scalar>
(
@@ -643,10 +643,10 @@ void Foam::functionObjects::externalCoupled::readData()
void Foam::functionObjects::externalCoupled::writeData() const
{
- forAll(regionGroupNames_, regionI)
+ forAll(regionGroupNames_, regioni)
{
- const word& compName = regionGroupNames_[regionI];
- const wordList& regionNames = regionGroupRegions_[regionI];
+ const word& compName = regionGroupNames_[regioni];
+ const wordList& regionNames = regionGroupRegions_[regioni];
// Get the meshes for the region-group
UPtrList<const fvMesh> meshes(regionNames.size());
@@ -660,13 +660,13 @@ void Foam::functionObjects::externalCoupled::writeData() const
forAll(groups, i)
{
- label groupI = groups[i];
- const wordRe& groupName = groupNames_[groupI];
- const wordList& fieldNames = groupWriteFields_[groupI];
+ label groupi = groups[i];
+ const wordRe& groupName = groupNames_[groupi];
+ const wordList& fieldNames = groupWriteFields_[groupi];
- forAll(fieldNames, fieldI)
+ forAll(fieldNames, fieldi)
{
- const word& fieldName = fieldNames[fieldI];
+ const word& fieldName = fieldNames[fieldi];
bool ok = writeData<scalar>
(
@@ -736,8 +736,8 @@ void Foam::functionObjects::externalCoupled::initialise()
forAll(groups, i)
{
- label groupI = groups[i];
- const wordRe& groupName = groupNames_[groupI];
+ label groupi = groups[i];
+ const wordRe& groupName = groupNames_[groupi];
bool exists = false;
if (Pstream::master())
@@ -938,26 +938,26 @@ bool Foam::functionObjects::externalCoupled::read(const dictionary& dict)
if (log)
{
Info<< type() << ": Communicating with regions:" << endl;
- forAll(regionGroupNames_, rgI)
+ forAll(regionGroupNames_, rgi)
{
- //const wordList& regionNames = regionGroupRegions_[rgI];
- const word& compName = regionGroupNames_[rgI];
+ //const wordList& regionNames = regionGroupRegions_[rgi];
+ const word& compName = regionGroupNames_[rgi];
Info<< "Region: " << compName << endl << incrIndent;
const labelList& groups = regionToGroups_[compName];
forAll(groups, i)
{
- label groupI = groups[i];
- const wordRe& groupName = groupNames_[groupI];
+ label groupi = groups[i];
+ const wordRe& groupName = groupNames_[groupi];
Info<< indent << "patchGroup: " << groupName << "\t"
<< endl
<< incrIndent
<< indent << "Reading fields: "
- << groupReadFields_[groupI]
+ << groupReadFields_[groupi]
<< endl
<< indent << "Writing fields: "
- << groupWriteFields_[groupI]
+ << groupWriteFields_[groupi]
<< endl
<< decrIndent;
}
@@ -971,15 +971,15 @@ bool Foam::functionObjects::externalCoupled::read(const dictionary& dict)
// should already be written - but just make sure
if (Pstream::master())
{
- forAll(regionGroupNames_, rgI)
+ forAll(regionGroupNames_, rgi)
{
- const word& compName = regionGroupNames_[rgI];
+ const word& compName = regionGroupNames_[rgi];
const labelList& groups = regionToGroups_[compName];
forAll(groups, i)
{
- label groupI = groups[i];
- const wordRe& groupName = groupNames_[groupI];
+ label groupi = groups[i];
+ const wordRe& groupName = groupNames_[groupi];
fileName dir(groupDir(commsDir_, compName, groupName));
if (!isDir(dir))
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/functionObjects/field/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.C
index 17587fc9a55332fc10a1abf43cc35d8762d043a5..84117274b0aad20a8053bc83b49f5e03503b3cc5 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.C
@@ -126,13 +126,13 @@ void Foam::externalCoupledMixedFvPatchField<Type>::writeData
const Field<Type>& refGrad(this->refGrad());
const scalarField& valueFraction(this->valueFraction());
- forAll(refValue, faceI)
+ forAll(refValue, facei)
{
- os << this->operator[](faceI) << token::SPACE
- << snGrad[faceI] << token::SPACE
- << refValue[faceI] << token::SPACE
- << refGrad[faceI] << token::SPACE
- << valueFraction[faceI] << nl;
+ os << this->operator[](facei) << token::SPACE
+ << snGrad[facei] << token::SPACE
+ << refValue[facei] << token::SPACE
+ << refGrad[facei] << token::SPACE
+ << valueFraction[facei] << nl;
}
}
@@ -146,7 +146,7 @@ void Foam::externalCoupledMixedFvPatchField<Type>::readData(Istream& is)
string line;
- forAll(*this, faceI)
+ forAll(*this, facei)
{
iss.getLine(line);
IStringStream lineStr(line);
@@ -158,9 +158,9 @@ void Foam::externalCoupledMixedFvPatchField<Type>::readData(Istream& is)
lineStr
>> value
>> snGrad
- >> this->refValue()[faceI]
- >> this->refGrad()[faceI]
- >> this->valueFraction()[faceI];
+ >> this->refValue()[facei]
+ >> this->refGrad()[facei]
+ >> this->valueFraction()[facei];
}
}
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
index b86ada440912f02d8acb28d88f805677b0871b60..70128b880041b1a8a856df638101baebfefee17d 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
@@ -145,7 +145,7 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::writeData
Ostream& os
) const
{
- const label patchI = patch().index();
+ const label patchi = patch().index();
// Heat flux [W/m2]
scalarField qDot(this->patch().size(), 0.0);
@@ -170,17 +170,17 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::writeData
const basicThermo& thermo = turbModel.transport();
- const fvPatchScalarField& hep = thermo.he().boundaryField()[patchI];
+ const fvPatchScalarField& hep = thermo.he().boundaryField()[patchi];
- qDot = turbModel.alphaEff(patchI)*hep.snGrad();
+ qDot = turbModel.alphaEff(patchi)*hep.snGrad();
}
else if (db().foundObject<basicThermo>(thermoName))
{
const basicThermo& thermo = db().lookupObject<basicThermo>(thermoName);
- const fvPatchScalarField& hep = thermo.he().boundaryField()[patchI];
+ const fvPatchScalarField& hep = thermo.he().boundaryField()[patchi];
- qDot = thermo.alpha().boundaryField()[patchI]*hep.snGrad();
+ qDot = thermo.alpha().boundaryField()[patchi]*hep.snGrad();
}
else
{
@@ -200,12 +200,12 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::writeData
const Field<scalar>& magSf(this->patch().magSf());
- forAll(patch(), faceI)
+ forAll(patch(), facei)
{
- os << magSf[faceI] << token::SPACE
- << Tp[faceI] << token::SPACE
- << qDot[faceI] << token::SPACE
- << htc[faceI] << token::SPACE
+ os << magSf[facei] << token::SPACE
+ << Tp[facei] << token::SPACE
+ << qDot[facei] << token::SPACE
+ << htc[facei] << token::SPACE
<< nl;
}
}
@@ -222,15 +222,15 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::readData
string line;
- forAll(*this, faceI)
+ forAll(*this, facei)
{
iss.getLine(line);
IStringStream lineStr(line);
lineStr
- >> this->refValue()[faceI]
- >> this->refGrad()[faceI]
- >> this->valueFraction()[faceI];
+ >> this->refValue()[facei]
+ >> this->refGrad()[facei]
+ >> this->valueFraction()[facei];
}
}
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C b/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
index 997dfffd3e3ef894abe03a79cdea2371712e7e1a..9daa4c49dff01e34e6fd8e7fcdd34c9d32baacd1 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
@@ -110,9 +110,9 @@ bool Foam::functionObjects::externalCoupled::readData
// Handle column-wise reading of patch data. Supports most easy types
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
+ label patchi = patchIDs[i];
- if (isA<patchFieldType>(bf[patchI]))
+ if (isA<patchFieldType>(bf[patchi]))
{
// Explicit handling of externalCoupledMixed bcs - they
// have specialised reading routines.
@@ -121,7 +121,7 @@ bool Foam::functionObjects::externalCoupled::readData
(
refCast<const patchFieldType>
(
- bf[patchI]
+ bf[patchi]
)
);
@@ -129,7 +129,7 @@ bool Foam::functionObjects::externalCoupled::readData
OStringStream os;
readLines
(
- bf[patchI].size(), // number of lines to read
+ bf[patchi].size(), // number of lines to read
masterFilePtr,
os
);
@@ -141,14 +141,14 @@ bool Foam::functionObjects::externalCoupled::readData
// additional processing by derived type.
pf.patchFieldType::evaluate();
}
- else if (isA<mixedFvPatchField<Type>>(bf[patchI]))
+ else if (isA<mixedFvPatchField<Type>>(bf[patchi]))
{
// Read columns from file for
// value, snGrad, refValue, refGrad, valueFraction
List<scalarField> data;
readColumns
(
- bf[patchI].size(), // number of lines to read
+ bf[patchi].size(), // number of lines to read
4*pTraits<Type>::nComponents+1, // nColumns: 4*Type+1*scalar
masterFilePtr,
data
@@ -159,13 +159,13 @@ bool Foam::functionObjects::externalCoupled::readData
(
refCast<const mixedFvPatchField<Type>>
(
- bf[patchI]
+ bf[patchi]
)
);
// Transfer read data to bc.
// Skip value, snGrad
- direction columnI = 2*pTraits<Type>::nComponents;
+ direction columni = 2*pTraits<Type>::nComponents;
Field<Type>& refValue = pf.refValue();
for
@@ -175,7 +175,7 @@ bool Foam::functionObjects::externalCoupled::readData
cmpt++
)
{
- refValue.replace(cmpt, data[columnI++]);
+ refValue.replace(cmpt, data[columni++]);
}
Field<Type>& refGrad = pf.refGrad();
for
@@ -185,21 +185,21 @@ bool Foam::functionObjects::externalCoupled::readData
cmpt++
)
{
- refGrad.replace(cmpt, data[columnI++]);
+ refGrad.replace(cmpt, data[columni++]);
}
- pf.valueFraction() = data[columnI];
+ pf.valueFraction() = data[columni];
// Update the value from the read coefficicient. Bypass any
// additional processing by derived type.
pf.mixedFvPatchField<Type>::evaluate();
}
- else if (isA<fixedGradientFvPatchField<Type>>(bf[patchI]))
+ else if (isA<fixedGradientFvPatchField<Type>>(bf[patchi]))
{
// Read columns for value and gradient
List<scalarField> data;
readColumns
(
- bf[patchI].size(), // number of lines to read
+ bf[patchi].size(), // number of lines to read
2*pTraits<Type>::nComponents, // nColumns: Type
masterFilePtr,
data
@@ -210,7 +210,7 @@ bool Foam::functionObjects::externalCoupled::readData
(
refCast<const fixedGradientFvPatchField<Type>>
(
- bf[patchI]
+ bf[patchi]
)
);
@@ -234,20 +234,20 @@ bool Foam::functionObjects::externalCoupled::readData
// additional processing by derived type.
pf.fixedGradientFvPatchField<Type>::evaluate();
}
- else if (isA<fixedValueFvPatchField<Type>>(bf[patchI]))
+ else if (isA<fixedValueFvPatchField<Type>>(bf[patchi]))
{
// Read columns for value only
List<scalarField> data;
readColumns
(
- bf[patchI].size(), // number of lines to read
+ bf[patchi].size(), // number of lines to read
pTraits<Type>::nComponents, // number of columns to read
masterFilePtr,
data
);
// Transfer read value to bc
- Field<Type> value(bf[patchI].size());
+ Field<Type> value(bf[patchi].size());
for
(
direction cmpt = 0;
@@ -263,7 +263,7 @@ bool Foam::functionObjects::externalCoupled::readData
(
refCast<const fixedValueFvPatchField<Type>>
(
- bf[patchI]
+ bf[patchi]
)
);
@@ -276,8 +276,8 @@ bool Foam::functionObjects::externalCoupled::readData
else
{
FatalErrorInFunction
- << "Unsupported boundary condition " << bf[patchI].type()
- << " for patch " << bf[patchI].patch().name()
+ << "Unsupported boundary condition " << bf[patchi].type()
+ << " for patch " << bf[patchi].patch().name()
<< " in region " << mesh.name()
<< exit(FatalError);
}
@@ -309,24 +309,24 @@ Foam::functionObjects::externalCoupled::gatherAndCombine
if (Pstream::master())
{
// Combine values into single field
- label globalElemI = 0;
+ label globalElemi = 0;
- forAll(gatheredValues, lstI)
+ forAll(gatheredValues, lsti)
{
- globalElemI += gatheredValues[lstI].size();
+ globalElemi += gatheredValues[lsti].size();
}
- result.setSize(globalElemI);
+ result.setSize(globalElemi);
- globalElemI = 0;
+ globalElemi = 0;
- forAll(gatheredValues, lstI)
+ forAll(gatheredValues, lsti)
{
- const Field<Type>& sub = gatheredValues[lstI];
+ const Field<Type>& sub = gatheredValues[lsti];
- forAll(sub, elemI)
+ forAll(sub, elemi)
{
- result[globalElemI++] = sub[elemI];
+ result[globalElemi++] = sub[elemi];
}
}
}
@@ -408,18 +408,18 @@ bool Foam::functionObjects::externalCoupled::writeData
// Handle column-wise writing of patch data. Supports most easy types
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
+ label patchi = patchIDs[i];
- const globalIndex globalFaces(bf[patchI].size());
+ const globalIndex globalFaces(bf[patchi].size());
- if (isA<patchFieldType>(bf[patchI]))
+ if (isA<patchFieldType>(bf[patchi]))
{
// Explicit handling of externalCoupledMixed bcs - they
// have specialised writing routines
const patchFieldType& pf = refCast<const patchFieldType>
(
- bf[patchI]
+ bf[patchi]
);
OStringStream os;
@@ -438,9 +438,9 @@ bool Foam::functionObjects::externalCoupled::writeData
}
masterFilePtr() << os.str().c_str();
- for (label procI = 1; procI < Pstream::nProcs(); procI++)
+ for (label proci = 1; proci < Pstream::nProcs(); proci++)
{
- IPstream fromSlave(Pstream::scheduled, procI);
+ IPstream fromSlave(Pstream::scheduled, proci);
string str(fromSlave);
masterFilePtr() << str.c_str();
}
@@ -451,10 +451,10 @@ bool Foam::functionObjects::externalCoupled::writeData
toMaster << os.str();
}
}
- else if (isA<mixedFvPatchField<Type>>(bf[patchI]))
+ else if (isA<mixedFvPatchField<Type>>(bf[patchi]))
{
const mixedFvPatchField<Type>& pf =
- refCast<const mixedFvPatchField<Type>>(bf[patchI]);
+ refCast<const mixedFvPatchField<Type>>(bf[patchi]);
Field<Type> value(gatherAndCombine(pf));
Field<Type> snGrad(gatherAndCombine(pf.snGrad()()));
@@ -464,29 +464,29 @@ bool Foam::functionObjects::externalCoupled::writeData
if (Pstream::master())
{
- forAll(refValue, faceI)
+ forAll(refValue, facei)
{
masterFilePtr()
- << value[faceI] << token::SPACE
- << snGrad[faceI] << token::SPACE
- << refValue[faceI] << token::SPACE
- << refGrad[faceI] << token::SPACE
- << valueFraction[faceI] << nl;
+ << value[facei] << token::SPACE
+ << snGrad[facei] << token::SPACE
+ << refValue[facei] << token::SPACE
+ << refGrad[facei] << token::SPACE
+ << valueFraction[facei] << nl;
}
}
}
else
{
// Output the value and snGrad
- Field<Type> value(gatherAndCombine(bf[patchI]));
- Field<Type> snGrad(gatherAndCombine(bf[patchI].snGrad()()));
+ Field<Type> value(gatherAndCombine(bf[patchi]));
+ Field<Type> snGrad(gatherAndCombine(bf[patchi].snGrad()()));
if (Pstream::master())
{
- forAll(value, faceI)
+ forAll(value, facei)
{
masterFilePtr()
- << value[faceI] << token::SPACE
- << snGrad[faceI] << nl;
+ << value[facei] << token::SPACE
+ << snGrad[facei] << nl;
}
}
}
diff --git a/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C b/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
index d50548bc2da54e0d1111732a360a2874988a3641..691e31382117475fc2a62795661b68ac4e174aa2 100644
--- a/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
+++ b/src/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C
@@ -151,18 +151,18 @@ void Foam::functionObjects::fieldMinMax::calcMinMaxFields
{
const vectorField& Cfp = CfBoundary[patchi];
- label minPI = findMin(mfp);
- if (mfp[minPI] < minVs[proci])
+ label minPi = findMin(mfp);
+ if (mfp[minPi] < minVs[proci])
{
- minVs[proci] = mfp[minPI];
- minCs[proci] = Cfp[minPI];
+ minVs[proci] = mfp[minPi];
+ minCs[proci] = Cfp[minPi];
}
- label maxPI = findMax(mfp);
- if (mfp[maxPI] > maxVs[proci])
+ label maxPi = findMax(mfp);
+ if (mfp[maxPi] > maxVs[proci])
{
- maxVs[proci] = mfp[maxPI];
- maxCs[proci] = Cfp[maxPI];
+ maxVs[proci] = mfp[maxPi];
+ maxCs[proci] = Cfp[maxPi];
}
}
}
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
index faabae815fc9c0e1bf676be427b2748524d0017e..b2f57b2b87d562707777a122c05e22b8a4312fc5 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
@@ -89,21 +89,20 @@ void Foam::functionObjects::fieldValues::volFieldValue::initialise
void Foam::functionObjects::fieldValues::volFieldValue::writeFileHeader
(
- const label i
-)
+ Ostream& os
+) const
{
- volRegion::writeFileHeader(*this, file());
+ volRegion::writeFileHeader(*this, os);
- writeCommented(file(), "Time");
+ writeCommented(os, "Time");
forAll(fields_, fieldi)
{
- file()
- << tab << operationTypeNames_[operation_]
+ os << tab << operationTypeNames_[operation_]
<< "(" << fields_[fieldi] << ")";
}
- file() << endl;
+ os << endl;
}
@@ -122,6 +121,7 @@ Foam::functionObjects::fieldValues::volFieldValue::volFieldValue
weightFieldName_("none")
{
read(dict);
+ writeFileHeader(file());
}
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
index 69643720d8be70f1eae5f4f5a97203e3d59c8416..adb7d4dcd9aa05e7b8ffc790d13d85b4ec7ee6d7 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
@@ -189,7 +189,7 @@ protected:
) const;
//- Output file header information
- virtual void writeFileHeader(const label i);
+ virtual void writeFileHeader(Ostream& os) const;
public:
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index 80678076970d0fe1fad5900b47ccc879f967ad3a..33facd5d1393caa9400c0638d0123e9b7ca8263e 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -81,9 +81,9 @@ void Foam::functionObjects::fluxSummary::initialiseFaceZone
{
const fvMesh& mesh = refCast<const fvMesh>(obr_);
- label zoneI = mesh.faceZones().findZoneID(faceZoneName);
+ label zonei = mesh.faceZones().findZoneID(faceZoneName);
- if (zoneI == -1)
+ if (zonei == -1)
{
FatalErrorInFunction
<< "Unable to find faceZone " << faceZoneName
@@ -93,7 +93,7 @@ void Foam::functionObjects::fluxSummary::initialiseFaceZone
faceZoneNames.append(faceZoneName);
- const faceZone& fZone = mesh.faceZones()[zoneI];
+ const faceZone& fZone = mesh.faceZones()[zonei];
DynamicList<label> faceIDs(fZone.size());
DynamicList<label> facePatchIDs(fZone.size());
@@ -101,24 +101,24 @@ void Foam::functionObjects::fluxSummary::initialiseFaceZone
forAll(fZone, i)
{
- label faceI = fZone[i];
+ label facei = fZone[i];
label faceID = -1;
label facePatchID = -1;
- if (mesh.isInternalFace(faceI))
+ if (mesh.isInternalFace(facei))
{
- faceID = faceI;
+ faceID = facei;
facePatchID = -1;
}
else
{
- facePatchID = mesh.boundaryMesh().whichPatch(faceI);
+ facePatchID = mesh.boundaryMesh().whichPatch(facei);
const polyPatch& pp = mesh.boundaryMesh()[facePatchID];
if (isA<coupledPolyPatch>(pp))
{
if (refCast<const coupledPolyPatch>(pp).owner())
{
- faceID = pp.whichFace(faceI);
+ faceID = pp.whichFace(facei);
}
else
{
@@ -127,7 +127,7 @@ void Foam::functionObjects::fluxSummary::initialiseFaceZone
}
else if (!isA<emptyPolyPatch>(pp))
{
- faceID = faceI - pp.start();
+ faceID = facei - pp.start();
}
else
{
@@ -139,7 +139,7 @@ void Foam::functionObjects::fluxSummary::initialiseFaceZone
if (faceID >= 0)
{
// Orientation set by faceZone flip map
- if (fZone.flipMap()[faceI])
+ if (fZone.flipMap()[facei])
{
faceSigns.append(-1);
}
@@ -174,9 +174,9 @@ void Foam::functionObjects::fluxSummary::initialiseFaceZoneAndDirection
vector refDir = dir/(mag(dir) + ROOTVSMALL);
- label zoneI = mesh.faceZones().findZoneID(faceZoneName);
+ label zonei = mesh.faceZones().findZoneID(faceZoneName);
- if (zoneI == -1)
+ if (zonei == -1)
{
FatalErrorInFunction
<< "Unable to find faceZone " << faceZoneName
@@ -187,7 +187,7 @@ void Foam::functionObjects::fluxSummary::initialiseFaceZoneAndDirection
faceZoneNames.append(faceZoneName);
zoneRefDir.append(refDir);
- const faceZone& fZone = mesh.faceZones()[zoneI];
+ const faceZone& fZone = mesh.faceZones()[zonei];
DynamicList<label> faceIDs(fZone.size());
DynamicList<label> facePatchIDs(fZone.size());
@@ -200,24 +200,24 @@ void Foam::functionObjects::fluxSummary::initialiseFaceZoneAndDirection
forAll(fZone, i)
{
- label faceI = fZone[i];
+ label facei = fZone[i];
label faceID = -1;
label facePatchID = -1;
- if (mesh.isInternalFace(faceI))
+ if (mesh.isInternalFace(facei))
{
- faceID = faceI;
+ faceID = facei;
facePatchID = -1;
}
else
{
- facePatchID = mesh.boundaryMesh().whichPatch(faceI);
+ facePatchID = mesh.boundaryMesh().whichPatch(facei);
const polyPatch& pp = mesh.boundaryMesh()[facePatchID];
if (isA<coupledPolyPatch>(pp))
{
if (refCast<const coupledPolyPatch>(pp).owner())
{
- faceID = pp.whichFace(faceI);
+ faceID = pp.whichFace(facei);
}
else
{
@@ -226,7 +226,7 @@ void Foam::functionObjects::fluxSummary::initialiseFaceZoneAndDirection
}
else if (!isA<emptyPolyPatch>(pp))
{
- faceID = faceI - pp.start();
+ faceID = facei - pp.start();
}
else
{
@@ -283,9 +283,9 @@ void Foam::functionObjects::fluxSummary::initialiseCellZoneAndDirection
vector refDir = dir/(mag(dir) + ROOTVSMALL);
- const label cellZoneI = mesh.cellZones().findZoneID(cellZoneName);
+ const label cellZonei = mesh.cellZones().findZoneID(cellZoneName);
- if (cellZoneI == -1)
+ if (cellZonei == -1)
{
FatalErrorInFunction
<< "Unable to find cellZone " << cellZoneName
@@ -297,22 +297,22 @@ void Foam::functionObjects::fluxSummary::initialiseCellZoneAndDirection
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
labelList cellAddr(mesh.nCells(), -1);
- const labelList& cellIDs = mesh.cellZones()[cellZoneI];
+ const labelList& cellIDs = mesh.cellZones()[cellZonei];
UIndirectList<label>(cellAddr, cellIDs) = identity(cellIDs.size());
labelList nbrFaceCellAddr(mesh.nFaces() - nInternalFaces, -1);
- forAll(pbm, patchI)
+ forAll(pbm, patchi)
{
- const polyPatch& pp = pbm[patchI];
+ const polyPatch& pp = pbm[patchi];
if (pp.coupled())
{
forAll(pp, i)
{
- label faceI = pp.start() + i;
- label nbrFaceI = faceI - nInternalFaces;
- label own = mesh.faceOwner()[faceI];
- nbrFaceCellAddr[nbrFaceI] = cellAddr[own];
+ label facei = pp.start() + i;
+ label nbrFacei = facei - nInternalFaces;
+ label own = mesh.faceOwner()[facei];
+ nbrFaceCellAddr[nbrFacei] = cellAddr[own];
}
}
}
@@ -327,27 +327,27 @@ void Foam::functionObjects::fluxSummary::initialiseCellZoneAndDirection
DynamicList<scalar> faceSigns(faceIDs.size());
// Internal faces
- for (label faceI = 0; faceI < nInternalFaces; faceI++)
+ for (label facei = 0; facei < nInternalFaces; facei++)
{
- const label own = cellAddr[mesh.faceOwner()[faceI]];
- const label nbr = cellAddr[mesh.faceNeighbour()[faceI]];
+ const label own = cellAddr[mesh.faceOwner()[facei]];
+ const label nbr = cellAddr[mesh.faceNeighbour()[facei]];
if (((own != -1) && (nbr == -1)) || ((own == -1) && (nbr != -1)))
{
- vector n = mesh.faces()[faceI].normal(mesh.points());
+ vector n = mesh.faces()[facei].normal(mesh.points());
n /= mag(n) + ROOTVSMALL;
if ((n & refDir) > tolerance_)
{
- faceIDs.append(faceI);
- faceLocalPatchIDs.append(faceI);
+ faceIDs.append(facei);
+ faceLocalPatchIDs.append(facei);
facePatchIDs.append(-1);
faceSigns.append(1);
}
else if ((n & -refDir) > tolerance_)
{
- faceIDs.append(faceI);
- faceLocalPatchIDs.append(faceI);
+ faceIDs.append(facei);
+ faceLocalPatchIDs.append(facei);
facePatchIDs.append(-1);
faceSigns.append(-1);
}
@@ -355,33 +355,33 @@ void Foam::functionObjects::fluxSummary::initialiseCellZoneAndDirection
}
// Loop over boundary faces
- forAll(pbm, patchI)
+ forAll(pbm, patchi)
{
- const polyPatch& pp = pbm[patchI];
+ const polyPatch& pp = pbm[patchi];
- forAll(pp, localFaceI)
+ forAll(pp, localFacei)
{
- const label faceI = pp.start() + localFaceI;
- const label own = cellAddr[mesh.faceOwner()[faceI]];
- const label nbr = nbrFaceCellAddr[faceI - nInternalFaces];
+ const label facei = pp.start() + localFacei;
+ const label own = cellAddr[mesh.faceOwner()[facei]];
+ const label nbr = nbrFaceCellAddr[facei - nInternalFaces];
if ((own != -1) && (nbr == -1))
{
- vector n = mesh.faces()[faceI].normal(mesh.points());
+ vector n = mesh.faces()[facei].normal(mesh.points());
n /= mag(n) + ROOTVSMALL;
if ((n & refDir) > tolerance_)
{
- faceIDs.append(faceI);
- faceLocalPatchIDs.append(localFaceI);
- facePatchIDs.append(patchI);
+ faceIDs.append(facei);
+ faceLocalPatchIDs.append(localFacei);
+ facePatchIDs.append(patchi);
faceSigns.append(1);
}
else if ((n & -refDir) > tolerance_)
{
- faceIDs.append(faceI);
- faceLocalPatchIDs.append(localFaceI);
- facePatchIDs.append(patchI);
+ faceIDs.append(facei);
+ faceLocalPatchIDs.append(localFacei);
+ facePatchIDs.append(patchi);
faceSigns.append(-1);
}
}
@@ -423,26 +423,26 @@ void Foam::functionObjects::fluxSummary::initialiseCellZoneAndDirection
DynamicList<label> changedEdges;
DynamicList<patchEdgeFaceRegion> changedInfo;
- label seedFaceI = labelMax;
+ label seedFacei = labelMax;
for (; oldFaceID < patch.size(); oldFaceID++)
{
if (allFaceInfo[oldFaceID].region() == -1)
{
- seedFaceI = globalFaces.toGlobal(oldFaceID);
+ seedFacei = globalFaces.toGlobal(oldFaceID);
break;
}
}
- reduce(seedFaceI, minOp<label>());
+ reduce(seedFacei, minOp<label>());
- if (seedFaceI == labelMax)
+ if (seedFacei == labelMax)
{
break;
}
- if (globalFaces.isLocal(seedFaceI))
+ if (globalFaces.isLocal(seedFacei))
{
- label localFaceI = globalFaces.toLocal(seedFaceI);
- const labelList& fEdges = patch.faceEdges()[localFaceI];
+ label localFacei = globalFaces.toLocal(seedFacei);
+ const labelList& fEdges = patch.faceEdges()[localFacei];
forAll(fEdges, i)
{
@@ -479,9 +479,9 @@ void Foam::functionObjects::fluxSummary::initialiseCellZoneAndDirection
if (debug)
{
label nCells = 0;
- forAll(allFaceInfo, faceI)
+ forAll(allFaceInfo, facei)
{
- if (allFaceInfo[faceI].region() == regioni)
+ if (allFaceInfo[facei].region() == regioni)
{
nCells++;
}
@@ -521,7 +521,7 @@ void Foam::functionObjects::fluxSummary::initialiseCellZoneAndDirection
facePatchID.append(regionFacePatchIDs[regioni]);
faceSign.append(regionFaceSigns[regioni]);
- // Write OBJ of faces to file
+ // Write OBj of faces to file
if (debug)
{
OBJstream os(mesh.time().path()/zoneName + ".obj");
@@ -712,16 +712,16 @@ bool Foam::functionObjects::fluxSummary::read(const dictionary& dict)
{
filePtrs_.setSize(faceZoneName_.size());
- forAll(filePtrs_, fileI)
+ forAll(filePtrs_, filei)
{
- const word& fzName = faceZoneName_[fileI];
- filePtrs_.set(fileI, createFile(fzName));
+ const word& fzName = faceZoneName_[filei];
+ filePtrs_.set(filei, createFile(fzName));
writeFileHeader
(
fzName,
- faceArea_[fileI],
- refDir_[fileI],
- filePtrs_[fileI]
+ faceArea_[filei],
+ refDir_[filei],
+ filePtrs_[filei]
);
}
}
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.H b/src/functionObjects/field/fluxSummary/fluxSummary.H
index 701a3ea852ac6e6ff5c51db180306f7378da0c1f..eab9df9c24b4a4e83359307ba6a8f48600faf1a3 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.H
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.H
@@ -41,7 +41,7 @@ Usage
fluxSummary1
{
type fluxSummary;
- functionObjectLibs ("libutilityFunctionObjects.so");
+ libs ("libutilityFunctionObjects.so");
...
write yes;
log yes;
diff --git a/src/functionObjects/field/mapFields/mapFields.C b/src/functionObjects/field/mapFields/mapFields.C
index 61b94de2cb45b3b16a6739203ecbec34afc84f61..1363692d98caa9015b016452638900ba1142d1a5 100644
--- a/src/functionObjects/field/mapFields/mapFields.C
+++ b/src/functionObjects/field/mapFields/mapFields.C
@@ -87,7 +87,7 @@ void Foam::functionObjects::mapFields::createInterpolation
meshToMesh::interpolationMethodNames_[mapMethodName]
);
- // Lookup corresponding AMI method
+ // Lookup corresponding AMi method
word patchMapMethodName =
AMIPatchToPatchInterpolation::interpolationMethodToWord
(
diff --git a/src/functionObjects/field/nearWallFields/findCellParticle.C b/src/functionObjects/field/nearWallFields/findCellParticle.C
index 990b24ba9a16b322d2afe1e6eb4571ca7567466b..5f57285a2675d0460628cc5c0c9cc0d01728c951 100644
--- a/src/functionObjects/field/nearWallFields/findCellParticle.C
+++ b/src/functionObjects/field/nearWallFields/findCellParticle.C
@@ -33,12 +33,12 @@ Foam::findCellParticle::findCellParticle
const vector& position,
const label celli,
const label tetFacei,
- const label tetPtI,
+ const label tetPti,
const point& end,
const label data
)
:
- particle(mesh, position, celli, tetFacei, tetPtI),
+ particle(mesh, position, celli, tetFacei, tetPti),
end_(end),
data_(data)
{}
diff --git a/src/functionObjects/field/nearWallFields/findCellParticle.H b/src/functionObjects/field/nearWallFields/findCellParticle.H
index e239289063e7c0dae1f6dcaa31ea490cc863840e..d4bb541807d153f17bf8974118a5588bcc57b0a2 100644
--- a/src/functionObjects/field/nearWallFields/findCellParticle.H
+++ b/src/functionObjects/field/nearWallFields/findCellParticle.H
@@ -122,7 +122,7 @@ public:
const vector& position,
const label celli,
const label tetFacei,
- const label tetPtI,
+ const label tetPti,
const point& end,
const label data
);
diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.C b/src/functionObjects/field/nearWallFields/nearWallFields.C
index e8dd30f776370cc1eea860f6d0ed54881b05e7b5..697ef3a06cd2da172ee13d599e624c54c27c8e13 100644
--- a/src/functionObjects/field/nearWallFields/nearWallFields.C
+++ b/src/functionObjects/field/nearWallFields/nearWallFields.C
@@ -267,10 +267,10 @@ bool Foam::functionObjects::nearWallFields::read(const dictionary& dict)
// Convert field to map
fieldMap_.resize(2*fieldSet_.size());
reverseFieldMap_.resize(2*fieldSet_.size());
- forAll(fieldSet_, setI)
+ forAll(fieldSet_, seti)
{
- const word& fldName = fieldSet_[setI].first();
- const word& sampleFldName = fieldSet_[setI].second();
+ const word& fldName = fieldSet_[seti].first();
+ const word& sampleFldName = fieldSet_[seti].second();
fieldMap_.insert(fldName, sampleFldName);
reverseFieldMap_.insert(sampleFldName, fldName);
diff --git a/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C b/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
index 5fd52e5da15c3f3dd97d6e3094d891899f289dab..f60eb7cdc1c907f5df08c82c172826383fecdfec 100644
--- a/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
+++ b/src/functionObjects/field/reactionSensitivityAnalysis/reactionsSensitivityAnalysis.C
@@ -101,26 +101,26 @@ calculateSpeciesRR
endTime_ += dt;
- forAll(production_, specieI)
+ forAll(production_, speciei)
{
- forAll(production_[specieI], reactionI)
+ forAll(production_[speciei], reactioni)
{
- RR = basicChemistry.calculateRR(reactionI, specieI);
+ RR = basicChemistry.calculateRR(reactioni, speciei);
if (RR[0] > 0.0)
{
- production_[specieI][reactionI] = RR[0];
- productionInt_[specieI][reactionI] =+ dt*RR[0];
+ production_[speciei][reactioni] = RR[0];
+ productionInt_[speciei][reactioni] =+ dt*RR[0];
}
else if (RR[0] < 0.0)
{
- consumption_[specieI][reactionI] = RR[0];
- consumptionInt_[specieI][reactionI] =+ dt*RR[0];
+ consumption_[speciei][reactioni] = RR[0];
+ consumptionInt_[speciei][reactioni] =+ dt*RR[0];
}
else
{
- production_[specieI][reactionI] = 0.0;
- consumption_[specieI][reactionI] = 0.0;
+ production_[speciei][reactioni] = 0.0;
+ consumption_[speciei][reactioni] = 0.0;
}
}
}
@@ -143,21 +143,21 @@ writeSpeciesRR()
prodIntFilePtr_() << "start time : " << startTime_ << tab
<< "end time :" << endTime_ << nl;
- for (label reactionI = 0; reactionI < nReactions_; ++reactionI)
+ for (label reactioni = 0; reactioni < nReactions_; ++reactioni)
{
- consFilePtr_() << reactionI << tab;
- consIntFilePtr_() << reactionI << tab;
- prodFilePtr_() << reactionI << tab;
- prodIntFilePtr_() << reactionI << tab;
+ consFilePtr_() << reactioni << tab;
+ consIntFilePtr_() << reactioni << tab;
+ prodFilePtr_() << reactioni << tab;
+ prodIntFilePtr_() << reactioni << tab;
forAll(speciesNames_, i)
{
- prodFilePtr_() << production_[i][reactionI] << tab;
- consFilePtr_() << consumption_[i][reactionI] << tab;
- prodIntFilePtr_() << productionInt_[i][reactionI] << tab;
- consIntFilePtr_() << consumptionInt_[i][reactionI] << tab;
- consumptionInt_[i][reactionI] = 0.0;
- productionInt_[i][reactionI] = 0.0;
+ prodFilePtr_() << production_[i][reactioni] << tab;
+ consFilePtr_() << consumption_[i][reactioni] << tab;
+ prodIntFilePtr_() << productionInt_[i][reactioni] << tab;
+ consIntFilePtr_() << consumptionInt_[i][reactioni] << tab;
+ consumptionInt_[i][reactioni] = 0.0;
+ productionInt_[i][reactioni] = 0.0;
}
consFilePtr_() << nl;
consIntFilePtr_() << nl;
diff --git a/src/functionObjects/field/readFields/readFieldsTemplates.C b/src/functionObjects/field/readFields/readFieldsTemplates.C
index 357473ed1d9c0792f5e5de44128cac259422c178..fee32c56272a9ce7727890226de7c464f82c82bc 100644
--- a/src/functionObjects/field/readFields/readFieldsTemplates.C
+++ b/src/functionObjects/field/readFields/readFieldsTemplates.C
@@ -64,16 +64,16 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName)
{
// Store field on mesh database
Log << " Reading " << fieldName << endl;
- tmp<VolFieldType> tvf(new VolFieldType(fieldHeader, mesh_));
- regionFunctionObject::store(fieldName, tvf);
+ VolFieldType* vfPtr(new VolFieldType(fieldHeader, mesh_));
+ mesh_.objectRegistry::store(vfPtr);
return true;
}
else if (fieldHeader.typeHeaderOk<SurfaceFieldType>(false))
{
// Store field on mesh database
Log << " Reading " << fieldName << endl;
- tmp<SurfaceFieldType> tsf(new SurfaceFieldType(fieldHeader, mesh_));
- regionFunctionObject::store(fieldName, tsf);
+ SurfaceFieldType* sfPtr(new SurfaceFieldType(fieldHeader, mesh_));
+ mesh_.objectRegistry::store(sfPtr);
return true;
}
}
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index 2314f721fd8c5139c3f6dedc2d11db317ff99b49..2a823a2111647aab3575e8a6fab141285254db19 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -137,8 +137,8 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
// Knock out any cell not in patchRegions
forAll(liquidCore, celli)
{
- label regionI = regions[celli];
- if (patchRegions.found(regionI))
+ label regioni = regions[celli];
+ if (patchRegions.found(regioni))
{
backgroundAlpha[celli] = 0;
}
@@ -146,7 +146,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
{
liquidCore[celli] = 0;
- scalar regionVol = regionVolume[regionI];
+ scalar regionVol = regionVolume[regioni];
if (regionVol < maxDropletVol)
{
backgroundAlpha[celli] = 0;
@@ -598,10 +598,10 @@ bool Foam::functionObjects::regionSizeDistribution::write()
<< endl;
forAllConstIter(Map<label>, patchRegions, iter)
{
- label regionI = iter.key();
+ label regioni = iter.key();
Info<< " " << token::TAB << iter.key()
- << token::TAB << allRegionVolume[regionI]
- << token::TAB << allRegionAlphaVolume[regionI] << endl;
+ << token::TAB << allRegionVolume[regioni]
+ << token::TAB << allRegionAlphaVolume[regioni] << endl;
}
Info<< endl;
@@ -658,17 +658,17 @@ bool Foam::functionObjects::regionSizeDistribution::write()
// threshold
forAllIter(Map<scalar>, allRegionVolume, vIter)
{
- label regionI = vIter.key();
+ label regioni = vIter.key();
if
(
- patchRegions.found(regionI)
+ patchRegions.found(regioni)
|| vIter() >= maxDropletVol
- || (allRegionAlphaVolume[regionI]/vIter() < threshold_)
+ || (allRegionAlphaVolume[regioni]/vIter() < threshold_)
)
{
allRegionVolume.erase(vIter);
- allRegionAlphaVolume.erase(regionI);
- allRegionNumCells.erase(regionI);
+ allRegionAlphaVolume.erase(regioni);
+ allRegionNumCells.erase(regioni);
}
}
@@ -791,11 +791,11 @@ bool Foam::functionObjects::regionSizeDistribution::write()
<< endl;
scalar delta = 0.0;
- forAll(binDownCount, binI)
+ forAll(binDownCount, bini)
{
- Info<< " " << token::TAB << binI
+ Info<< " " << token::TAB << bini
<< token::TAB << delta
- << token::TAB << binDownCount[binI] << endl;
+ << token::TAB << binDownCount[bini] << endl;
delta += deltaX;
}
Info<< endl;
@@ -844,11 +844,11 @@ bool Foam::functionObjects::regionSizeDistribution::write()
<< endl;
scalar diam = 0.0;
- forAll(binCount, binI)
+ forAll(binCount, bini)
{
- Info<< " " << token::TAB << binI
+ Info<< " " << token::TAB << bini
<< token::TAB << diam
- << token::TAB << binCount[binI] << endl;
+ << token::TAB << binCount[bini] << endl;
diam += delta;
}
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C
index a74e76afd0eb0e24a724bb71899e63e7057cb076..6dd27d8613ef56cf11c4fcfbdf90ba0dd1d6609d 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C
@@ -41,12 +41,12 @@ Foam::Map<Type> Foam::functionObjects::regionSizeDistribution::regionSum
forAll(fld, celli)
{
- label regionI = regions[celli];
+ label regioni = regions[celli];
- typename Map<Type>::iterator fnd = regionToSum.find(regionI);
+ typename Map<Type>::iterator fnd = regionToSum.find(regioni);
if (fnd == regionToSum.end())
{
- regionToSum.insert(regionI, fld[celli]);
+ regionToSum.insert(regioni, fld[celli]);
}
else
{
diff --git a/src/functionObjects/field/streamFunction/streamFunction.C b/src/functionObjects/field/streamFunction/streamFunction.C
index f571baa16cbf253cb615c0272728f2b8bdb32e92..11ae3d05814d433ed676346b78273362d2c9c1f5 100644
--- a/src/functionObjects/field/streamFunction/streamFunction.C
+++ b/src/functionObjects/field/streamFunction/streamFunction.C
@@ -168,9 +168,9 @@ Foam::tmp<Foam::pointScalarField> Foam::functionObjects::streamFunction::calc
const cellList& c = mesh_.cells();
- forAll(c, cI)
+ forAll(c, ci)
{
- labelList zeroPoints = c[cI].labels(mesh_.faces());
+ labelList zeroPoints = c[ci].labels(mesh_.faces());
bool found = true;
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 0a564d7baf7ebf6f57a782ff4e497a10df23dae6..c6d3330591e946963e28825a354439e117856e36 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -54,12 +54,12 @@ Foam::functionObjects::streamLineBase::wallPatch() const
label nFaces = 0;
- forAll(patches, patchI)
+ forAll(patches, patchi)
{
- //if (!polyPatch::constraintType(patches[patchI].type()))
- if (isA<wallPolyPatch>(patches[patchI]))
+ //if (!polyPatch::constraintType(patches[patchi].type()))
+ if (isA<wallPolyPatch>(patches[patchi]))
{
- nFaces += patches[patchI].size();
+ nFaces += patches[patchi].size();
}
}
@@ -67,12 +67,12 @@ Foam::functionObjects::streamLineBase::wallPatch() const
nFaces = 0;
- forAll(patches, patchI)
+ forAll(patches, patchi)
{
- //if (!polyPatch::constraintType(patches[patchI].type()))
- if (isA<wallPolyPatch>(patches[patchI]))
+ //if (!polyPatch::constraintType(patches[patchi].type()))
+ if (isA<wallPolyPatch>(patches[patchi]))
{
- const polyPatch& pp = patches[patchI];
+ const polyPatch& pp = patches[patchi];
forAll(pp, i)
{
@@ -220,11 +220,11 @@ void Foam::functionObjects::streamLineBase::initInterpolations
void Foam::functionObjects::streamLineBase::storePoint
(
- const label trackI,
+ const label tracki,
const scalar w,
- const label leftI,
- const label rightI,
+ const label lefti,
+ const label righti,
DynamicList<point>& newTrack,
DynamicList<scalarList>& newScalars,
@@ -233,19 +233,19 @@ void Foam::functionObjects::streamLineBase::storePoint
{
label sz = newTrack.size();
- const List<point>& track = allTracks_[trackI];
+ const List<point>& track = allTracks_[tracki];
- newTrack.append((1.0-w)*track[leftI] + w*track[rightI]);
+ newTrack.append((1.0-w)*track[lefti] + w*track[righti]);
// Scalars
{
newScalars.append(scalarList(allScalars_.size()));
scalarList& newVals = newScalars[sz];
- forAll(allScalars_, scalarI)
+ forAll(allScalars_, scalari)
{
- const scalarList& trackVals = allScalars_[scalarI][trackI];
- newVals[scalarI] = (1.0-w)*trackVals[leftI] + w*trackVals[rightI];
+ const scalarList& trackVals = allScalars_[scalari][tracki];
+ newVals[scalari] = (1.0-w)*trackVals[lefti] + w*trackVals[righti];
}
}
@@ -254,10 +254,10 @@ void Foam::functionObjects::streamLineBase::storePoint
newVectors.append(vectorList(allVectors_.size()));
vectorList& newVals = newVectors[sz];
- forAll(allVectors_, vectorI)
+ forAll(allVectors_, vectori)
{
- const vectorList& trackVals = allVectors_[vectorI][trackI];
- newVals[vectorI] = (1.0-w)*trackVals[leftI] + w*trackVals[rightI];
+ const vectorList& trackVals = allVectors_[vectori][tracki];
+ newVals[vectori] = (1.0-w)*trackVals[lefti] + w*trackVals[righti];
}
}
}
@@ -267,24 +267,24 @@ void Foam::functionObjects::streamLineBase::storePoint
void Foam::functionObjects::streamLineBase::trimToBox
(
const treeBoundBox& bb,
- const label trackI,
+ const label tracki,
PtrList<DynamicList<point>>& newTracks,
PtrList<DynamicList<scalarList>>& newScalars,
PtrList<DynamicList<vectorList>>& newVectors
) const
{
- const List<point>& track = allTracks_[trackI];
+ const List<point>& track = allTracks_[tracki];
if (track.size())
{
for
(
- label segmentI = 1;
- segmentI < track.size();
- segmentI++
+ label segmenti = 1;
+ segmenti < track.size();
+ segmenti++
)
{
- const point& startPt = track[segmentI-1];
- const point& endPt = track[segmentI];
+ const point& startPt = track[segmenti-1];
+ const point& endPt = track[segmenti];
const vector d(endPt-startPt);
scalar magD = mag(d);
@@ -292,14 +292,14 @@ void Foam::functionObjects::streamLineBase::trimToBox
{
if (bb.contains(startPt))
{
- // Store 1.0*track[segmentI-1]+0*track[segmentI]
+ // Store 1.0*track[segmenti-1]+0*track[segmenti]
storePoint
(
- trackI,
+ tracki,
0.0,
- segmentI-1,
- segmentI,
+ segmenti-1,
+ segmenti,
newTracks.last(),
newScalars.last(),
@@ -315,11 +315,11 @@ void Foam::functionObjects::streamLineBase::trimToBox
// values
storePoint
(
- trackI,
+ tracki,
mag(clipPt-startPt)/magD,
- segmentI-1,
- segmentI,
+ segmenti-1,
+ segmenti,
newTracks.last(),
newScalars.last(),
@@ -356,11 +356,11 @@ void Foam::functionObjects::streamLineBase::trimToBox
// Store point and interpolated values
storePoint
(
- trackI,
+ tracki,
mag(clipPt-startPt)/magD,
- segmentI-1,
- segmentI,
+ segmenti-1,
+ segmenti,
newTracks.last(),
newScalars.last(),
@@ -379,11 +379,11 @@ void Foam::functionObjects::streamLineBase::trimToBox
// Store point and interpolated values
storePoint
(
- trackI,
+ tracki,
mag(clipPt-startPt)/magD,
- segmentI-1,
- segmentI,
+ segmenti-1,
+ segmenti,
newTracks.last(),
newScalars.last(),
@@ -404,7 +404,7 @@ void Foam::functionObjects::streamLineBase::trimToBox
{
storePoint
(
- trackI,
+ tracki,
1.0,
track.size()-2,
@@ -427,9 +427,9 @@ void Foam::functionObjects::streamLineBase::trimToBox(const treeBoundBox& bb)
PtrList<DynamicList<scalarList>> newScalars;
PtrList<DynamicList<vectorList>> newVectors;
- forAll(allTracks_, trackI)
+ forAll(allTracks_, tracki)
{
- const List<point>& track = allTracks_[trackI];
+ const List<point>& track = allTracks_[tracki];
if (track.size())
{
@@ -439,44 +439,44 @@ void Foam::functionObjects::streamLineBase::trimToBox(const treeBoundBox& bb)
newVectors.append(new DynamicList<vectorList>(track.size()));
// Trim, split and append to newTracks
- trimToBox(bb, trackI, newTracks, newScalars, newVectors);
+ trimToBox(bb, tracki, newTracks, newScalars, newVectors);
}
}
// Transfer newTracks to allTracks_
allTracks_.setSize(newTracks.size());
- forAll(allTracks_, trackI)
+ forAll(allTracks_, tracki)
{
- allTracks_[trackI].transfer(newTracks[trackI]);
+ allTracks_[tracki].transfer(newTracks[tracki]);
}
// Replace track scalars
- forAll(allScalars_, scalarI)
+ forAll(allScalars_, scalari)
{
- DynamicList<scalarList>& fieldVals = allScalars_[scalarI];
+ DynamicList<scalarList>& fieldVals = allScalars_[scalari];
fieldVals.setSize(newTracks.size());
- forAll(fieldVals, trackI)
+ forAll(fieldVals, tracki)
{
- scalarList& trackVals = allScalars_[scalarI][trackI];
- trackVals.setSize(newScalars[trackI].size());
- forAll(trackVals, sampleI)
+ scalarList& trackVals = allScalars_[scalari][tracki];
+ trackVals.setSize(newScalars[tracki].size());
+ forAll(trackVals, samplei)
{
- trackVals[sampleI] = newScalars[trackI][sampleI][scalarI];
+ trackVals[samplei] = newScalars[tracki][samplei][scalari];
}
}
}
// Replace track vectors
- forAll(allVectors_, vectorI)
+ forAll(allVectors_, vectori)
{
- DynamicList<vectorList>& fieldVals = allVectors_[vectorI];
+ DynamicList<vectorList>& fieldVals = allVectors_[vectori];
fieldVals.setSize(newTracks.size());
- forAll(fieldVals, trackI)
+ forAll(fieldVals, tracki)
{
- vectorList& trackVals = allVectors_[vectorI][trackI];
- trackVals.setSize(newVectors[trackI].size());
- forAll(trackVals, sampleI)
+ vectorList& trackVals = allVectors_[vectori][tracki];
+ trackVals.setSize(newVectors[tracki].size());
+ forAll(trackVals, samplei)
{
- trackVals[sampleI] = newVectors[trackI][sampleI][vectorI];
+ trackVals[samplei] = newVectors[tracki][samplei][vectori];
}
}
}
diff --git a/src/functionObjects/field/streamLine/streamLineBase.H b/src/functionObjects/field/streamLine/streamLineBase.H
index dd0083449f9cd44b58b1b8e1fe07c96cad873d7d..a87e3fd2109fb9decb105ee805da1240bd959c09 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.H
+++ b/src/functionObjects/field/streamLine/streamLineBase.H
@@ -149,11 +149,11 @@ protected:
//- Generate point and values by interpolating from existing values
void storePoint
(
- const label trackI,
+ const label tracki,
const scalar w,
- const label leftI,
- const label rightI,
+ const label lefti,
+ const label righti,
DynamicList<point>& newTrack,
DynamicList<List<scalar>>& newScalars,
@@ -164,7 +164,7 @@ protected:
void trimToBox
(
const treeBoundBox& bb,
- const label trackI,
+ const label tracki,
PtrList<DynamicList<point>>& newTracks,
PtrList<DynamicList<scalarList>>& newScalars,
PtrList<DynamicList<vectorList>>& newVectors
diff --git a/src/functionObjects/field/streamLine/streamLineParticle.C b/src/functionObjects/field/streamLine/streamLineParticle.C
index 6fba3c22ab15cc09fb91aea2c5bc8f4f952f2e4b..e88f903f8a2e08833d5ed75946a8cf63e3779064 100644
--- a/src/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/functionObjects/field/streamLine/streamLineParticle.C
@@ -70,11 +70,11 @@ Foam::vector Foam::streamLineParticle::interpolateFields
}
sampledScalars_.setSize(td.vsInterp_.size());
- forAll(td.vsInterp_, scalarI)
+ forAll(td.vsInterp_, scalari)
{
- sampledScalars_[scalarI].append
+ sampledScalars_[scalari].append
(
- td.vsInterp_[scalarI].interpolate
+ td.vsInterp_[scalari].interpolate
(
position,
celli,
@@ -84,11 +84,11 @@ Foam::vector Foam::streamLineParticle::interpolateFields
}
sampledVectors_.setSize(td.vvInterp_.size());
- forAll(td.vvInterp_, vectorI)
+ forAll(td.vvInterp_, vectori)
{
- sampledVectors_[vectorI].append
+ sampledVectors_[vectori].append
(
- td.vvInterp_[vectorI].interpolate
+ td.vvInterp_[vectori].interpolate
(
position,
celli,
diff --git a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolateTemplates.C b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolateTemplates.C
index 8a975aab22e0e5e62d23d9a703df29ee0d30d83d..8aa1aed42d525309115ce2a3867341ea54b4f75b 100644
--- a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolateTemplates.C
+++ b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolateTemplates.C
@@ -51,7 +51,7 @@ void Foam::functionObjects::surfaceInterpolate::interpolateFields()
if (fieldMap.found(fld.name()))
{
//const word sName = "interpolate(" + fld.name() + ')';
- const word& sName = fieldMap[fld.name()];
+ word& sName = fieldMap[fld.name()];
if (obr_.found(sName))
{
diff --git a/src/functionObjects/field/vorticity/vorticity.H b/src/functionObjects/field/vorticity/vorticity.H
index 82bf125da53c2d2732a5660577b0ca0216924c12..e78f72676bce191cdc756aabe65ce771c8fe7627 100644
--- a/src/functionObjects/field/vorticity/vorticity.H
+++ b/src/functionObjects/field/vorticity/vorticity.H
@@ -38,7 +38,7 @@ Usage
vorticity1
{
type vorticity;
- functionObjectLibs ("libutilityFunctionObjects.so");
+ libs ("libutilityFunctionObjects.so");
...
}
\endverbatim
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
index a4ee760a40975ebfb206eab1a29725797d87683f..1a36431ff3721b6a69db120c215b4e6c359eada9 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C
@@ -56,10 +56,10 @@ Foam::edge Foam::wallBoundedParticle::currentEdge() const
}
else
{
- label faceBasePtI = mesh_.tetBasePtIs()[tetFace()];
- label diagPtI = (faceBasePtI+diagEdge_)%f.size();
+ label faceBasePti = mesh_.tetBasePtIs()[tetFace()];
+ label diagPti = (faceBasePti+diagEdge_)%f.size();
- return edge(f[faceBasePtI], f[diagPtI]);
+ return edge(f[faceBasePti], f[diagPti]);
}
}
@@ -135,7 +135,7 @@ void Foam::wallBoundedParticle::crossDiagonalEdge()
const Foam::face& f = mesh_.faces()[tetFace()];
- // tetPtI starts from 1, goes up to f.size()-2
+ // tetPti starts from 1, goes up to f.size()-2
if (tetPt() == diagEdge_)
{
@@ -165,7 +165,7 @@ void Foam::wallBoundedParticle::crossDiagonalEdge()
Foam::scalar Foam::wallBoundedParticle::trackFaceTri
(
const vector& endPosition,
- label& minEdgeI
+ label& minEdgei
)
{
// Track p from position to endPosition
@@ -175,7 +175,7 @@ Foam::scalar Foam::wallBoundedParticle::trackFaceTri
// Check which edge intersects the trajectory.
// Project trajectory onto triangle
- minEdgeI = -1;
+ minEdgei = -1;
scalar minS = 1; // end position
edge currentE(-1, -1);
@@ -217,13 +217,13 @@ Foam::scalar Foam::wallBoundedParticle::trackFaceTri
if (s >= 0 && s < minS)
{
minS = s;
- minEdgeI = i;
+ minEdgei = i;
}
}
}
}
- if (minEdgeI != -1)
+ if (minEdgei != -1)
{
position() += minS*(endPosition-position());
}
@@ -299,12 +299,12 @@ Foam::wallBoundedParticle::wallBoundedParticle
const vector& position,
const label celli,
const label tetFacei,
- const label tetPtI,
+ const label tetPti,
const label meshEdgeStart,
const label diagEdge
)
:
- particle(mesh, position, celli, tetFacei, tetPtI),
+ particle(mesh, position, celli, tetFacei, tetPti),
meshEdgeStart_(meshEdgeStart),
diagEdge_(diagEdge)
{}
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
index 72d0c5831c0ce4bafb46f0b49f9d69d8ffedc9e1..a82b3f5b64cd0f50e10dd4a3e7849075ae831a9b 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H
@@ -112,9 +112,9 @@ protected:
//- Particle is on diagonal edge:
// const face& f = mesh.faces()[tetFace()]
- // label faceBasePtI = mesh.tetBasePtIs()[facei];
- // label diagPtI = (faceBasePtI+diagEdge_)%f.size();
- // const edge e(f[faceBasePtI], f[diagPtI]);
+ // label faceBasePti = mesh.tetBasePtIs()[facei];
+ // label diagPti = (faceBasePti+diagEdge_)%f.size();
+ // const edge e(f[faceBasePti], f[diagPti]);
label diagEdge_;
@@ -130,7 +130,7 @@ protected:
void crossDiagonalEdge();
//- Track through single triangle
- scalar trackFaceTri(const vector& endPosition, label& minEdgeI);
+ scalar trackFaceTri(const vector& endPosition, label& minEdgei);
//- Is current triangle in the track direction
bool isTriAlongTrack(const point& endPosition) const;
@@ -225,7 +225,7 @@ public:
const vector& position,
const label celli,
const label tetFacei,
- const label tetPtI,
+ const label tetPti,
const label meshEdgeStart,
const label diagEdge
);
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
index 7ee23cac58de22d33e535a47b3b8ae6445fc73a6..e4f151fe26d9169aa57e50318231a4ebe7b26534 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C
@@ -172,7 +172,7 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
: mesh_.faceOwner()[facei_]
);
// Check angle to nbrCell tet. Is it in the direction of the
- // endposition? I.e. since volume of nbr tet is positive the
+ // endposition? i.e. since volume of nbr tet is positive the
// tracking direction should be into the tet.
tetIndices nbrTi(nbrCelli, tetFacei_, tetPti_, mesh_);
if ((nbrTi.faceTri(mesh_).normal() & (endPosition-position())) < 0)
@@ -241,10 +241,10 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
if (doTrack)
{
// Track across triangle. Return triangle edge crossed.
- label triEdgeI = -1;
- trackFraction = trackFaceTri(projectedEndPosition, triEdgeI);
+ label triEdgei = -1;
+ trackFraction = trackFaceTri(projectedEndPosition, triEdgei);
- if (triEdgeI == -1)
+ if (triEdgei == -1)
{
// Reached endpoint
//checkInside();
@@ -268,7 +268,7 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
const Foam::face& f = mesh_.faces()[ti.face()];
const label fp0 = ti.faceBasePt();
- if (triEdgeI == 0)
+ if (triEdgei == 0)
{
if (ti.facePtA() == f.fcIndex(fp0))
{
@@ -305,7 +305,7 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
crossDiagonalEdge();
}
}
- else if (triEdgeI == 1)
+ else if (triEdgei == 1)
{
//Pout<< "Real edge." << endl;
diagEdge_ = -1;
@@ -314,7 +314,7 @@ Foam::scalar Foam::wallBoundedParticle::trackToEdge
crossEdgeConnectedFace(currentEdge());
patchInteraction(td, trackFraction);
}
- else // if (triEdgeI == 2)
+ else // if (triEdgei == 2)
{
if (ti.facePtB() == f.rcIndex(fp0))
{
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
index bd4c5e6ccfbfe2769fa5c33d3e19f64327241a2a..0799254290c0ebbec5348878927a975aa9debe61 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
@@ -59,7 +59,7 @@ Foam::tetIndices Foam::functionObjects::wallBoundedStreamLine::findNearestTet
const cell& cFaces = mesh_.cells()[celli];
label minFacei = -1;
- label minTetPtI = -1;
+ label minTetPti = -1;
scalar minDistSqr = sqr(GREAT);
forAll(cFaces, cFacei)
@@ -86,7 +86,7 @@ Foam::tetIndices Foam::functionObjects::wallBoundedStreamLine::findNearestTet
{
minDistSqr = d2;
minFacei = facei;
- minTetPtI = i-1;
+ minTetPti = i-1;
}
fp = nextFp;
}
@@ -98,7 +98,7 @@ Foam::tetIndices Foam::functionObjects::wallBoundedStreamLine::findNearestTet
(
celli,
minFacei,
- minTetPtI,
+ minTetPti,
mesh_
);
}
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C
index 2e54a5d5e10c64182eb7167a3f5de7df355ac5bf..82fccd411522471eb8426b9017b5f0abba749209 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C
@@ -63,11 +63,11 @@ Foam::vector Foam::wallBoundedStreamLineParticle::interpolateFields
// Store the scalar fields
sampledScalars_.setSize(td.vsInterp_.size());
- forAll(td.vsInterp_, scalarI)
+ forAll(td.vsInterp_, scalari)
{
- sampledScalars_[scalarI].append
+ sampledScalars_[scalari].append
(
- td.vsInterp_[scalarI].interpolate
+ td.vsInterp_[scalari].interpolate
(
position,
ti, //celli,
@@ -78,23 +78,23 @@ Foam::vector Foam::wallBoundedStreamLineParticle::interpolateFields
// Store the vector fields
sampledVectors_.setSize(td.vvInterp_.size());
- forAll(td.vvInterp_, vectorI)
+ forAll(td.vvInterp_, vectori)
{
vector positionU;
- if (vectorI == td.UIndex_)
+ if (vectori == td.UIndex_)
{
positionU = U;
}
else
{
- positionU = td.vvInterp_[vectorI].interpolate
+ positionU = td.vvInterp_[vectori].interpolate
(
position,
ti, //celli,
facei
);
}
- sampledVectors_[vectorI].append(positionU);
+ sampledVectors_[vectori].append(positionU);
}
}
@@ -136,7 +136,7 @@ Foam::wallBoundedStreamLineParticle::wallBoundedStreamLineParticle
const vector& position,
const label celli,
const label tetFacei,
- const label tetPtI,
+ const label tetPti,
const label meshEdgeStart,
const label diagEdge,
const label lifeTime
@@ -148,7 +148,7 @@ Foam::wallBoundedStreamLineParticle::wallBoundedStreamLineParticle
position,
celli,
tetFacei,
- tetPtI,
+ tetPti,
meshEdgeStart,
diagEdge
),
diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.H
index b0f20d18cbc74cbb7a717e03d31331bcd03d75b9..62d6a8394021a7790c2edf8571fc4404b83e8dde 100644
--- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.H
+++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.H
@@ -170,7 +170,7 @@ public:
const vector& position,
const label celli,
const label tetFacei,
- const label tetPtI,
+ const label tetPti,
const label meshEdgeStart,
const label diagEdge,
const label lifeTime
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C
index b5e0cd858aff730ceaa7423c05b9c9b9e600287b..39b4a5ed3d56326d51f0cc238796920fc7c3ab60 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.C
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.C
@@ -92,7 +92,11 @@ Foam::functionObjects::wallShearStress::wallShearStress
writeFile(mesh_, name, typeName, dict),
patchSet_()
{
- tmp<volVectorField> wallShearStressPtr
+ read(dict);
+
+ writeFileHeader(file());
+
+ volVectorField* wallShearStressPtr
(
new volVectorField
(
@@ -114,9 +118,7 @@ Foam::functionObjects::wallShearStress::wallShearStress
)
);
- store(typeName, wallShearStressPtr);
-
- read(dict);
+ mesh_.objectRegistry::store(wallShearStressPtr);
}
diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C
index 1b69f6601b4fc0254d3222f46975ec7a5fccdb76..9ee1931edb81f1a435218d38fc2700422ceb9e83 100644
--- a/src/functionObjects/field/yPlus/yPlus.C
+++ b/src/functionObjects/field/yPlus/yPlus.C
@@ -75,9 +75,11 @@ Foam::functionObjects::yPlus::yPlus
fvMeshFunctionObject(name, runTime, dict),
writeFile(obr_, name, typeName, dict)
{
+ read(dict);
+
writeFileHeader(file());
- tmp<volScalarField> tyPlusPtr
+ volScalarField* yPlusPtr
(
new volScalarField
(
@@ -94,7 +96,7 @@ Foam::functionObjects::yPlus::yPlus
)
);
- store(typeName, tyPlusPtr);
+ mesh_.objectRegistry::store(yPlusPtr);
}
diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
index de824dd2e96bd042387af8ab82c5687190216d18..dc365a131fd7a23693dba3b446f2aff3753b18c6 100644
--- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -109,24 +109,24 @@ void Foam::functionObjects::forceCoeffs::writeBinHeader
vectorField binPoints(nBin_);
writeCommented(os, "x co-ords :");
- forAll(binPoints, pointI)
+ forAll(binPoints, pointi)
{
- binPoints[pointI] = (binMin_ + (pointI + 1)*binDx_)*binDir_;
- os << tab << binPoints[pointI].x();
+ binPoints[pointi] = (binMin_ + (pointi + 1)*binDx_)*binDir_;
+ os << tab << binPoints[pointi].x();
}
os << nl;
writeCommented(os, "y co-ords :");
- forAll(binPoints, pointI)
+ forAll(binPoints, pointi)
{
- os << tab << binPoints[pointI].y();
+ os << tab << binPoints[pointi].y();
}
os << nl;
writeCommented(os, "z co-ords :");
- forAll(binPoints, pointI)
+ forAll(binPoints, pointi)
{
- os << tab << binPoints[pointI].z();
+ os << tab << binPoints[pointi].z();
}
os << nl;
@@ -186,15 +186,15 @@ void Foam::functionObjects::forceCoeffs::writeBinData
{
os << obr_.time().value();
- for (label binI = 0; binI < nBin_; binI++)
+ for (label bini = 0; bini < nBin_; bini++)
{
- scalar total = coeffs[0][binI] + coeffs[1][binI] + coeffs[2][binI];
+ scalar total = coeffs[0][bini] + coeffs[1][bini] + coeffs[2][bini];
- os << tab << total << tab << coeffs[0][binI] << tab << coeffs[1][binI];
+ os << tab << total << tab << coeffs[0][bini] << tab << coeffs[1][bini];
if (porosity_)
{
- os << tab << coeffs[2][binI];
+ os << tab << coeffs[2][bini];
}
}
@@ -256,7 +256,7 @@ bool Foam::functionObjects::forceCoeffs::read(const dictionary& dict)
{
const fvMesh& mesh = refCast<const fvMesh>(obr_);
- tmp<volVectorField> tforceCoeff
+ volVectorField* forceCoeffPtr
(
new volVectorField
(
@@ -273,9 +273,9 @@ bool Foam::functionObjects::forceCoeffs::read(const dictionary& dict)
)
);
- store(tforceCoeff().name(), tforceCoeff);
+ mesh_.objectRegistry::store(forceCoeffPtr);
- tmp<volVectorField> tmomentCoeff
+ volVectorField* momentCoeffPtr
(
new volVectorField
(
@@ -292,7 +292,7 @@ bool Foam::functionObjects::forceCoeffs::read(const dictionary& dict)
)
);
- store(tmomentCoeff().name(), tmomentCoeff);
+ mesh_.objectRegistry::store(momentCoeffPtr);
}
return true;
@@ -361,11 +361,11 @@ bool Foam::functionObjects::forceCoeffs::execute()
{
forAll(liftCoeffs, i)
{
- for (label binI = 1; binI < nBin_; binI++)
+ for (label bini = 1; bini < nBin_; bini++)
{
- liftCoeffs[i][binI] += liftCoeffs[i][binI-1];
- dragCoeffs[i][binI] += dragCoeffs[i][binI-1];
- momentCoeffs[i][binI] += momentCoeffs[i][binI-1];
+ liftCoeffs[i][bini] += liftCoeffs[i][bini-1];
+ dragCoeffs[i][bini] += dragCoeffs[i][bini-1];
+ momentCoeffs[i][bini] += momentCoeffs[i][bini-1];
}
}
}
diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C
index 371569f6807fbfd75c38716319aa1b8f91128ea8..1a7018fb4cab8a1fef900d68a021182d0ba12970 100644
--- a/src/functionObjects/forces/forces/forces.C
+++ b/src/functionObjects/forces/forces/forces.C
@@ -126,24 +126,24 @@ void Foam::functionObjects::forces::writeBinHeader
vectorField binPoints(nBin_);
writeCommented(os, "x co-ords :");
- forAll(binPoints, pointI)
+ forAll(binPoints, pointi)
{
- binPoints[pointI] = (binMin_ + (pointI + 1)*binDx_)*binDir_;
- os << tab << binPoints[pointI].x();
+ binPoints[pointi] = (binMin_ + (pointi + 1)*binDx_)*binDir_;
+ os << tab << binPoints[pointi].x();
}
os << nl;
writeCommented(os, "y co-ords :");
- forAll(binPoints, pointI)
+ forAll(binPoints, pointi)
{
- os << tab << binPoints[pointI].y();
+ os << tab << binPoints[pointi].y();
}
os << nl;
writeCommented(os, "z co-ords :");
- forAll(binPoints, pointI)
+ forAll(binPoints, pointi)
{
- os << tab << binPoints[pointI].z();
+ os << tab << binPoints[pointi].z();
}
os << nl;
@@ -223,8 +223,8 @@ void Foam::functionObjects::forces::initialiseBins()
scalar binMax = -GREAT;
forAllConstIter(labelHashSet, patchSet_, iter)
{
- label patchI = iter.key();
- const polyPatch& pp = pbm[patchI];
+ label patchi = iter.key();
+ const polyPatch& pp = pbm[patchi];
scalarField d(pp.faceCentres() & binDir_);
binMin_ = min(min(d), binMin_);
binMax = max(max(d), binMax);
@@ -245,8 +245,8 @@ void Foam::functionObjects::forces::initialiseBins()
forAll(cellZoneIDs, i)
{
- label zoneI = cellZoneIDs[i];
- const cellZone& cZone = mesh_.cellZones()[zoneI];
+ label zonei = cellZoneIDs[i];
+ const cellZone& cZone = mesh_.cellZones()[zonei];
const scalarField d(dd, cZone);
binMin_ = min(min(d), binMin_);
binMax = max(max(d), binMax);
@@ -497,7 +497,7 @@ void Foam::functionObjects::forces::applyBins
void Foam::functionObjects::forces::addToFields
(
- const label patchI,
+ const label patchi,
const vectorField& Md,
const vectorField& fN,
const vectorField& fT,
@@ -515,7 +515,7 @@ void Foam::functionObjects::forces::addToFields
lookupObject<volVectorField>(fieldName("force"))
);
- vectorField& pf = force.boundaryFieldRef()[patchI];
+ vectorField& pf = force.boundaryFieldRef()[patchi];
pf += fN + fT + fP;
volVectorField& moment =
@@ -524,7 +524,7 @@ void Foam::functionObjects::forces::addToFields
lookupObject<volVectorField>(fieldName("moment"))
);
- vectorField& pm = moment.boundaryFieldRef()[patchI];
+ vectorField& pm = moment.boundaryFieldRef()[patchi];
pm += Md;
}
@@ -557,9 +557,9 @@ void Foam::functionObjects::forces::addToFields
forAll(cellIDs, i)
{
- label cellI = cellIDs[i];
- force[cellI] += fN[i] + fT[i] + fP[i];
- moment[cellI] += Md[i];
+ label celli = cellIDs[i];
+ force[celli] += fN[i] + fT[i] + fP[i];
+ moment[celli] += Md[i];
}
}
@@ -934,7 +934,7 @@ bool Foam::functionObjects::forces::read(const dictionary& dict)
{
Info << " Fields will be written" << endl;
- tmp<volVectorField> tforce
+ volVectorField* forcePtr
(
new volVectorField
(
@@ -951,9 +951,9 @@ bool Foam::functionObjects::forces::read(const dictionary& dict)
)
);
- store(tforce().name(), tforce);
+ mesh_.objectRegistry::store(forcePtr);
- tmp<volVectorField> tmoment
+ volVectorField* momentPtr
(
new volVectorField
(
@@ -970,7 +970,7 @@ bool Foam::functionObjects::forces::read(const dictionary& dict)
)
);
- store(tmoment().name(), tmoment);
+ mesh_.objectRegistry::store(momentPtr);
}
return true;
@@ -991,33 +991,33 @@ void Foam::functionObjects::forces::calcForcesMoment()
forAllConstIter(labelHashSet, patchSet_, iter)
{
- label patchI = iter.key();
+ label patchi = iter.key();
vectorField Md
(
- mesh_.C().boundaryField()[patchI] - coordSys_.origin()
+ mesh_.C().boundaryField()[patchi] - coordSys_.origin()
);
- scalarField sA(mag(Sfb[patchI]));
+ scalarField sA(mag(Sfb[patchi]));
// Normal force = surfaceUnitNormal*(surfaceNormal & forceDensity)
vectorField fN
(
- Sfb[patchI]/sA
+ Sfb[patchi]/sA
*(
- Sfb[patchI] & fD.boundaryField()[patchI]
+ Sfb[patchi] & fD.boundaryField()[patchi]
)
);
// Tangential force (total force minus normal fN)
- vectorField fT(sA*fD.boundaryField()[patchI] - fN);
+ vectorField fT(sA*fD.boundaryField()[patchi] - fN);
// Porous force
vectorField fP(Md.size(), Zero);
- addToFields(patchI, Md, fN, fT, fP);
+ addToFields(patchi, Md, fN, fT, fP);
- applyBins(Md, fN, fT, fP, mesh_.C().boundaryField()[patchI]);
+ applyBins(Md, fN, fT, fP, mesh_.C().boundaryField()[patchi]);
}
}
else
@@ -1035,25 +1035,25 @@ void Foam::functionObjects::forces::calcForcesMoment()
forAllConstIter(labelHashSet, patchSet_, iter)
{
- label patchI = iter.key();
+ label patchi = iter.key();
vectorField Md
(
- mesh_.C().boundaryField()[patchI] - coordSys_.origin()
+ mesh_.C().boundaryField()[patchi] - coordSys_.origin()
);
vectorField fN
(
- rho(p)*Sfb[patchI]*(p.boundaryField()[patchI] - pRef)
+ rho(p)*Sfb[patchi]*(p.boundaryField()[patchi] - pRef)
);
- vectorField fT(Sfb[patchI] & devRhoReffb[patchI]);
+ vectorField fT(Sfb[patchi] & devRhoReffb[patchi]);
vectorField fP(Md.size(), Zero);
- addToFields(patchI, Md, fN, fT, fP);
+ addToFields(patchi, Md, fN, fT, fP);
- applyBins(Md, fN, fT, fP, mesh_.C().boundaryField()[patchI]);
+ applyBins(Md, fN, fT, fP, mesh_.C().boundaryField()[patchi]);
}
}
@@ -1085,8 +1085,8 @@ void Foam::functionObjects::forces::calcForcesMoment()
forAll(cellZoneIDs, i)
{
- label zoneI = cellZoneIDs[i];
- const cellZone& cZone = mesh_.cellZones()[zoneI];
+ label zonei = cellZoneIDs[i];
+ const cellZone& cZone = mesh_.cellZones()[zonei];
const vectorField d(mesh_.C(), cZone);
const vectorField fP(fPTot, cZone);
diff --git a/src/functionObjects/forces/forces/forces.H b/src/functionObjects/forces/forces/forces.H
index 2d6b1eff94ca1f9c4c36512f7a7d646d17ec2eb8..0bc8ab395481f1c3c9ac5b1e75cf8a5fcbd27f54 100644
--- a/src/functionObjects/forces/forces/forces.H
+++ b/src/functionObjects/forces/forces/forces.H
@@ -305,7 +305,7 @@ protected:
//- Add patch contributions to force and moment fields
void addToFields
(
- const label patchI,
+ const label patchi,
const vectorField& Md,
const vectorField& fN,
const vectorField& fT,
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pathline.C b/src/functionObjects/graphics/runTimePostProcessing/pathline.C
index 7cba153645ababd5fb3751cddc5dc4a879cb6118..aba780e5ed9741ebba4eeb98658ecf443a4d5c41 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pathline.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/pathline.C
@@ -75,14 +75,14 @@ const Foam::NamedEnum
void Foam::functionObjects::runTimePostPro::pathline::addLines
(
- const label frameI,
+ const label framei,
vtkActor* actor,
vtkPolyData* data
) const
{
geometryBase::initialiseActor(actor);
- vector colour = lineColour_->value(frameI);
+ vector colour = lineColour_->value(framei);
actor->GetProperty()->SetColor(colour[0], colour[1], colour[2]);
vtkPolyDataMapper* mapper =
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pathline.H b/src/functionObjects/graphics/runTimePostProcessing/pathline.H
index 20d21f872366c19c811e9389176b4769fba87060..209a2887cd80840633f2d155026195f9e792ef99 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pathline.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/pathline.H
@@ -104,7 +104,7 @@ protected:
//- Add the pathlines to the renderer
void addLines
(
- const label frameI,
+ const label framei,
vtkActor* actor,
vtkPolyData* data
) const;
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pointData.C b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
index cfda633b91c06735e754c014efa52ac536c28c91..c5581a600137eed85554bd9f5fa75e4172e7691b 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pointData.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
@@ -72,7 +72,7 @@ const Foam::NamedEnum
void Foam::functionObjects::runTimePostPro::pointData::addPoints
(
- const label frameI,
+ const label framei,
vtkActor* actor,
vtkPolyDataMapper* mapper,
vtkPolyData* data
@@ -80,7 +80,7 @@ void Foam::functionObjects::runTimePostPro::pointData::addPoints
{
geometryBase::initialiseActor(actor);
- vector colour = pointColour_->value(frameI);
+ vector colour = pointColour_->value(framei);
actor->GetProperty()->SetColor(colour[0], colour[1], colour[2]);
switch (representation_)
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pointData.H b/src/functionObjects/graphics/runTimePostProcessing/pointData.H
index a3d4c0578b4b14f6ba92a0a7f03c7f6a58840381..1ced613bd5a3a014d5bd88dd1448d0bc6b3cf67d 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pointData.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.H
@@ -102,7 +102,7 @@ protected:
//- Add the point data to the renderer
void addPoints
(
- const label frameI,
+ const label framei,
vtkActor* actor,
vtkPolyDataMapper* mapper,
vtkPolyData* data
diff --git a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
index d2a4c6df1adf5cc5f1fefde5f6209d46ec065ec1..396c84316414921da2f30f47dc882c6b469a8e85 100644
--- a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
+++ b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
@@ -41,7 +41,7 @@ Description
dsmcFields1
{
type dsmcFields;
- functionObjectLibs ("libutilityFunctionObjects.so");
+ libs ("libutilityFunctionObjects.so");
...
}
\endverbatim
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
index c4a7e9f6039f1228b6c820ce0c1f3611b9236dcb..8f0c5d72afafc0303b731cf7fe28b29a46fa8763 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
@@ -64,14 +64,14 @@ Foam::functionObjects::runTimeControls::averageCondition::averageCondition
{
const dictionary& dict = conditionDict();
- forAll(fieldNames_, fieldI)
+ forAll(fieldNames_, fieldi)
{
- const word& fieldName = fieldNames_[fieldI];
+ const word& fieldName = fieldNames_[fieldi];
if (dict.found(fieldName))
{
const dictionary& valueDict = dict.subDict(fieldName);
- totalTime_[fieldI] = readScalar(valueDict.lookup("totalTime"));
+ totalTime_[fieldi] = readScalar(valueDict.lookup("totalTime"));
}
}
}
@@ -101,11 +101,11 @@ bool Foam::functionObjects::runTimeControls::averageCondition::apply()
DynamicList<label> unprocessedFields(fieldNames_.size());
- forAll(fieldNames_, fieldI)
+ forAll(fieldNames_, fieldi)
{
- const word& fieldName(fieldNames_[fieldI]);
+ const word& fieldName(fieldNames_[fieldi]);
- scalar Dt = totalTime_[fieldI];
+ scalar Dt = totalTime_[fieldi];
scalar alpha = (Dt - dt)/Dt;
scalar beta = dt/Dt;
@@ -133,10 +133,10 @@ bool Foam::functionObjects::runTimeControls::averageCondition::apply()
if (!processed)
{
- unprocessedFields.append(fieldI);
+ unprocessedFields.append(fieldi);
}
- totalTime_[fieldI] += dt;
+ totalTime_[fieldi] += dt;
}
if (unprocessedFields.size())
@@ -147,8 +147,8 @@ bool Foam::functionObjects::runTimeControls::averageCondition::apply()
forAll(unprocessedFields, i)
{
- label fieldI = unprocessedFields[i];
- Info<< " " << fieldNames_[fieldI] << nl;
+ label fieldi = unprocessedFields[i];
+ Info<< " " << fieldNames_[fieldi] << nl;
}
}
@@ -162,20 +162,20 @@ void Foam::functionObjects::runTimeControls::averageCondition::write()
{
dictionary& conditionDict = this->conditionDict();
- forAll(fieldNames_, fieldI)
+ forAll(fieldNames_, fieldi)
{
- const word& fieldName = fieldNames_[fieldI];
+ const word& fieldName = fieldNames_[fieldi];
// value dictionary should be present - mean values are written there
if (conditionDict.found(fieldName))
{
dictionary& valueDict = conditionDict.subDict(fieldName);
- valueDict.add("totalTime", totalTime_[fieldI], true);
+ valueDict.add("totalTime", totalTime_[fieldi], true);
}
else
{
dictionary valueDict;
- valueDict.add("totalTime", totalTime_[fieldI], true);
+ valueDict.add("totalTime", totalTime_[fieldi], true);
conditionDict.add(fieldName, valueDict);
}
}
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
index 4d5a580f02587763fe85b292d37deb851c16fd2b..df35537bad4a03f3b832f5cf54e492795336f735 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C
@@ -132,15 +132,15 @@ apply()
List<scalar> result(fieldNames_.size(), -VGREAT);
- forAll(fieldNames_, fieldI)
+ forAll(fieldNames_, fieldi)
{
- const word& fieldName = fieldNames_[fieldI];
+ const word& fieldName = fieldNames_[fieldi];
if (solverDict.found(fieldName))
{
const List<solverPerformance> sp(solverDict.lookup(fieldName));
const scalar residual = sp.first().initialResidual();
- result[fieldI] = residual;
+ result[fieldi] = residual;
switch (mode_)
{
@@ -203,14 +203,14 @@ apply()
<< ": satisfied using threshold value: " << value_ << nl;
}
- forAll(result, resultI)
+ forAll(result, resulti)
{
- if (result[resultI] > 0)
+ if (result[resulti] > 0)
{
if (log_)
{
- Info<< " field: " << fieldNames_[resultI]
- << ", residual: " << result[resultI] << nl;
+ Info<< " field: " << fieldNames_[resulti]
+ << ", residual: " << result[resulti] << nl;
}
}
}
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C
index afac40bdced488ea3db77f18f4eb3eccfaeaa074..f23e69a3ea0226f92f71a433a9b29be77193877e 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/equationMaxIterCondition/equationMaxIterCondition.C
@@ -105,15 +105,15 @@ bool Foam::functionObjects::runTimeControls::equationMaxIterCondition::apply()
List<label> result(fieldNames_.size(), -1);
- forAll(fieldNames_, fieldI)
+ forAll(fieldNames_, fieldi)
{
- const word& fieldName = fieldNames_[fieldI];
+ const word& fieldName = fieldNames_[fieldi];
if (solverDict.found(fieldName))
{
const List<solverPerformance> sp(solverDict.lookup(fieldName));
const label nIterations = sp.first().nIterations();
- result[fieldI] = nIterations;
+ result[fieldi] = nIterations;
if (nIterations > threshold_)
{
@@ -154,14 +154,14 @@ bool Foam::functionObjects::runTimeControls::equationMaxIterCondition::apply()
<< ": satisfied using threshold value: " << threshold_ << nl;
}
- forAll(result, resultI)
+ forAll(result, resulti)
{
- if (result[resultI] != -1)
+ if (result[resulti] != -1)
{
if (log_)
{
- Info<< " field: " << fieldNames_[resultI]
- << ", iterations: " << result[resultI] << nl;
+ Info<< " field: " << fieldNames_[resulti]
+ << ", iterations: " << result[resulti] << nl;
}
}
}
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
index 7f741d2ec605d237eb1d372f5c5101aa16764244..839137a30b37475b06f4ca48bffc12b2855e160b 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C
@@ -110,9 +110,9 @@ bool Foam::functionObjects::runTimeControls::minMaxCondition::apply()
return satisfied;
}
- forAll(fieldNames_, fieldI)
+ forAll(fieldNames_, fieldi)
{
- const word& fieldName = fieldNames_[fieldI];
+ const word& fieldName = fieldNames_[fieldi];
const word valueType =
state_.objectResultType(functionObjectName_, fieldName);
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeControl.C b/src/functionObjects/utilities/runTimeControl/runTimeControl.C
index 4b18e6f16dbcd2d33cf7f38d016d5375bdef238b..d9d05d73521fd53b8561beb259c17c8f433c6b4f 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeControl.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeControl.C
@@ -81,23 +81,23 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::read
const wordList conditionNames(conditionsDict.toc());
conditions_.setSize(conditionNames.size());
- label uniqueGroupI = 0;
- forAll(conditionNames, conditionI)
+ label uniqueGroupi = 0;
+ forAll(conditionNames, conditioni)
{
- const word& conditionName = conditionNames[conditionI];
+ const word& conditionName = conditionNames[conditioni];
const dictionary& dict = conditionsDict.subDict(conditionName);
conditions_.set
(
- conditionI,
+ conditioni,
runTimeCondition::New(conditionName, obr_, dict, *this)
);
- label groupI = conditions_[conditionI].groupID();
+ label groupi = conditions_[conditioni].groupID();
- if (groupMap_.insert(groupI, uniqueGroupI))
+ if (groupMap_.insert(groupi, uniqueGroupi))
{
- uniqueGroupI++;
+ uniqueGroupi++;
}
}
@@ -114,9 +114,9 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::read
{
// Check that at least one condition is active
bool active = false;
- forAll(conditions_, conditionI)
+ forAll(conditions_, conditioni)
{
- if (conditions_[conditionI].active())
+ if (conditions_[conditioni].active())
{
active = true;
break;
@@ -146,32 +146,32 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
List<bool> groupSatisfied(groupMap_.size(), true);
List<bool> groupActive(groupMap_.size(), false);
- forAll(conditions_, conditionI)
+ forAll(conditions_, conditioni)
{
- runTimeCondition& condition = conditions_[conditionI];
+ runTimeCondition& condition = conditions_[conditioni];
if (condition.active())
{
bool conditionSatisfied = condition.apply();
- label groupI = condition.groupID();
+ label groupi = condition.groupID();
- Map<label>::const_iterator conditionIter = groupMap_.find(groupI);
+ Map<label>::const_iterator conditionIter = groupMap_.find(groupi);
if (conditionIter == groupMap_.end())
{
FatalErrorInFunction
- << "group " << groupI << " not found in map"
+ << "group " << groupi << " not found in map"
<< abort(FatalError);
}
if (conditionSatisfied)
{
- IDs.append(conditionI);
+ IDs.append(conditioni);
groupActive[conditionIter()] = true;
- if (groupI == -1)
+ if (groupi == -1)
{
// Condition not part of a group - only requires this to be
// satisfied for completion flag to be set
@@ -187,9 +187,9 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
}
bool done = false;
- forAll(groupSatisfied, groupI)
+ forAll(groupSatisfied, groupi)
{
- if (groupSatisfied[groupI] && groupActive[groupI])
+ if (groupSatisfied[groupi] && groupActive[groupi])
{
done = true;
break;
@@ -198,10 +198,10 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
if (done)
{
- forAll(IDs, conditionI)
+ forAll(IDs, conditioni)
{
- Info<< " " << conditions_[conditionI].type() << ": "
- << conditions_[conditionI].name()
+ Info<< " " << conditions_[conditioni].type() << ": "
+ << conditions_[conditioni].name()
<< " condition satisfied" << nl;
}
@@ -235,9 +235,9 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
bool Foam::functionObjects::runTimeControls::runTimeControl::write()
{
- forAll(conditions_, conditionI)
+ forAll(conditions_, conditioni)
{
- conditions_[conditionI].write();
+ conditions_[conditioni].write();
}
return true;
diff --git a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
index 2a00e997e011a970189eb1bfa4323372cd877344..d3ce16442c95243af6f7d8093e00074b781d7db7 100644
--- a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
+++ b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
@@ -40,7 +40,7 @@ Description
setTimeStep1
{
type setTimeStep;
- functionObjectLibs ("libutilityFunctionObjects.so");
+ libs ("libutilityFunctionObjects.so");
...
}
\endverbatim
diff --git a/src/functionObjects/utilities/systemCall/systemCall.C b/src/functionObjects/utilities/systemCall/systemCall.C
index 498457e10cd11616c5b1f608ac8b6fd6f61e51f7..a2a0bd5041c8c054266951cebb7077d2f272676d 100644
--- a/src/functionObjects/utilities/systemCall/systemCall.C
+++ b/src/functionObjects/utilities/systemCall/systemCall.C
@@ -107,9 +107,9 @@ bool Foam::functionObjects::systemCall::read(const dictionary& dict)
bool Foam::functionObjects::systemCall::execute()
{
- forAll(executeCalls_, callI)
+ forAll(executeCalls_, calli)
{
- Foam::system(executeCalls_[callI]);
+ Foam::system(executeCalls_[calli]);
}
return true;
@@ -118,9 +118,9 @@ bool Foam::functionObjects::systemCall::execute()
bool Foam::functionObjects::systemCall::end()
{
- forAll(endCalls_, callI)
+ forAll(endCalls_, calli)
{
- Foam::system(endCalls_[callI]);
+ Foam::system(endCalls_[calli]);
}
return true;
@@ -129,9 +129,9 @@ bool Foam::functionObjects::systemCall::end()
bool Foam::functionObjects::systemCall::write()
{
- forAll(writeCalls_, callI)
+ forAll(writeCalls_, calli)
{
- Foam::system(writeCalls_[callI]);
+ Foam::system(writeCalls_[calli]);
}
return true;
diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.C b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
index 22c63d60d2f1359c51c4386f6b91e633a27ff162..c0557ab37b100bff2c0e106ae4cc30ec9ea89a2b 100644
--- a/src/functionObjects/utilities/writeDictionary/writeDictionary.C
+++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
@@ -50,14 +50,14 @@ namespace functionObjects
bool Foam::functionObjects::writeDictionary::tryDirectory
(
- const label dictI,
+ const label dicti,
const word& location,
bool& firstDict
)
{
IOobject dictIO
(
- dictNames_[dictI],
+ dictNames_[dicti],
location,
obr_,
IOobject::MUST_READ,
@@ -69,7 +69,7 @@ bool Foam::functionObjects::writeDictionary::tryDirectory
{
IOdictionary dict(dictIO);
- if (dict.digest() != digests_[dictI])
+ if (dict.digest() != digests_[dicti])
{
if (firstDict)
{
@@ -84,7 +84,7 @@ bool Foam::functionObjects::writeDictionary::tryDirectory
IOobject::writeDivider(Info);
- digests_[dictI] = dict.digest();
+ digests_[dicti] = dict.digest();
}
return true;
diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.H b/src/functionObjects/utilities/writeDictionary/writeDictionary.H
index bb3cbd4047ee75d50a206a7920a48b36da00819b..b6d33bc694dafa91bbd80045fb5954581989dffc 100644
--- a/src/functionObjects/utilities/writeDictionary/writeDictionary.H
+++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.H
@@ -75,7 +75,7 @@ class writeDictionary
//- Helper function to write the dictionary if found at location
bool tryDirectory
(
- const label dictI,
+ const label dicti,
const word& location,
bool& firstDict
);
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 967f57cfc08eba008152b3088f90ac03fd596fb8..54052a307832a3c48208190d8f2a66da7cd37fbd 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -83,22 +83,22 @@ void Foam::snappyLayerDriver::dumpDisplacement
OBJstream dispStr(prefix + "_disp.obj");
Info<< "Writing all displacements to " << dispStr.name() << endl;
- forAll(patchDisp, patchPointI)
+ forAll(patchDisp, patchPointi)
{
- const point& pt = pp.localPoints()[patchPointI];
- dispStr.write(linePointRef(pt, pt + patchDisp[patchPointI]));
+ const point& pt = pp.localPoints()[patchPointi];
+ dispStr.write(linePointRef(pt, pt + patchDisp[patchPointi]));
}
OBJstream illStr(prefix + "_illegal.obj");
Info<< "Writing invalid displacements to " << illStr.name() << endl;
- forAll(patchDisp, patchPointI)
+ forAll(patchDisp, patchPointi)
{
- if (extrudeStatus[patchPointI] != EXTRUDE)
+ if (extrudeStatus[patchPointi] != EXTRUDE)
{
- const point& pt = pp.localPoints()[patchPointI];
- illStr.write(linePointRef(pt, pt + patchDisp[patchPointI]));
+ const point& pt = pp.localPoints()[patchPointi];
+ illStr.write(linePointRef(pt, pt + patchDisp[patchPointi]));
}
}
}
@@ -113,16 +113,16 @@ Foam::tmp<Foam::scalarField> Foam::snappyLayerDriver::avgPointData
tmp<scalarField> tfaceFld(new scalarField(pp.size(), 0.0));
scalarField& faceFld = tfaceFld.ref();
- forAll(pp.localFaces(), faceI)
+ forAll(pp.localFaces(), facei)
{
- const face& f = pp.localFaces()[faceI];
+ const face& f = pp.localFaces()[facei];
if (f.size())
{
forAll(f, fp)
{
- faceFld[faceI] += pointFld[f[fp]];
+ faceFld[facei] += pointFld[f[fp]];
}
- faceFld[faceI] /= f.size();
+ faceFld[facei] /= f.size();
}
}
return tfaceFld;
@@ -143,13 +143,13 @@ void Foam::snappyLayerDriver::checkManifold
// Check for edge-faces (surface pinched at edge)
const labelListList& edgeFaces = fp.edgeFaces();
- forAll(edgeFaces, edgeI)
+ forAll(edgeFaces, edgei)
{
- const labelList& eFaces = edgeFaces[edgeI];
+ const labelList& eFaces = edgeFaces[edgei];
if (eFaces.size() > 2)
{
- const edge& e = fp.edges()[edgeI];
+ const edge& e = fp.edges()[edgei];
nonManifoldPoints.insert(fp.meshPoints()[e[0]]);
nonManifoldPoints.insert(fp.meshPoints()[e[1]]);
@@ -167,9 +167,9 @@ void Foam::snappyLayerDriver::checkMeshManifold() const
// Get all outside faces
labelList outsideFaces(mesh.nFaces() - mesh.nInternalFaces());
- for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
+ for (label facei = mesh.nInternalFaces(); facei < mesh.nFaces(); facei++)
{
- outsideFaces[faceI - mesh.nInternalFaces()] = faceI;
+ outsideFaces[facei - mesh.nInternalFaces()] = facei;
}
pointSet nonManifoldPoints
@@ -214,24 +214,24 @@ void Foam::snappyLayerDriver::checkMeshManifold() const
// Unset extrusion on point. Returns true if anything unset.
bool Foam::snappyLayerDriver::unmarkExtrusion
(
- const label patchPointI,
+ const label patchPointi,
pointField& patchDisp,
labelList& patchNLayers,
List<extrudeMode>& extrudeStatus
)
{
- if (extrudeStatus[patchPointI] == EXTRUDE)
+ if (extrudeStatus[patchPointi] == EXTRUDE)
{
- extrudeStatus[patchPointI] = NOEXTRUDE;
- patchNLayers[patchPointI] = 0;
- patchDisp[patchPointI] = Zero;
+ extrudeStatus[patchPointi] = NOEXTRUDE;
+ patchNLayers[patchPointi] = 0;
+ patchDisp[patchPointi] = Zero;
return true;
}
- else if (extrudeStatus[patchPointI] == EXTRUDEREMOVE)
+ else if (extrudeStatus[patchPointi] == EXTRUDEREMOVE)
{
- extrudeStatus[patchPointI] = NOEXTRUDE;
- patchNLayers[patchPointI] = 0;
- patchDisp[patchPointI] = Zero;
+ extrudeStatus[patchPointi] = NOEXTRUDE;
+ patchNLayers[patchPointi] = 0;
+ patchDisp[patchPointi] = Zero;
return true;
}
else
@@ -296,18 +296,18 @@ void Foam::snappyLayerDriver::handleNonManifolds
checkManifold(pp, nonManifoldPoints);
// 2. Remote check for boundary edges on coupled boundaries
- forAll(edgeGlobalFaces, edgeI)
+ forAll(edgeGlobalFaces, edgei)
{
if
(
- pp.edgeFaces()[edgeI].size() == 1
- && edgeGlobalFaces[edgeI].size() > 2
+ pp.edgeFaces()[edgei].size() == 1
+ && edgeGlobalFaces[edgei].size() > 2
)
{
// So boundary edges that are connected to more than 2 processors
// i.e. a non-manifold edge which is exactly on a processor
// boundary.
- const edge& e = pp.edges()[edgeI];
+ const edge& e = pp.edges()[edgei];
nonManifoldPoints.insert(pp.meshPoints()[e[0]]);
nonManifoldPoints.insert(pp.meshPoints()[e[1]]);
}
@@ -330,19 +330,19 @@ void Foam::snappyLayerDriver::handleNonManifolds
0
);
- forAll(edgeGlobalFaces, edgeI)
+ forAll(edgeGlobalFaces, edgei)
{
- label meshEdgeI = meshEdges[edgeI];
+ label meshEdgei = meshEdges[edgei];
if
(
- pp.edgeFaces()[edgeI].size() == 1
- && edgeGlobalFaces[edgeI].size() == 1
- && isCoupledEdge[meshEdgeI]
+ pp.edgeFaces()[edgei].size() == 1
+ && edgeGlobalFaces[edgei].size() == 1
+ && isCoupledEdge[meshEdgei]
)
{
// Edge of patch but no continuation across processor.
- const edge& e = pp.edges()[edgeI];
+ const edge& e = pp.edges()[edgei];
//Pout<< "** Stopping extrusion on edge "
// << pp.localPoints()[e[0]]
// << pp.localPoints()[e[1]] << endl;
@@ -363,13 +363,13 @@ void Foam::snappyLayerDriver::handleNonManifolds
{
const labelList& meshPoints = pp.meshPoints();
- forAll(meshPoints, patchPointI)
+ forAll(meshPoints, patchPointi)
{
- if (nonManifoldPoints.found(meshPoints[patchPointI]))
+ if (nonManifoldPoints.found(meshPoints[patchPointi]))
{
unmarkExtrusion
(
- patchPointI,
+ patchPointi,
patchDisp,
patchNLayers,
extrudeStatus
@@ -405,17 +405,17 @@ void Foam::snappyLayerDriver::handleFeatureAngle
const labelListList& edgeFaces = pp.edgeFaces();
- forAll(edgeFaces, edgeI)
+ forAll(edgeFaces, edgei)
{
- const labelList& eFaces = pp.edgeFaces()[edgeI];
+ const labelList& eFaces = pp.edgeFaces()[edgei];
- label meshEdgeI = meshEdges[edgeI];
+ label meshEdgei = meshEdges[edgei];
forAll(eFaces, i)
{
nomalsCombine()
(
- edgeNormal[meshEdgeI],
+ edgeNormal[meshEdgei],
pp.faceNormals()[eFaces[i]]
);
}
@@ -449,13 +449,13 @@ void Foam::snappyLayerDriver::handleFeatureAngle
// Now on coupled edges the edgeNormal will have been truncated and
// only be still be the old value where two faces have the same normal
- forAll(edgeFaces, edgeI)
+ forAll(edgeFaces, edgei)
{
- const labelList& eFaces = pp.edgeFaces()[edgeI];
+ const labelList& eFaces = pp.edgeFaces()[edgei];
- label meshEdgeI = meshEdges[edgeI];
+ label meshEdgei = meshEdges[edgei];
- const vector& n = edgeNormal[meshEdgeI];
+ const vector& n = edgeNormal[meshEdgei];
if (n != point::max)
{
@@ -463,7 +463,7 @@ void Foam::snappyLayerDriver::handleFeatureAngle
if (cos < minCos)
{
- const edge& e = pp.edges()[edgeI];
+ const edge& e = pp.edges()[edgei];
unmarkExtrusion
(
@@ -528,13 +528,13 @@ void Foam::snappyLayerDriver::handleWarpedFaces
if (f.size() > 3)
{
- label faceI = pp.addressing()[i];
+ label facei = pp.addressing()[i];
- label ownLevel = cellLevel[mesh.faceOwner()[faceI]];
+ label ownLevel = cellLevel[mesh.faceOwner()[facei]];
scalar edgeLen = edge0Len/(1<<ownLevel);
// Normal distance to face centre plane
- const point& fc = mesh.faceCentres()[faceI];
+ const point& fc = mesh.faceCentres()[facei];
const vector& fn = pp.faceNormals()[i];
scalarField vProj(f.size());
@@ -595,21 +595,21 @@ void Foam::snappyLayerDriver::handleWarpedFaces
// cellSet multiPatchCells(mesh, "multiPatchCells", pp.size());
//
// // Detect points that use multiple faces on same cell.
-// forAll(pointFaces, patchPointI)
+// forAll(pointFaces, patchPointi)
// {
-// const labelList& pFaces = pointFaces[patchPointI];
+// const labelList& pFaces = pointFaces[patchPointi];
//
// labelHashSet pointCells(pFaces.size());
//
// forAll(pFaces, i)
// {
-// label cellI = mesh.faceOwner()[pp.addressing()[pFaces[i]]];
+// label celli = mesh.faceOwner()[pp.addressing()[pFaces[i]]];
//
-// if (!pointCells.insert(cellI))
+// if (!pointCells.insert(celli))
// {
// // Second or more occurrence of cell so cell has two or more
// // pp faces connected to this point.
-// multiPatchCells.insert(cellI);
+// multiPatchCells.insert(celli);
// }
// }
// }
@@ -639,24 +639,24 @@ void Foam::snappyLayerDriver::handleWarpedFaces
// // (has to be done in separate loop since having one point on
// // multipatches has to reset extrusion on all points of cell)
//
-// forAll(pointFaces, patchPointI)
+// forAll(pointFaces, patchPointi)
// {
-// if (extrudeStatus[patchPointI] != NOEXTRUDE)
+// if (extrudeStatus[patchPointi] != NOEXTRUDE)
// {
-// const labelList& pFaces = pointFaces[patchPointI];
+// const labelList& pFaces = pointFaces[patchPointi];
//
// forAll(pFaces, i)
// {
-// label cellI =
+// label celli =
// mesh.faceOwner()[pp.addressing()[pFaces[i]]];
//
-// if (multiPatchCells.found(cellI))
+// if (multiPatchCells.found(celli))
// {
// if
// (
// unmarkExtrusion
// (
-// patchPointI,
+// patchPointi,
// patchDisp,
// patchNLayers,
// extrudeStatus
@@ -701,18 +701,18 @@ void Foam::snappyLayerDriver::setNumLayers
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
+ label patchi = patchIDs[i];
- const labelList& meshPoints = mesh.boundaryMesh()[patchI].meshPoints();
+ const labelList& meshPoints = mesh.boundaryMesh()[patchi].meshPoints();
- label wantedLayers = patchToNLayers[patchI];
+ label wantedLayers = patchToNLayers[patchi];
- forAll(meshPoints, patchPointI)
+ forAll(meshPoints, patchPointi)
{
- label ppPointI = pp.meshPointMap()[meshPoints[patchPointI]];
+ label ppPointi = pp.meshPointMap()[meshPoints[patchPointi]];
- maxLayers[ppPointI] = max(wantedLayers, maxLayers[ppPointI]);
- minLayers[ppPointI] = min(wantedLayers, minLayers[ppPointI]);
+ maxLayers[ppPointi] = max(wantedLayers, maxLayers[ppPointi]);
+ minLayers[ppPointi] = min(wantedLayers, minLayers[ppPointi]);
}
}
@@ -776,9 +776,9 @@ void Foam::snappyLayerDriver::setNumLayers
// Calculate number of cells to create
nAddedCells = 0;
- forAll(pp.localFaces(), faceI)
+ forAll(pp.localFaces(), facei)
{
- const face& f = pp.localFaces()[faceI];
+ const face& f = pp.localFaces()[facei];
// Get max of extrusion per point
label nCells = 0;
@@ -817,35 +817,35 @@ Foam::snappyLayerDriver::makeLayerDisplacementField
slipPointPatchVectorField::typeName
);
wordList actualPatchTypes(patchFieldTypes.size());
- forAll(pointPatches, patchI)
+ forAll(pointPatches, patchi)
{
- actualPatchTypes[patchI] = pointPatches[patchI].type();
+ actualPatchTypes[patchi] = pointPatches[patchi].type();
}
- forAll(numLayers, patchI)
+ forAll(numLayers, patchi)
{
// 0 layers: do not allow slip so fixedValue 0
// >0 layers: fixedValue which gets adapted
- if (numLayers[patchI] == 0)
+ if (numLayers[patchi] == 0)
{
- patchFieldTypes[patchI] =
+ patchFieldTypes[patchi] =
zeroFixedValuePointPatchVectorField::typeName;
}
- else if (numLayers[patchI] > 0)
+ else if (numLayers[patchi] > 0)
{
- patchFieldTypes[patchI] = fixedValuePointPatchVectorField::typeName;
+ patchFieldTypes[patchi] = fixedValuePointPatchVectorField::typeName;
}
}
- forAll(pointPatches, patchI)
+ forAll(pointPatches, patchi)
{
- if (isA<processorPointPatch>(pointPatches[patchI]))
+ if (isA<processorPointPatch>(pointPatches[patchi]))
{
- patchFieldTypes[patchI] = calculatedPointPatchVectorField::typeName;
+ patchFieldTypes[patchi] = calculatedPointPatchVectorField::typeName;
}
- else if (isA<cyclicPointPatch>(pointPatches[patchI]))
+ else if (isA<cyclicPointPatch>(pointPatches[patchi]))
{
- patchFieldTypes[patchI] = cyclicSlipPointPatchVectorField::typeName;
+ patchFieldTypes[patchi] = cyclicSlipPointPatchVectorField::typeName;
}
}
@@ -892,9 +892,9 @@ void Foam::snappyLayerDriver::growNoExtrusion
label nGrown = 0;
- forAll(localFaces, faceI)
+ forAll(localFaces, facei)
{
- const face& f = localFaces[faceI];
+ const face& f = localFaces[facei];
bool hasSqueeze = false;
forAll(f, fp)
@@ -950,12 +950,12 @@ void Foam::snappyLayerDriver::growNoExtrusion
}
- forAll(extrudeStatus, patchPointI)
+ forAll(extrudeStatus, patchPointi)
{
- if (extrudeStatus[patchPointI] == NOEXTRUDE)
+ if (extrudeStatus[patchPointi] == NOEXTRUDE)
{
- patchDisp[patchPointI] = Zero;
- patchNLayers[patchPointI] = 0;
+ patchDisp[patchPointi] = Zero;
+ patchNLayers[patchPointi] = 0;
}
}
@@ -1022,42 +1022,41 @@ void Foam::snappyLayerDriver::determineSidePatches
// so prepare to renumber edgePatchID
Map<label> wantedToAddedPatch;
- for (label patchI = nOldPatches; patchI < nPatches; patchI++)
+ for (label patchi = nOldPatches; patchi < nPatches; patchi++)
{
- label nbrProcI = patchToNbrProc[patchI];
- word name =
- "procBoundary"
- + Foam::name(Pstream::myProcNo())
- + "to"
- + Foam::name(nbrProcI);
+ label nbrProci = patchToNbrProc[patchi];
+ word name
+ (
+ processorPolyPatch::newName(Pstream::myProcNo(), nbrProci)
+ );
dictionary patchDict;
patchDict.add("type", processorPolyPatch::typeName);
patchDict.add("myProcNo", Pstream::myProcNo());
- patchDict.add("neighbProcNo", nbrProcI);
+ patchDict.add("neighbProcNo", nbrProci);
patchDict.add("nFaces", 0);
patchDict.add("startFace", mesh.nFaces());
- //Pout<< "Adding patch " << patchI
+ //Pout<< "Adding patch " << patchi
// << " name:" << name
// << " between " << Pstream::myProcNo()
- // << " and " << nbrProcI << endl;
+ // << " and " << nbrProci << endl;
- label procPatchI = meshRefiner_.appendPatch
+ label procPatchi = meshRefiner_.appendPatch
(
mesh,
mesh.boundaryMesh().size(), // new patch index
name,
patchDict
);
- wantedToAddedPatch.insert(patchI, procPatchI);
+ wantedToAddedPatch.insert(patchi, procPatchi);
}
// Renumber edgePatchID
forAll(edgePatchID, i)
{
- label patchI = edgePatchID[i];
- Map<label>::const_iterator fnd = wantedToAddedPatch.find(patchI);
+ label patchi = edgePatchID[i];
+ Map<label>::const_iterator fnd = wantedToAddedPatch.find(patchi);
if (fnd != wantedToAddedPatch.end())
{
edgePatchID[i] = fnd();
@@ -1102,38 +1101,38 @@ void Foam::snappyLayerDriver::calculateLayerThickness
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
+ label patchi = patchIDs[i];
- const labelList& meshPoints = patches[patchI].meshPoints();
+ const labelList& meshPoints = patches[patchi].meshPoints();
- forAll(meshPoints, patchPointI)
+ forAll(meshPoints, patchPointi)
{
- label ppPointI = pp.meshPointMap()[meshPoints[patchPointI]];
+ label ppPointi = pp.meshPointMap()[meshPoints[patchPointi]];
- firstLayerThickness[ppPointI] = min
+ firstLayerThickness[ppPointi] = min
(
- firstLayerThickness[ppPointI],
- layerParams.firstLayerThickness()[patchI]
+ firstLayerThickness[ppPointi],
+ layerParams.firstLayerThickness()[patchi]
);
- finalLayerThickness[ppPointI] = min
+ finalLayerThickness[ppPointi] = min
(
- finalLayerThickness[ppPointI],
- layerParams.finalLayerThickness()[patchI]
+ finalLayerThickness[ppPointi],
+ layerParams.finalLayerThickness()[patchi]
);
- totalThickness[ppPointI] = min
+ totalThickness[ppPointi] = min
(
- totalThickness[ppPointI],
- layerParams.thickness()[patchI]
+ totalThickness[ppPointi],
+ layerParams.thickness()[patchi]
);
- expRatio[ppPointI] = min
+ expRatio[ppPointi] = min
(
- expRatio[ppPointI],
- layerParams.expansionRatio()[patchI]
+ expRatio[ppPointi],
+ layerParams.expansionRatio()[patchi]
);
- minThickness[ppPointI] = min
+ minThickness[ppPointi] = min
(
- minThickness[ppPointI],
- layerParams.minThickness()[patchI]
+ minThickness[ppPointi],
+ layerParams.minThickness()[patchi]
);
}
}
@@ -1231,14 +1230,14 @@ void Foam::snappyLayerDriver::calculateLayerThickness
);
- forAll(maxPointLevel, pointI)
+ forAll(maxPointLevel, pointi)
{
// Find undistorted edge size for this level.
- scalar edgeLen = edge0Len/(1<<maxPointLevel[pointI]);
- firstLayerThickness[pointI] *= edgeLen;
- finalLayerThickness[pointI] *= edgeLen;
- totalThickness[pointI] *= edgeLen;
- minThickness[pointI] *= edgeLen;
+ scalar edgeLen = edge0Len/(1<<maxPointLevel[pointi]);
+ firstLayerThickness[pointi] *= edgeLen;
+ finalLayerThickness[pointi] *= edgeLen;
+ totalThickness[pointi] *= edgeLen;
+ minThickness[pointi] *= edgeLen;
}
}
@@ -1247,24 +1246,24 @@ void Foam::snappyLayerDriver::calculateLayerThickness
// Rework thickness parameters into overall thickness
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- forAll(firstLayerThickness, pointI)
+ forAll(firstLayerThickness, pointi)
{
- thickness[pointI] = layerParams.layerThickness
+ thickness[pointi] = layerParams.layerThickness
(
- patchNLayers[pointI],
- firstLayerThickness[pointI],
- finalLayerThickness[pointI],
- totalThickness[pointI],
- expRatio[pointI]
+ patchNLayers[pointi],
+ firstLayerThickness[pointi],
+ finalLayerThickness[pointi],
+ totalThickness[pointi],
+ expRatio[pointi]
);
- expansionRatio[pointI] = layerParams.layerExpansionRatio
+ expansionRatio[pointi] = layerParams.layerExpansionRatio
(
- patchNLayers[pointI],
- firstLayerThickness[pointI],
- finalLayerThickness[pointI],
- totalThickness[pointI],
- expRatio[pointI]
+ patchNLayers[pointi],
+ firstLayerThickness[pointi],
+ finalLayerThickness[pointi],
+ totalThickness[pointi],
+ expRatio[pointi]
);
}
@@ -1281,8 +1280,8 @@ void Foam::snappyLayerDriver::calculateLayerThickness
label maxPatchNameLen = 0;
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
- word patchName = patches[patchI].name();
+ label patchi = patchIDs[i];
+ word patchName = patches[patchi].name();
maxPatchNameLen = max(maxPatchNameLen, label(patchName.size()));
}
@@ -1299,29 +1298,29 @@ void Foam::snappyLayerDriver::calculateLayerThickness
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
+ label patchi = patchIDs[i];
- const labelList& meshPoints = patches[patchI].meshPoints();
+ const labelList& meshPoints = patches[patchi].meshPoints();
scalar sumThickness = 0;
scalar sumNearWallThickness = 0;
label nMasterPoints = 0;
- forAll(meshPoints, patchPointI)
+ forAll(meshPoints, patchPointi)
{
- label meshPointI = meshPoints[patchPointI];
- if (isMasterPoint[meshPointI])
+ label meshPointi = meshPoints[patchPointi];
+ if (isMasterPoint[meshPointi])
{
- label ppPointI = pp.meshPointMap()[meshPointI];
+ label ppPointi = pp.meshPointMap()[meshPointi];
- sumThickness += thickness[ppPointI];
+ sumThickness += thickness[ppPointi];
sumNearWallThickness += layerParams.firstLayerThickness
(
- patchNLayers[ppPointI],
- firstLayerThickness[ppPointI],
- finalLayerThickness[ppPointI],
- thickness[ppPointI],
- expansionRatio[ppPointI]
+ patchNLayers[ppPointi],
+ firstLayerThickness[ppPointi],
+ finalLayerThickness[ppPointi],
+ thickness[ppPointi],
+ expansionRatio[ppPointi]
);
nMasterPoints++;
}
@@ -1344,10 +1343,10 @@ void Foam::snappyLayerDriver::calculateLayerThickness
}
Info<< setf(ios_base::left) << setw(maxPatchNameLen)
- << patches[patchI].name() << setprecision(3)
+ << patches[patchi].name() << setprecision(3)
<< " " << setw(8)
- << returnReduce(patches[patchI].size(), sumOp<scalar>())
- << " " << setw(6) << layerParams.numLayers()[patchI]
+ << returnReduce(patches[patchi].size(), sumOp<scalar>())
+ << " " << setw(6) << layerParams.numLayers()[patchi]
<< " " << setw(8) << avgNearWallThickness
<< " " << setw(8) << avgThickness
<< endl;
@@ -1525,57 +1524,57 @@ void Foam::snappyLayerDriver::getPatchDisplacement
// Check if no extrude possible.
- forAll(pointNormals, patchPointI)
+ forAll(pointNormals, patchPointi)
{
- label meshPointI = pp.meshPoints()[patchPointI];
+ label meshPointi = pp.meshPoints()[patchPointi];
- if (extrudeStatus[patchPointI] == NOEXTRUDE)
+ if (extrudeStatus[patchPointi] == NOEXTRUDE)
{
// Do not use unmarkExtrusion; forcibly set to zero extrusion.
- patchNLayers[patchPointI] = 0;
- patchDisp[patchPointI] = Zero;
+ patchNLayers[patchPointi] = 0;
+ patchDisp[patchPointi] = Zero;
}
else
{
// Get normal
- const vector& n = pointNormals[patchPointI];
+ const vector& n = pointNormals[patchPointi];
- if (!meshTools::visNormal(n, faceNormals, pointFaces[patchPointI]))
+ if (!meshTools::visNormal(n, faceNormals, pointFaces[patchPointi]))
{
if (debug&meshRefinement::ATTRACTION)
{
- Pout<< "No valid normal for point " << meshPointI
- << ' ' << pp.points()[meshPointI]
+ Pout<< "No valid normal for point " << meshPointi
+ << ' ' << pp.points()[meshPointi]
<< "; setting displacement to "
- << patchDisp[patchPointI]
+ << patchDisp[patchPointi]
<< endl;
}
- extrudeStatus[patchPointI] = EXTRUDEREMOVE;
+ extrudeStatus[patchPointi] = EXTRUDEREMOVE;
nNoVisNormal++;
}
}
}
// At illegal points make displacement average of new neighbour positions
- forAll(extrudeStatus, patchPointI)
+ forAll(extrudeStatus, patchPointi)
{
- if (extrudeStatus[patchPointI] == EXTRUDEREMOVE)
+ if (extrudeStatus[patchPointi] == EXTRUDEREMOVE)
{
point avg(Zero);
label nPoints = 0;
- const labelList& pEdges = pp.pointEdges()[patchPointI];
+ const labelList& pEdges = pp.pointEdges()[patchPointi];
forAll(pEdges, i)
{
- label edgeI = pEdges[i];
+ label edgei = pEdges[i];
- label otherPointI = pp.edges()[edgeI].otherVertex(patchPointI);
+ label otherPointi = pp.edges()[edgei].otherVertex(patchPointi);
- if (extrudeStatus[otherPointI] != NOEXTRUDE)
+ if (extrudeStatus[otherPointi] != NOEXTRUDE)
{
- avg += localPoints[otherPointI] + patchDisp[otherPointI];
+ avg += localPoints[otherPointi] + patchDisp[otherPointi];
nPoints++;
}
}
@@ -1585,15 +1584,15 @@ void Foam::snappyLayerDriver::getPatchDisplacement
if (debug&meshRefinement::ATTRACTION)
{
Pout<< "Displacement at illegal point "
- << localPoints[patchPointI]
+ << localPoints[patchPointi]
<< " set to "
- << (avg / nPoints - localPoints[patchPointI])
+ << (avg / nPoints - localPoints[patchPointi])
<< endl;
}
- patchDisp[patchPointI] =
+ patchDisp[patchPointi] =
avg / nPoints
- - localPoints[patchPointI];
+ - localPoints[patchPointi];
nExtrudeRemove++;
}
@@ -1628,15 +1627,15 @@ void Foam::snappyLayerDriver::getPatchDisplacement
bool Foam::snappyLayerDriver::sameEdgeNeighbour
(
const labelListList& globalEdgeFaces,
- const label myGlobalFaceI,
- const label nbrGlobFaceI,
- const label edgeI
+ const label myGlobalFacei,
+ const label nbrGlobFacei,
+ const label edgei
) const
{
- const labelList& eFaces = globalEdgeFaces[edgeI];
+ const labelList& eFaces = globalEdgeFaces[edgei];
if (eFaces.size() == 2)
{
- return edge(myGlobalFaceI, nbrGlobFaceI) == edge(eFaces[0], eFaces[1]);
+ return edge(myGlobalFacei, nbrGlobFacei) == edge(eFaces[0], eFaces[1]);
}
else
{
@@ -1649,15 +1648,15 @@ void Foam::snappyLayerDriver::getVertexString
(
const indirectPrimitivePatch& pp,
const labelListList& globalEdgeFaces,
- const label faceI,
- const label edgeI,
- const label myGlobFaceI,
- const label nbrGlobFaceI,
+ const label facei,
+ const label edgei,
+ const label myGlobFacei,
+ const label nbrGlobFacei,
DynamicList<label>& vertices
) const
{
- const labelList& fEdges = pp.faceEdges()[faceI];
- label fp = findIndex(fEdges, edgeI);
+ const labelList& fEdges = pp.faceEdges()[facei];
+ label fp = findIndex(fEdges, edgei);
if (fp == -1)
{
@@ -1676,8 +1675,8 @@ void Foam::snappyLayerDriver::getVertexString
!sameEdgeNeighbour
(
globalEdgeFaces,
- myGlobFaceI,
- nbrGlobFaceI,
+ myGlobFacei,
+ nbrGlobFacei,
fEdges[prevFp]
)
)
@@ -1696,8 +1695,8 @@ void Foam::snappyLayerDriver::getVertexString
!sameEdgeNeighbour
(
globalEdgeFaces,
- myGlobFaceI,
- nbrGlobFaceI,
+ myGlobFacei,
+ nbrGlobFacei,
fEdges[nextFp]
)
)
@@ -1707,7 +1706,7 @@ void Foam::snappyLayerDriver::getVertexString
endFp = nextFp;
}
- const face& f = pp.localFaces()[faceI];
+ const face& f = pp.localFaces()[facei];
vertices.clear();
fp = startFp;
while (fp != endFp)
@@ -1744,30 +1743,30 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
forAllConstIter(faceSet, illegalPatchFaces, iter)
{
- label faceI = iter.key();
+ label facei = iter.key();
- if (mesh.isInternalFace(faceI))
+ if (mesh.isInternalFace(facei))
{
FatalErrorInFunction
<< "Faceset " << illegalPatchFaces.name()
- << " contains internal face " << faceI << nl
+ << " contains internal face " << facei << nl
<< "It should only contain patch faces" << abort(FatalError);
}
- const face& f = mesh.faces()[faceI];
+ const face& f = mesh.faces()[facei];
forAll(f, fp)
{
if (meshPointMap.found(f[fp]))
{
- label patchPointI = meshPointMap[f[fp]];
+ label patchPointi = meshPointMap[f[fp]];
- if (extrudeStatus[patchPointI] != NOEXTRUDE)
+ if (extrudeStatus[patchPointi] != NOEXTRUDE)
{
unmarkExtrusion
(
- patchPointI,
+ patchPointi,
patchDisp,
patchNLayers,
extrudeStatus
@@ -1778,15 +1777,15 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
}
}
- forAll(patchDisp, patchPointI)
+ forAll(patchDisp, patchPointi)
{
- if (mag(patchDisp[patchPointI]) < minThickness[patchPointI])
+ if (mag(patchDisp[patchPointi]) < minThickness[patchPointi])
{
if
(
unmarkExtrusion
(
- patchPointI,
+ patchPointi,
patchDisp,
patchNLayers,
extrudeStatus
@@ -1796,11 +1795,11 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
nChanged++;
}
}
- else if (extrudeStatus[patchPointI] == NOEXTRUDE)
+ else if (extrudeStatus[patchPointi] == NOEXTRUDE)
{
// Make sure displacement is 0. Should already be so but ...
- patchDisp[patchPointI] = Zero;
- patchNLayers[patchPointI] = 0;
+ patchDisp[patchPointi] = Zero;
+ patchNLayers[patchPointi] = 0;
}
}
@@ -1897,20 +1896,20 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
label nButterFly = 0;
{
DynamicList<label> stringedVerts;
- forAll(pp.edges(), edgeI)
+ forAll(pp.edges(), edgei)
{
- const labelList& globFaces = edgeGlobalFaces[edgeI];
+ const labelList& globFaces = edgeGlobalFaces[edgei];
if (globFaces.size() == 2)
{
- label myFaceI = pp.edgeFaces()[edgeI][0];
- label myGlobalFaceI = globalFaces.toGlobal
+ label myFacei = pp.edgeFaces()[edgei][0];
+ label myGlobalFacei = globalFaces.toGlobal
(
- pp.addressing()[myFaceI]
+ pp.addressing()[myFacei]
);
- label nbrGlobalFaceI =
+ label nbrGlobalFacei =
(
- globFaces[0] != myGlobalFaceI
+ globFaces[0] != myGlobalFacei
? globFaces[0]
: globFaces[1]
);
@@ -1918,10 +1917,10 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
(
pp,
edgeGlobalFaces,
- myFaceI,
- edgeI,
- myGlobalFaceI,
- nbrGlobalFaceI,
+ myFacei,
+ edgei,
+ myGlobalFacei,
+ nbrGlobalFacei,
stringedVerts
);
@@ -1935,10 +1934,7 @@ Foam::label Foam::snappyLayerDriver::truncateDisplacement
bool pinch = false;
for (label i = 1; i < stringedVerts.size()-1; i++)
{
- if
- (
- extrudeStatus[stringedVerts[i]] == NOEXTRUDE
- )
+ if (extrudeStatus[stringedVerts[i]] == NOEXTRUDE)
{
pinch = true;
break;
@@ -2059,15 +2055,15 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
<< " nBufferCellsNoExtrude set to less than 0 ..." << endl;
// Face layers if any point gets extruded
- forAll(pp.localFaces(), patchFaceI)
+ forAll(pp.localFaces(), patchFacei)
{
- const face& f = pp.localFaces()[patchFaceI];
+ const face& f = pp.localFaces()[patchFacei];
forAll(f, fp)
{
if (patchNLayers[f[fp]] > 0)
{
- nPatchFaceLayers[patchFaceI] = patchNLayers[f[fp]];
+ nPatchFaceLayers[patchFacei] = patchNLayers[f[fp]];
break;
}
}
@@ -2075,11 +2071,11 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
nPatchPointLayers = patchNLayers;
// Set any unset patch face layers
- forAll(nPatchFaceLayers, patchFaceI)
+ forAll(nPatchFaceLayers, patchFacei)
{
- if (nPatchFaceLayers[patchFaceI] == -1)
+ if (nPatchFaceLayers[patchFacei] == -1)
{
- nPatchFaceLayers[patchFaceI] = 0;
+ nPatchFaceLayers[patchFacei] = 0;
}
}
}
@@ -2088,9 +2084,9 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
// Determine max point layers per face.
labelList maxLevel(pp.size(), 0);
- forAll(pp.localFaces(), patchFaceI)
+ forAll(pp.localFaces(), patchFacei)
{
- const face& f = pp.localFaces()[patchFaceI];
+ const face& f = pp.localFaces()[patchFacei];
// find patch faces where layer terminates (i.e contains extrude
// and noextrude points).
@@ -2114,12 +2110,12 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
if (noExtrude)
{
- nPatchFaceLayers[patchFaceI] = 1;
- maxLevel[patchFaceI] = mLevel;
+ nPatchFaceLayers[patchFacei] = 1;
+ maxLevel[patchFacei] = mLevel;
}
else
{
- maxLevel[patchFaceI] = mLevel;
+ maxLevel[patchFacei] = mLevel;
}
}
}
@@ -2153,19 +2149,19 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
boolList foundNeighbour(pp.nPoints(), false);
- forAll(pp.meshPoints(), patchPointI)
+ forAll(pp.meshPoints(), patchPointi)
{
- forAll(pointFaces[patchPointI], pointFaceI)
+ forAll(pointFaces[patchPointi], pointFacei)
{
- label faceI = pointFaces[patchPointI][pointFaceI];
+ label facei = pointFaces[patchPointi][pointFacei];
if
(
- nPatchFaceLayers[faceI] != -1
- && maxLevel[faceI] > 0
+ nPatchFaceLayers[facei] != -1
+ && maxLevel[facei] > 0
)
{
- foundNeighbour[patchPointI] = true;
+ foundNeighbour[patchPointi] = true;
break;
}
}
@@ -2180,21 +2176,21 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
false // null value
);
- forAll(pp.meshPoints(), patchPointI)
+ forAll(pp.meshPoints(), patchPointi)
{
- if (foundNeighbour[patchPointI])
+ if (foundNeighbour[patchPointi])
{
- forAll(pointFaces[patchPointI], pointFaceI)
+ forAll(pointFaces[patchPointi], pointFacei)
{
- label faceI = pointFaces[patchPointI][pointFaceI];
+ label facei = pointFaces[patchPointi][pointFacei];
if
(
- nPatchFaceLayers[faceI] == -1
- && maxLevel[faceI] > 0
- && ilevel < maxLevel[faceI]
+ nPatchFaceLayers[facei] == -1
+ && maxLevel[facei] > 0
+ && ilevel < maxLevel[facei]
)
{
- tempCounter[faceI] = ilevel;
+ tempCounter[facei] = ilevel;
}
}
}
@@ -2203,31 +2199,31 @@ void Foam::snappyLayerDriver::setupLayerInfoTruncation
}
}
- forAll(pp.localFaces(), patchFaceI)
+ forAll(pp.localFaces(), patchFacei)
{
- if (nPatchFaceLayers[patchFaceI] == -1)
+ if (nPatchFaceLayers[patchFacei] == -1)
{
- nPatchFaceLayers[patchFaceI] = maxLevel[patchFaceI];
+ nPatchFaceLayers[patchFacei] = maxLevel[patchFacei];
}
}
- forAll(pp.meshPoints(), patchPointI)
+ forAll(pp.meshPoints(), patchPointi)
{
- if (extrudeStatus[patchPointI] != NOEXTRUDE)
+ if (extrudeStatus[patchPointi] != NOEXTRUDE)
{
- forAll(pointFaces[patchPointI], pointFaceI)
+ forAll(pointFaces[patchPointi], pointFacei)
{
- label face = pointFaces[patchPointI][pointFaceI];
- nPatchPointLayers[patchPointI] = max
+ label face = pointFaces[patchPointi][pointFacei];
+ nPatchPointLayers[patchPointi] = max
(
- nPatchPointLayers[patchPointI],
+ nPatchPointLayers[patchPointi],
nPatchFaceLayers[face]
);
}
}
else
{
- nPatchPointLayers[patchPointI] = 0;
+ nPatchPointLayers[patchPointi] = 0;
}
}
syncTools::syncPointList
@@ -2254,9 +2250,9 @@ bool Foam::snappyLayerDriver::cellsUseFace
{
const cell& cFaces = mesh.cells()[cellLabels[i]];
- forAll(cFaces, cFaceI)
+ forAll(cFaces, cFacei)
{
- if (faces.found(cFaces[cFaceI]))
+ if (faces.found(cFaces[cFacei]))
{
return true;
}
@@ -2322,11 +2318,11 @@ Foam::label Foam::snappyLayerDriver::checkAndUnmark
const label nReportMax = 10;
DynamicField<point> disabledFaceCentres(nReportMax);
- forAll(addedCells, oldPatchFaceI)
+ forAll(addedCells, oldPatchFacei)
{
// Get the cells (in newMesh labels) per old patch face (in mesh
// labels)
- const labelList& fCells = addedCells[oldPatchFaceI];
+ const labelList& fCells = addedCells[oldPatchFacei];
if (cellsUseFace(newMesh, fCells, wrongFaces))
{
@@ -2335,7 +2331,7 @@ Foam::label Foam::snappyLayerDriver::checkAndUnmark
(
unmarkExtrusion
(
- pp.localFaces()[oldPatchFaceI],
+ pp.localFaces()[oldPatchFacei],
patchDisp,
patchNLayers,
extrudeStatus
@@ -2346,7 +2342,7 @@ Foam::label Foam::snappyLayerDriver::checkAndUnmark
{
disabledFaceCentres.append
(
- pp.faceCentres()[oldPatchFaceI]
+ pp.faceCentres()[oldPatchFacei]
);
}
@@ -2448,41 +2444,41 @@ Foam::List<Foam::labelPair> Foam::snappyLayerDriver::getBafflesOnAddedMesh
// - use the boundary face for the new baffles
Map<label> baffleSet(4*baffles.size());
- forAll(baffles, baffleI)
+ forAll(baffles, bafflei)
{
- baffleSet.insert(baffles[baffleI][0], baffleI);
- baffleSet.insert(baffles[baffleI][1], baffleI);
+ baffleSet.insert(baffles[bafflei][0], bafflei);
+ baffleSet.insert(baffles[bafflei][1], bafflei);
}
List<labelPair> newBaffles(baffles.size(), labelPair(-1, -1));
for
(
- label faceI = mesh.nInternalFaces();
- faceI < mesh.nFaces();
- faceI++
+ label facei = mesh.nInternalFaces();
+ facei < mesh.nFaces();
+ facei++
)
{
- label oldFaceI = newToOldFaces[faceI];
+ label oldFacei = newToOldFaces[facei];
- Map<label>::const_iterator faceFnd = baffleSet.find(oldFaceI);
+ Map<label>::const_iterator faceFnd = baffleSet.find(oldFacei);
if (faceFnd != baffleSet.end())
{
- label baffleI = faceFnd();
- labelPair& p = newBaffles[baffleI];
+ label bafflei = faceFnd();
+ labelPair& p = newBaffles[bafflei];
if (p[0] == -1)
{
- p[0] = faceI;
+ p[0] = facei;
}
else if (p[1] == -1)
{
- p[1] = faceI;
+ p[1] = facei;
}
else
{
FatalErrorInFunction
- << "Problem:" << faceI << " at:"
- << mesh.faceCentres()[faceI]
+ << "Problem:" << facei << " at:"
+ << mesh.faceCentres()[facei]
<< " is on same baffle as " << p[0]
<< " at:" << mesh.faceCentres()[p[0]]
<< " and " << p[1]
@@ -2517,11 +2513,11 @@ void Foam::snappyLayerDriver::getLayerCellsFaces
// Mark all cells in the layer.
labelListList addedCells(addPatchCellLayer::addedCells(mesh, layerFaces));
- forAll(addedCells, oldPatchFaceI)
+ forAll(addedCells, oldPatchFacei)
{
- const labelList& added = addedCells[oldPatchFaceI];
+ const labelList& added = addedCells[oldPatchFacei];
- const labelList& layer = layerFaces[oldPatchFaceI];
+ const labelList& layer = layerFaces[oldPatchFacei];
if (layer.size())
{
@@ -2533,10 +2529,10 @@ void Foam::snappyLayerDriver::getLayerCellsFaces
}
}
- forAll(layerFaces, oldPatchFaceI)
+ forAll(layerFaces, oldPatchFacei)
{
- const labelList& layer = layerFaces[oldPatchFaceI];
- const scalar realThickness = oldRealThickness[oldPatchFaceI];
+ const labelList& layer = layerFaces[oldPatchFacei];
+ const scalar realThickness = oldRealThickness[oldPatchFacei];
if (layer.size())
{
@@ -2568,8 +2564,8 @@ void Foam::snappyLayerDriver::printLayerData
label maxPatchNameLen = 0;
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
- word patchName = pbm[patchI].name();
+ label patchi = patchIDs[i];
+ word patchName = pbm[patchi].name();
maxPatchNameLen = max(maxPatchNameLen, label(patchName.size()));
}
@@ -2584,8 +2580,8 @@ void Foam::snappyLayerDriver::printLayerData
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
- const polyPatch& pp = pbm[patchI];
+ label patchi = patchIDs[i];
+ const polyPatch& pp = pbm[patchi];
label sumSize = pp.size();
@@ -2598,11 +2594,11 @@ void Foam::snappyLayerDriver::printLayerData
}
// Thickness
- scalarField::subField patchWanted = pbm[patchI].patchSlice
+ scalarField::subField patchWanted = pbm[patchi].patchSlice
(
faceWantedThickness
);
- scalarField::subField patchReal = pbm[patchI].patchSlice
+ scalarField::subField patchReal = pbm[patchi].patchSlice
(
faceRealThickness
);
@@ -2635,7 +2631,7 @@ void Foam::snappyLayerDriver::printLayerData
}
Info<< setf(ios_base::left) << setw(maxPatchNameLen)
- << pbm[patchI].name() << setprecision(3)
+ << pbm[patchi].name() << setprecision(3)
<< " " << setw(8) << sumSize
<< " " << setw(8) << avgLayers
<< " " << setw(8) << avgReal
@@ -2656,19 +2652,19 @@ bool Foam::snappyLayerDriver::writeLayerSets
bool allOk = true;
{
label nAdded = 0;
- forAll(cellNLayers, cellI)
+ forAll(cellNLayers, celli)
{
- if (cellNLayers[cellI] > 0)
+ if (cellNLayers[celli] > 0)
{
nAdded++;
}
}
cellSet addedCellSet(mesh, "addedCells", nAdded);
- forAll(cellNLayers, cellI)
+ forAll(cellNLayers, celli)
{
- if (cellNLayers[cellI] > 0)
+ if (cellNLayers[celli] > 0)
{
- addedCellSet.insert(cellI);
+ addedCellSet.insert(celli);
}
}
addedCellSet.instance() = meshRefiner_.timeName();
@@ -2681,20 +2677,20 @@ bool Foam::snappyLayerDriver::writeLayerSets
}
{
label nAdded = 0;
- for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+ for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
{
- if (faceRealThickness[faceI] > 0)
+ if (faceRealThickness[facei] > 0)
{
nAdded++;
}
}
faceSet layerFacesSet(mesh, "layerFaces", nAdded);
- for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+ for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
{
- if (faceRealThickness[faceI] > 0)
+ if (faceRealThickness[facei] > 0)
{
- layerFacesSet.insert(faceI);
+ layerFacesSet.insert(facei);
}
}
layerFacesSet.instance() = meshRefiner_.timeName();
@@ -2746,24 +2742,24 @@ bool Foam::snappyLayerDriver::writeLayerData
dimensionedScalar("zero", dimless, 0),
fixedValueFvPatchScalarField::typeName
);
- forAll(fld, cellI)
+ forAll(fld, celli)
{
- fld[cellI] = cellNLayers[cellI];
+ fld[celli] = cellNLayers[celli];
}
volScalarField::Boundary& fldBf = fld.boundaryFieldRef();
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
- const polyPatch& pp = pbm[patchI];
+ label patchi = patchIDs[i];
+ const polyPatch& pp = pbm[patchi];
const labelList& faceCells = pp.faceCells();
scalarField pfld(faceCells.size());
forAll(faceCells, i)
{
pfld[i] = cellNLayers[faceCells[i]];
}
- fldBf[patchI] == pfld;
+ fldBf[patchi] == pfld;
}
Info<< indent << fld.name() << " : actual number of layers"
<< endl;
@@ -2790,8 +2786,8 @@ bool Foam::snappyLayerDriver::writeLayerData
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
- fldBf[patchI] == pbm[patchI].patchSlice(faceRealThickness);
+ label patchi = patchIDs[i];
+ fldBf[patchi] == pbm[patchi].patchSlice(faceRealThickness);
}
Info<< indent << fld.name() << " : overall layer thickness"
<< endl;
@@ -2817,13 +2813,13 @@ bool Foam::snappyLayerDriver::writeLayerData
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
forAll(patchIDs, i)
{
- label patchI = patchIDs[i];
+ label patchi = patchIDs[i];
- scalarField::subField patchWanted = pbm[patchI].patchSlice
+ scalarField::subField patchWanted = pbm[patchi].patchSlice
(
faceWantedThickness
);
- scalarField::subField patchReal = pbm[patchI].patchSlice
+ scalarField::subField patchReal = pbm[patchi].patchSlice
(
faceRealThickness
);
@@ -2838,7 +2834,7 @@ bool Foam::snappyLayerDriver::writeLayerData
}
}
- fld.boundaryField()[patchI] == pfld;
+ fld.boundaryField()[patchi] == pfld;
}
Info<< indent << fld.name()
<< " : overall layer thickness (fraction"
@@ -3013,37 +3009,37 @@ void Foam::snappyLayerDriver::addLayers
labelList numLayers(layerParams.numLayers());
{
labelHashSet layerIDs(patchIDs);
- forAll(mesh.faceZones(), zoneI)
+ forAll(mesh.faceZones(), zonei)
{
- label mpI, spI;
+ label mpi, spi;
surfaceZonesInfo::faceZoneType fzType;
bool hasInfo = meshRefiner_.getFaceZoneInfo
(
- mesh.faceZones()[zoneI].name(),
- mpI,
- spI,
+ mesh.faceZones()[zonei].name(),
+ mpi,
+ spi,
fzType
);
if (hasInfo)
{
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
- if (layerIDs.found(mpI) && !layerIDs.found(spI))
+ if (layerIDs.found(mpi) && !layerIDs.found(spi))
{
// Only layers on master side. Fix points on slave side
- Info<< "On faceZone " << mesh.faceZones()[zoneI].name()
- << " adding layers to master patch " << pbm[mpI].name()
+ Info<< "On faceZone " << mesh.faceZones()[zonei].name()
+ << " adding layers to master patch " << pbm[mpi].name()
<< " only. Freezing points on slave patch "
- << pbm[spI].name() << endl;
- numLayers[spI] = 0;
+ << pbm[spi].name() << endl;
+ numLayers[spi] = 0;
}
- else if (!layerIDs.found(mpI) && layerIDs.found(spI))
+ else if (!layerIDs.found(mpi) && layerIDs.found(spi))
{
// Only layers on slave side. Fix points on master side
- Info<< "On faceZone " << mesh.faceZones()[zoneI].name()
- << " adding layers to slave patch " << pbm[spI].name()
+ Info<< "On faceZone " << mesh.faceZones()[zonei].name()
+ << " adding layers to slave patch " << pbm[spi].name()
<< " only. Freezing points on master patch "
- << pbm[mpI].name() << endl;
- numLayers[mpI] = 0;
+ << pbm[mpi].name() << endl;
+ numLayers[mpi] = 0;
}
}
}
@@ -3100,11 +3096,11 @@ void Foam::snappyLayerDriver::addLayers
extrudeStatus
);
- forAll(extrudeStatus, patchPointI)
+ forAll(extrudeStatus, patchPointi)
{
- if (extrudeStatus[patchPointI] != NOEXTRUDE)
+ if (extrudeStatus[patchPointi] != NOEXTRUDE)
{
- duplicatePoint[pp().meshPoints()[patchPointI]] = 1;
+ duplicatePoint[pp().meshPoints()[patchPointi]] = 1;
}
}
}
@@ -3121,11 +3117,11 @@ void Foam::snappyLayerDriver::addLayers
label n = duplicatePoint.count();
labelList candidatePoints(n);
n = 0;
- forAll(duplicatePoint, pointI)
+ forAll(duplicatePoint, pointi)
{
- if (duplicatePoint[pointI])
+ if (duplicatePoint[pointi])
{
- candidatePoints[n++] = pointI;
+ candidatePoints[n++] = pointi;
}
}
@@ -3138,20 +3134,20 @@ void Foam::snappyLayerDriver::addLayers
DynamicList<label> nonDupZones(mesh.faceZones().size());
labelHashSet layerIDs(patchIDs);
- forAll(mesh.faceZones(), zoneI)
+ forAll(mesh.faceZones(), zonei)
{
- label mpI, spI;
+ label mpi, spi;
surfaceZonesInfo::faceZoneType fzType;
bool hasInfo = meshRefiner_.getFaceZoneInfo
(
- mesh.faceZones()[zoneI].name(),
- mpI,
- spI,
+ mesh.faceZones()[zonei].name(),
+ mpi,
+ spi,
fzType
);
- if (hasInfo && !layerIDs.found(mpI) && !layerIDs.found(spI))
+ if (hasInfo && !layerIDs.found(mpi) && !layerIDs.found(spi))
{
- nonDupZones.append(zoneI);
+ nonDupZones.append(zonei);
}
}
nonDupBaffles = meshRefinement::subsetBaffles
@@ -3178,16 +3174,16 @@ void Foam::snappyLayerDriver::addLayers
const labelList& pointMap = map().pointMap();
const labelList& reversePointMap = map().reversePointMap();
- forAll(pointMap, pointI)
+ forAll(pointMap, pointi)
{
- label oldPointI = pointMap[pointI];
- label newMasterPointI = reversePointMap[oldPointI];
+ label oldPointi = pointMap[pointi];
+ label newMasterPointi = reversePointMap[oldPointi];
- if (newMasterPointI != pointI)
+ if (newMasterPointi != pointi)
{
// Found slave. Mark both master and slave
- pointToMaster[pointI] = newMasterPointI;
- pointToMaster[newMasterPointI] = newMasterPointI;
+ pointToMaster[pointi] = newMasterPointi;
+ pointToMaster[newMasterPointi] = newMasterPointi;
}
}
@@ -3229,13 +3225,13 @@ void Foam::snappyLayerDriver::addLayers
);
Info<< "Writing point-duplicates to " << str.name() << endl;
const pointField& p = mesh.points();
- forAll(pointMap, pointI)
+ forAll(pointMap, pointi)
{
- label newMasterI = reversePointMap[pointMap[pointI]];
+ label newMasteri = reversePointMap[pointMap[pointi]];
- if (newMasterI != pointI)
+ if (newMasteri != pointi)
{
- str.write(linePointRef(p[pointI], p[newMasterI]));
+ str.write(linePointRef(p[pointi], p[newMasteri]));
}
}
}
@@ -3751,7 +3747,7 @@ void Foam::snappyLayerDriver::addLayers
);
fvMesh& newMesh = newMeshPtr();
- // get timing, but more importantly get memory information
+ // Get timing, but more importantly get memory information
addProfiling(grow, "snappyHexMesh::layers::updateMesh");
//?necessary? Update fields
@@ -3783,9 +3779,9 @@ void Foam::snappyLayerDriver::addLayers
// Count number of added cells
label nAddedCells = 0;
- forAll(cellNLayers, cellI)
+ forAll(cellNLayers, celli)
{
- if (cellNLayers[cellI] > 0)
+ if (cellNLayers[celli] > 0)
{
nAddedCells++;
}
@@ -3815,20 +3811,20 @@ void Foam::snappyLayerDriver::addLayers
labelList meshToNewMesh(mesh.nFaces(), -1);
for
(
- label faceI = newMesh.nInternalFaces();
- faceI < newMesh.nFaces();
- faceI++
+ label facei = newMesh.nInternalFaces();
+ facei < newMesh.nFaces();
+ facei++
)
{
- label newMeshFaceI = map().faceMap()[faceI];
- if (newMeshFaceI != -1)
+ label newMeshFacei = map().faceMap()[facei];
+ if (newMeshFacei != -1)
{
- meshToNewMesh[newMeshFaceI] = faceI;
+ meshToNewMesh[newMeshFacei] = facei;
}
}
List<labelPair> newMeshBaffles(baffles.size());
- label newI = 0;
+ label newi = 0;
forAll(baffles, i)
{
const labelPair& p = baffles[i];
@@ -3839,10 +3835,10 @@ void Foam::snappyLayerDriver::addLayers
);
if (newMeshBaffle[0] != -1 && newMeshBaffle[1] != -1)
{
- newMeshBaffles[newI++] = newMeshBaffle;
+ newMeshBaffles[newi++] = newMeshBaffle;
}
}
- newMeshBaffles.setSize(newI);
+ newMeshBaffles.setSize(newi);
internalBaffles = meshRefinement::subsetBaffles
(
@@ -4003,23 +3999,23 @@ void Foam::snappyLayerDriver::addLayers
// - and point originating from duplicate
for
(
- label faceI = mesh.nInternalFaces();
- faceI < mesh.nFaces();
- faceI++
+ label facei = mesh.nInternalFaces();
+ facei < mesh.nFaces();
+ facei++
)
{
- label oldFaceI = map().faceMap()[faceI];
- if (oldFaceI != -1 && oldBaffleFace[oldFaceI])
+ label oldFacei = map().faceMap()[facei];
+ if (oldFacei != -1 && oldBaffleFace[oldFacei])
{
- const face& f = mesh.faces()[faceI];
+ const face& f = mesh.faces()[facei];
forAll(f, fp)
{
- label pointI = f[fp];
- label oldPointI = map().pointMap()[pointI];
+ label pointi = f[fp];
+ label oldPointi = map().pointMap()[pointi];
- if (pointToMaster[oldPointI] != -1)
+ if (pointToMaster[oldPointi] != -1)
{
- candidates.append(pointI);
+ candidates.append(pointi);
}
}
}
@@ -4050,19 +4046,19 @@ void Foam::snappyLayerDriver::addLayers
pointToMaster.setSize(mesh.nPoints());
pointToMaster = -1;
- forAll(newToOld, newI)
+ forAll(newToOld, newi)
{
- const labelList& oldPoints = newToOld[newI];
+ const labelList& oldPoints = newToOld[newi];
if (oldPoints.size() > 1)
{
labelList meshPoints
(
UIndirectList<label>(candidates, oldPoints)
);
- label masterI = min(meshPoints);
+ label masteri = min(meshPoints);
forAll(meshPoints, i)
{
- pointToMaster[meshPoints[i]] = masterI;
+ pointToMaster[meshPoints[i]] = masteri;
}
}
}
@@ -4075,10 +4071,10 @@ void Foam::snappyLayerDriver::addLayers
// Count duplicate points
label nPointPairs = 0;
- forAll(pointToMaster, pointI)
+ forAll(pointToMaster, pointi)
{
- label otherPointI = pointToMaster[pointI];
- if (otherPointI != -1)
+ label otherPointi = pointToMaster[pointi];
+ if (otherPointi != -1)
{
nPointPairs++;
}
@@ -4099,13 +4095,13 @@ void Foam::snappyLayerDriver::addLayers
+ ".obj"
);
Info<< "Points to be merged to " << str.name() << endl;
- forAll(pointToMaster, pointI)
+ forAll(pointToMaster, pointi)
{
- label otherPointI = pointToMaster[pointI];
- if (otherPointI != -1)
+ label otherPointi = pointToMaster[pointi];
+ if (otherPointi != -1)
{
- const point& pt = mesh.points()[pointI];
- const point& otherPt = mesh.points()[otherPointI];
+ const point& pt = mesh.points()[pointi];
+ const point& otherPt = mesh.points()[otherPointi];
str.write(linePointRef(pt, otherPt));
}
}
@@ -4147,15 +4143,15 @@ void Foam::snappyLayerDriver::addLayers
// layers.
scalarField newFaceRealThickness(mesh.nFaces(), 0.0);
scalarField newFaceWantedThickness(mesh.nFaces(), 0.0);
- forAll(newFaceRealThickness, faceI)
+ forAll(newFaceRealThickness, facei)
{
- label oldFaceI = faceMap[faceI];
- if (oldFaceI >= 0)
+ label oldFacei = faceMap[facei];
+ if (oldFacei >= 0)
{
- scalar& realThick = newFaceRealThickness[faceI];
- realThick = max(realThick, faceRealThickness[oldFaceI]);
- scalar& wanted = newFaceWantedThickness[faceI];
- wanted = max(wanted, faceWantedThickness[oldFaceI]);
+ scalar& realThick = newFaceRealThickness[facei];
+ realThick = max(realThick, faceRealThickness[oldFacei]);
+ scalar& wanted = newFaceWantedThickness[facei];
+ wanted = max(wanted, faceWantedThickness[oldFacei]);
}
}
faceRealThickness.transfer(newFaceRealThickness);
@@ -4248,16 +4244,16 @@ void Foam::snappyLayerDriver::doLayers
// Patches that need to get a layer
DynamicList<label> patchIDs(numLayers.size());
label nFacesWithLayers = 0;
- forAll(numLayers, patchI)
+ forAll(numLayers, patchi)
{
- if (numLayers[patchI] > 0)
+ if (numLayers[patchi] > 0)
{
- const polyPatch& pp = mesh.boundaryMesh()[patchI];
+ const polyPatch& pp = mesh.boundaryMesh()[patchi];
if (!pp.coupled())
{
- patchIDs.append(patchI);
- nFacesWithLayers += mesh.boundaryMesh()[patchI].size();
+ patchIDs.append(patchi);
+ nFacesWithLayers += mesh.boundaryMesh()[patchi].size();
}
else
{
@@ -4270,19 +4266,19 @@ void Foam::snappyLayerDriver::doLayers
// Add contributions from faceZones that get layers
const faceZoneMesh& fZones = mesh.faceZones();
- forAll(fZones, zoneI)
+ forAll(fZones, zonei)
{
- label mpI, spI;
+ label mpi, spi;
surfaceZonesInfo::faceZoneType fzType;
- meshRefiner_.getFaceZoneInfo(fZones[zoneI].name(), mpI, spI, fzType);
+ meshRefiner_.getFaceZoneInfo(fZones[zonei].name(), mpi, spi, fzType);
- if (numLayers[mpI] > 0)
+ if (numLayers[mpi] > 0)
{
- nFacesWithLayers += fZones[zoneI].size();
+ nFacesWithLayers += fZones[zonei].size();
}
- if (numLayers[spI] > 0)
+ if (numLayers[spi] > 0)
{
- nFacesWithLayers += fZones[zoneI].size();
+ nFacesWithLayers += fZones[zonei].size();
}
}
@@ -4325,16 +4321,16 @@ void Foam::snappyLayerDriver::doLayers
{
// Add contributions from faceZones that get layers
const faceZoneMesh& fZones = mesh.faceZones();
- forAll(fZones, zoneI)
+ forAll(fZones, zonei)
{
- const faceZone& fZone = fZones[zoneI];
+ const faceZone& fZone = fZones[zonei];
const word& fzName = fZone.name();
- label mpI, spI;
+ label mpi, spi;
surfaceZonesInfo::faceZoneType fzType;
- meshRefiner_.getFaceZoneInfo(fzName, mpI, spI, fzType);
+ meshRefiner_.getFaceZoneInfo(fzName, mpi, spi, fzType);
- if (numLayers[mpI] > 0 || numLayers[spI])
+ if (numLayers[mpi] > 0 || numLayers[spi])
{
forAll(fZone, i)
{
@@ -4351,12 +4347,12 @@ void Foam::snappyLayerDriver::doLayers
for
(
- label faceI = mesh.nInternalFaces();
- faceI < mesh.nFaces();
- faceI++
+ label facei = mesh.nInternalFaces();
+ facei < mesh.nFaces();
+ facei++
)
{
- if (intOrCoupled[faceI] && isExtrudedZoneFace[faceI])
+ if (intOrCoupled[facei] && isExtrudedZoneFace[facei])
{
faceZoneOnCoupledFace = true;
break;
@@ -4378,30 +4374,30 @@ void Foam::snappyLayerDriver::doLayers
<< endl;
scalarField cellWeights(mesh.nCells(), 1);
- forAll(numLayers, patchI)
+ forAll(numLayers, patchi)
{
- if (numLayers[patchI] > 0)
+ if (numLayers[patchi] > 0)
{
- const polyPatch& pp = mesh.boundaryMesh()[patchI];
+ const polyPatch& pp = mesh.boundaryMesh()[patchi];
forAll(pp.faceCells(), i)
{
- cellWeights[pp.faceCells()[i]] += numLayers[patchI];
+ cellWeights[pp.faceCells()[i]] += numLayers[patchi];
}
}
}
// Add contributions from faceZones that get layers
const faceZoneMesh& fZones = mesh.faceZones();
- forAll(fZones, zoneI)
+ forAll(fZones, zonei)
{
- const faceZone& fZone = fZones[zoneI];
+ const faceZone& fZone = fZones[zonei];
const word& fzName = fZone.name();
- label mpI, spI;
+ label mpi, spi;
surfaceZonesInfo::faceZoneType fzType;
- meshRefiner_.getFaceZoneInfo(fzName, mpI, spI, fzType);
+ meshRefiner_.getFaceZoneInfo(fzName, mpi, spi, fzType);
- if (numLayers[mpI] > 0)
+ if (numLayers[mpi] > 0)
{
// Get the owner side for unflipped faces, neighbour side
// for flipped ones
@@ -4410,18 +4406,18 @@ void Foam::snappyLayerDriver::doLayers
{
if (cellIDs[i] >= 0)
{
- cellWeights[cellIDs[i]] += numLayers[mpI];
+ cellWeights[cellIDs[i]] += numLayers[mpi];
}
}
}
- if (numLayers[spI] > 0)
+ if (numLayers[spi] > 0)
{
const labelList& cellIDs = fZone.masterCells();
forAll(cellIDs, i)
{
if (cellIDs[i] >= 0)
{
- cellWeights[cellIDs[i]] += numLayers[mpI];
+ cellWeights[cellIDs[i]] += numLayers[mpi];
}
}
}
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index 162412268fe4ed4f0f68819f6a9eb91e580140b8..05adb3e125063a55f32e26afdcf448d0f79ee98b 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -993,21 +993,21 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
cells.size()/100
);
- forAll(cells, cellI)
+ forAll(cells, celli)
{
- const cell& cFaces = cells[cellI];
- label cLevel = cutter.cellLevel()[cellI];
+ const cell& cFaces = cells[celli];
+ label cLevel = cutter.cellLevel()[celli];
- forAll(cFaces, cFaceI)
+ forAll(cFaces, cFacei)
{
- label faceI = cFaces[cFaceI];
+ label facei = cFaces[cFacei];
- if (surfaceIndex[faceI] != -1)
+ if (surfaceIndex[facei] != -1)
{
- label fLevel = cutter.faceLevel(faceI);
+ label fLevel = cutter.faceLevel(facei);
if (fLevel != cLevel)
{
- transitionCells.insert(cellI);
+ transitionCells.insert(celli);
}
}
}
@@ -1025,24 +1025,24 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
//forAllConstIter(cellSet, transitionCells, iter)
//{
- // label cellI = iter.key();
- // const cell& cFaces = cells[cellI];
- // const point& cc = cellCentres[cellI];
- // const scalar rCVol = pow(cellVolumes[cellI], -5.0/3.0);
+ // label celli = iter.key();
+ // const cell& cFaces = cells[celli];
+ // const point& cc = cellCentres[celli];
+ // const scalar rCVol = pow(cellVolumes[celli], -5.0/3.0);
//
// // Determine principal axes of cell
// symmTensor R(Zero);
//
// forAll(cFaces, i)
// {
- // label faceI = cFaces[i];
+ // label facei = cFaces[i];
//
- // const point& fc = faceCentres[faceI];
+ // const point& fc = faceCentres[facei];
//
// // Calculate face-pyramid volume
- // scalar pyrVol = 1.0/3.0 * fA[faceI] & (fc-cc);
+ // scalar pyrVol = 1.0/3.0 * fA[facei] & (fc-cc);
//
- // if (faceOwner[faceI] != cellI)
+ // if (faceOwner[facei] != celli)
// {
// pyrVol = -pyrVol;
// }
@@ -1066,17 +1066,17 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
// labelVector plusFaceLevel(labelVector(-1, -1, -1));
// labelVector minFaceLevel(labelVector(-1, -1, -1));
//
- // forAll(cFaces, cFaceI)
+ // forAll(cFaces, cFacei)
// {
- // label faceI = cFaces[cFaceI];
+ // label facei = cFaces[cFacei];
//
- // if (surfaceIndex[faceI] != -1)
+ // if (surfaceIndex[facei] != -1)
// {
- // label fLevel = cutter.faceLevel(faceI);
+ // label fLevel = cutter.faceLevel(facei);
//
// // Get outwards pointing normal
- // vector n = fA[faceI]/mag(fA[faceI]);
- // if (faceOwner[faceI] != cellI)
+ // vector n = fA[facei]/mag(fA[facei]);
+ // if (faceOwner[facei] != celli)
// {
// n = -n;
// }
@@ -1129,7 +1129,7 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
// && plusFaceLevel[dir] != minFaceLevel[dir]
// )
// {
- // candidateCellSet.insert(cellI);
+ // candidateCellSet.insert(celli);
// }
// }
//}
@@ -1138,26 +1138,26 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
forAllConstIter(cellSet, transitionCells, iter)
{
- label cellI = iter.key();
- const cell& cFaces = cells[cellI];
- label cLevel = cutter.cellLevel()[cellI];
+ label celli = iter.key();
+ const cell& cFaces = cells[celli];
+ label cLevel = cutter.cellLevel()[celli];
// Detect opposite intersection
bool foundOpposite = false;
- forAll(cFaces, cFaceI)
+ forAll(cFaces, cFacei)
{
- label faceI = cFaces[cFaceI];
+ label facei = cFaces[cFacei];
if
(
- surfaceIndex[faceI] != -1
- && cutter.faceLevel(faceI) > cLevel
+ surfaceIndex[facei] != -1
+ && cutter.faceLevel(facei) > cLevel
)
{
// Get outwards pointing normal
- vector n = fA[faceI]/mag(fA[faceI]);
- if (faceOwner[faceI] != cellI)
+ vector n = fA[facei]/mag(fA[facei]);
+ if (faceOwner[facei] != celli)
{
n = -n;
}
@@ -1165,17 +1165,17 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
// Check for any opposite intersection
forAll(cFaces, cFaceI2)
{
- label face2I = cFaces[cFaceI2];
+ label face2i = cFaces[cFaceI2];
if
(
- face2I != faceI
- && surfaceIndex[face2I] != -1
+ face2i != facei
+ && surfaceIndex[face2i] != -1
)
{
// Get outwards pointing normal
- vector n2 = fA[face2I]/mag(fA[face2I]);
- if (faceOwner[face2I] != cellI)
+ vector n2 = fA[face2i]/mag(fA[face2i]);
+ if (faceOwner[face2i] != celli)
{
n2 = -n2;
}
@@ -1199,7 +1199,7 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
if (foundOpposite)
{
- candidateCellSet.insert(cellI);
+ candidateCellSet.insert(celli);
}
}
@@ -1813,22 +1813,22 @@ void Foam::snappyRefineDriver::addFaceZones
//const word slaveName = czNames.second()+"_to_"+czNames.first();
const word& slaveName = patchNames.second();
- label mpI = meshRefiner.addMeshedPatch(masterName, patchInfo);
+ label mpi = meshRefiner.addMeshedPatch(masterName, patchInfo);
Info<< setf(ios_base::left)
- << setw(6) << mpI
- << setw(20) << mesh.boundaryMesh()[mpI].type()
+ << setw(6) << mpi
+ << setw(20) << mesh.boundaryMesh()[mpi].type()
<< setw(30) << masterName
<< setw(30) << fzName
<< setw(10) << surfaceZonesInfo::faceZoneTypeNames[fzType]
<< nl;
- label slI = meshRefiner.addMeshedPatch(slaveName, patchInfo);
+ label sli = meshRefiner.addMeshedPatch(slaveName, patchInfo);
Info<< setf(ios_base::left)
- << setw(6) << slI
- << setw(20) << mesh.boundaryMesh()[slI].type()
+ << setw(6) << sli
+ << setw(20) << mesh.boundaryMesh()[sli].type()
<< setw(30) << slaveName
<< setw(30) << fzName
<< setw(10) << surfaceZonesInfo::faceZoneTypeNames[fzType]
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
index f243c2eeb3a3fb3623608ccda51d189c7d49e235..1e5552f4d14ad90e8d8a1a28b5920cdd078fc5c6 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
@@ -89,32 +89,32 @@ Foam::label Foam::snappySnapDriver::getCollocatedPoints
// Per old point the newPoint. Or -1 (not set yet) or -2 (already seen
// twice)
labelList firstOldPoint(nUnique, -1);
- forAll(pointMap, oldPointI)
+ forAll(pointMap, oldPointi)
{
- label newPointI = pointMap[oldPointI];
+ label newPointi = pointMap[oldPointi];
- if (firstOldPoint[newPointI] == -1)
+ if (firstOldPoint[newPointi] == -1)
{
- // First use of oldPointI. Store.
- firstOldPoint[newPointI] = oldPointI;
+ // First use of oldPointi. Store.
+ firstOldPoint[newPointi] = oldPointi;
}
- else if (firstOldPoint[newPointI] == -2)
+ else if (firstOldPoint[newPointi] == -2)
{
- // Third or more reference of oldPointI -> non-manifold
- isCollocatedPoint.set(oldPointI, 1u);
+ // Third or more reference of oldPointi -> non-manifold
+ isCollocatedPoint.set(oldPointi, 1u);
nCollocated++;
}
else
{
- // Second reference of oldPointI -> non-manifold
- isCollocatedPoint.set(firstOldPoint[newPointI], 1u);
+ // Second reference of oldPointi -> non-manifold
+ isCollocatedPoint.set(firstOldPoint[newPointi], 1u);
nCollocated++;
- isCollocatedPoint.set(oldPointI, 1u);
+ isCollocatedPoint.set(oldPointi, 1u);
nCollocated++;
// Mark with special value to save checking next time round
- firstOldPoint[newPointI] = -2;
+ firstOldPoint[newPointi] = -2;
}
}
return returnReduce(nCollocated, sumOp<label>());
@@ -148,20 +148,20 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
//{
// PackedBoolList newIsFront(mesh.nFaces());
//
- // forAll(isFront, faceI)
+ // forAll(isFront, facei)
// {
- // if (isFront[faceI])
+ // if (isFront[facei])
// {
- // label own = mesh.faceOwner()[faceI];
+ // label own = mesh.faceOwner()[facei];
// const cell& ownFaces = mesh.cells()[own];
// forAll(ownFaces, i)
// {
// newIsFront[ownFaces[i]] = true;
// }
//
- // if (mesh.isInternalFace(faceI))
+ // if (mesh.isInternalFace(facei))
// {
- // label nei = mesh.faceNeighbour()[faceI];
+ // label nei = mesh.faceNeighbour()[facei];
// const cell& neiFaces = mesh.cells()[nei];
// forAll(neiFaces, i)
// {
@@ -188,14 +188,14 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
label nInterface = 0;
- for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+ for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
{
- label ownLevel = cellLevel[mesh.faceOwner()[faceI]];
- label neiLevel = cellLevel[mesh.faceNeighbour()[faceI]];
+ label ownLevel = cellLevel[mesh.faceOwner()[facei]];
+ label neiLevel = cellLevel[mesh.faceNeighbour()[facei]];
- if (!isFront[faceI] && ownLevel != neiLevel)
+ if (!isFront[facei] && ownLevel != neiLevel)
{
- const face& f = mesh.faces()[faceI];
+ const face& f = mesh.faces()[facei];
forAll(f, fp)
{
isMovingPoint[f[fp]] = true;
@@ -208,14 +208,14 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
labelList neiCellLevel;
syncTools::swapBoundaryCellList(mesh, cellLevel, neiCellLevel);
- for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
+ for (label facei = mesh.nInternalFaces(); facei < mesh.nFaces(); facei++)
{
- label ownLevel = cellLevel[mesh.faceOwner()[faceI]];
- label neiLevel = neiCellLevel[faceI-mesh.nInternalFaces()];
+ label ownLevel = cellLevel[mesh.faceOwner()[facei]];
+ label neiLevel = neiCellLevel[facei-mesh.nInternalFaces()];
- if (!isFront[faceI] && ownLevel != neiLevel)
+ if (!isFront[facei] && ownLevel != neiLevel)
{
- const face& f = mesh.faces()[faceI];
+ const face& f = mesh.faces()[facei];
forAll(f, fp)
{
isMovingPoint[f[fp]] = true;
@@ -239,9 +239,9 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
// Unmark any point on the boundary. If we're doing zero iterations of
// face-cell wave we might have coupled points not being unmarked.
- forAll(pp.meshPoints(), pointI)
+ forAll(pp.meshPoints(), pointi)
{
- isMovingPoint[pp.meshPoints()[pointI]] = false;
+ isMovingPoint[pp.meshPoints()[pointi]] = false;
}
// Make sure that points that are coupled to meshPoints but not on a patch
@@ -253,16 +253,16 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
labelList nCells(mesh.nPoints(), 0);
pointField sumLocation(mesh.nPoints(), Zero);
- forAll(isMovingPoint, pointI)
+ forAll(isMovingPoint, pointi)
{
- if (isMovingPoint[pointI])
+ if (isMovingPoint[pointi])
{
- const labelList& pCells = mesh.pointCells(pointI);
+ const labelList& pCells = mesh.pointCells(pointi);
forAll(pCells, i)
{
- sumLocation[pointI] += mesh.cellCentres()[pCells[i]];
- nCells[pointI]++;
+ sumLocation[pointi] += mesh.cellCentres()[pCells[i]];
+ nCells[pointi]++;
}
}
}
@@ -282,12 +282,12 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
label nAdapted = 0;
- forAll(displacement, pointI)
+ forAll(displacement, pointi)
{
- if (nCells[pointI] > 0)
+ if (nCells[pointi] > 0)
{
- displacement[pointI] =
- sumLocation[pointI]/nCells[pointI]-mesh.points()[pointI];
+ displacement[pointi] =
+ sumLocation[pointi]/nCells[pointi]-mesh.points()[pointi];
nAdapted++;
}
}
@@ -374,18 +374,18 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothPatchDisplacement
vectorField avgBoundary(pointFaces.size(), Zero);
labelList nBoundary(pointFaces.size(), 0);
- forAll(pointFaces, patchPointI)
+ forAll(pointFaces, patchPointi)
{
- const labelList& pFaces = pointFaces[patchPointI];
+ const labelList& pFaces = pointFaces[patchPointi];
- forAll(pFaces, pfI)
+ forAll(pFaces, pfi)
{
- label faceI = pFaces[pfI];
+ label facei = pFaces[pfi];
- if (isMasterFace.get(pp.addressing()[faceI]))
+ if (isMasterFace.get(pp.addressing()[facei]))
{
- avgBoundary[patchPointI] += pp[faceI].centre(points);
- nBoundary[patchPointI]++;
+ avgBoundary[patchPointi] += pp[facei].centre(points);
+ nBoundary[patchPointi]++;
}
}
}
@@ -425,10 +425,10 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothPatchDisplacement
// Note: no use of pointFaces
const faceList& faces = mesh.faces();
- for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+ for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
{
- const face& f = faces[faceI];
- const point& fc = mesh.faceCentres()[faceI];
+ const face& f = faces[facei];
+ const point& fc = mesh.faceCentres()[facei];
forAll(f, fp)
{
@@ -440,16 +440,16 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothPatchDisplacement
// Count coupled faces as internal ones (but only once)
const polyBoundaryMesh& patches = mesh.boundaryMesh();
- forAll(patches, patchI)
+ forAll(patches, patchi)
{
if
(
- patches[patchI].coupled()
- && refCast<const coupledPolyPatch>(patches[patchI]).owner()
+ patches[patchi].coupled()
+ && refCast<const coupledPolyPatch>(patches[patchi]).owner()
)
{
const coupledPolyPatch& pp =
- refCast<const coupledPolyPatch>(patches[patchI]);
+ refCast<const coupledPolyPatch>(patches[patchi]);
const vectorField::subField faceCentres = pp.faceCentres();
@@ -485,21 +485,21 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothPatchDisplacement
avgInternal.setSize(meshPoints.size());
nInternal.setSize(meshPoints.size());
- forAll(avgInternal, patchPointI)
+ forAll(avgInternal, patchPointi)
{
- label meshPointI = meshPoints[patchPointI];
+ label meshPointi = meshPoints[patchPointi];
- nInternal[patchPointI] = globalNum[meshPointI];
+ nInternal[patchPointi] = globalNum[meshPointi];
- if (nInternal[patchPointI] == 0)
+ if (nInternal[patchPointi] == 0)
{
- avgInternal[patchPointI] = globalSum[meshPointI];
+ avgInternal[patchPointi] = globalSum[meshPointi];
}
else
{
- avgInternal[patchPointI] =
- globalSum[meshPointI]
- / nInternal[patchPointI];
+ avgInternal[patchPointi] =
+ globalSum[meshPointi]
+ / nInternal[patchPointi];
}
}
}
@@ -509,10 +509,10 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothPatchDisplacement
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
labelList anyCell(mesh.nPoints(), -1);
- forAll(mesh.faceOwner(), faceI)
+ forAll(mesh.faceOwner(), facei)
{
- label own = mesh.faceOwner()[faceI];
- const face& f = mesh.faces()[faceI];
+ label own = mesh.faceOwner()[facei];
+ const face& f = mesh.faces()[facei];
forAll(f, fp)
{
@@ -527,8 +527,8 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothPatchDisplacement
forAll(pointFaces, i)
{
- label meshPointI = meshPoints[i];
- const point& currentPos = pp.points()[meshPointI];
+ label meshPointi = meshPoints[i];
+ const point& currentPos = pp.points()[meshPointi];
// Now we have the two average points: avgBoundary and avgInternal
// and how many boundary/internal faces connect to the point
@@ -559,9 +559,9 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothPatchDisplacement
{
// Non-manifold without internal faces. Use any connected cell
// as internal point instead. Use precalculated any cell to avoid
- // e.g. pointCells()[meshPointI][0]
+ // e.g. pointCells()[meshPointi][0]
- const point& cc = mesh.cellCentres()[anyCell[meshPointI]];
+ const point& cc = mesh.cellCentres()[anyCell[meshPointi]];
scalar cellCBlend = 0.8;
scalar blend = 0.1;
@@ -601,19 +601,19 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothPatchDisplacement
// tmp<pointField> tavg(new pointField(pointEdges.size(), Zero));
// pointField& avg = tavg();
//
-// forAll(pointEdges, vertI)
+// forAll(pointEdges, verti)
// {
-// vector& avgPos = avg[vertI];
+// vector& avgPos = avg[verti];
//
-// const labelList& pEdges = pointEdges[vertI];
+// const labelList& pEdges = pointEdges[verti];
//
-// forAll(pEdges, myEdgeI)
+// forAll(pEdges, myEdgei)
// {
-// const edge& e = edges[pEdges[myEdgeI]];
+// const edge& e = edges[pEdges[myEdgei]];
//
-// label otherVertI = e.otherVertex(vertI);
+// label otherVerti = e.otherVertex(verti);
//
-// avgPos += localPoints[otherVertI];
+// avgPos += localPoints[otherVerti];
// }
//
// avgPos /= pEdges.size();
@@ -662,9 +662,9 @@ Foam::tmp<Foam::scalarField> Foam::snappySnapDriver::edgePatchDist
// Set initial changed points to all the patch points
List<pointEdgePoint> wallInfo(pp.nPoints());
- forAll(pp.localPoints(), ppI)
+ forAll(pp.localPoints(), ppi)
{
- wallInfo[ppI] = pointEdgePoint(pp.localPoints()[ppI], 0.0);
+ wallInfo[ppi] = pointEdgePoint(pp.localPoints()[ppi], 0.0);
}
// Current info on points
@@ -688,9 +688,9 @@ Foam::tmp<Foam::scalarField> Foam::snappySnapDriver::edgePatchDist
tmp<scalarField> tedgeDist(new scalarField(mesh.nEdges()));
scalarField& edgeDist = tedgeDist.ref();
- forAll(allEdgeInfo, edgeI)
+ forAll(allEdgeInfo, edgei)
{
- edgeDist[edgeI] = Foam::sqrt(allEdgeInfo[edgeI].distSqr());
+ edgeDist[edgei] = Foam::sqrt(allEdgeInfo[edgei].distSqr());
}
return tedgeDist;
@@ -709,17 +709,17 @@ void Foam::snappySnapDriver::dumpMove
OFstream nearestStream(fName);
- label vertI = 0;
+ label verti = 0;
- forAll(meshPts, ptI)
+ forAll(meshPts, pti)
{
- meshTools::writeOBJ(nearestStream, meshPts[ptI]);
- vertI++;
+ meshTools::writeOBJ(nearestStream, meshPts[pti]);
+ verti++;
- meshTools::writeOBJ(nearestStream, surfPts[ptI]);
- vertI++;
+ meshTools::writeOBJ(nearestStream, surfPts[pti]);
+ verti++;
- nearestStream<< "l " << vertI-1 << ' ' << vertI << nl;
+ nearestStream<< "l " << verti-1 << ' ' << verti << nl;
}
}
@@ -735,11 +735,11 @@ bool Foam::snappySnapDriver::outwardsDisplacement
const vectorField& faceNormals = pp.faceNormals();
const labelListList& pointFaces = pp.pointFaces();
- forAll(pointFaces, pointI)
+ forAll(pointFaces, pointi)
{
- const labelList& pFaces = pointFaces[pointI];
+ const labelList& pFaces = pointFaces[pointi];
- vector disp(patchDisp[pointI]);
+ vector disp(patchDisp[pointi]);
scalar magDisp = mag(disp);
@@ -751,9 +751,9 @@ bool Foam::snappySnapDriver::outwardsDisplacement
if (!outwards)
{
- Warning<< "Displacement " << patchDisp[pointI]
- << " at mesh point " << pp.meshPoints()[pointI]
- << " coord " << pp.points()[pp.meshPoints()[pointI]]
+ Warning<< "Displacement " << patchDisp[pointi]
+ << " at mesh point " << pp.meshPoints()[pointi]
+ << " coord " << pp.points()[pp.meshPoints()[pointi]]
<< " points through the surrounding patch faces" << endl;
return false;
}
@@ -797,17 +797,17 @@ Foam::scalarField Foam::snappySnapDriver::calcSnapDistance
scalarField maxEdgeLen(localPoints.size(), -GREAT);
- forAll(pointEdges, pointI)
+ forAll(pointEdges, pointi)
{
- const labelList& pEdges = pointEdges[pointI];
+ const labelList& pEdges = pointEdges[pointi];
- forAll(pEdges, pEdgeI)
+ forAll(pEdges, pEdgei)
{
- const edge& e = edges[pEdges[pEdgeI]];
+ const edge& e = edges[pEdges[pEdgei]];
scalar len = e.mag(localPoints);
- maxEdgeLen[pointI] = max(maxEdgeLen[pointI], len);
+ maxEdgeLen[pointi] = max(maxEdgeLen[pointi], len);
}
}
@@ -858,9 +858,9 @@ void Foam::snappySnapDriver::preSmoothPatch
{
Info<< "Smoothing iteration " << smoothIter << endl;
checkFaces.setSize(mesh.nFaces());
- forAll(checkFaces, faceI)
+ forAll(checkFaces, facei)
{
- checkFaces[faceI] = faceI;
+ checkFaces[facei] = facei;
}
// If enabled smooth the internal points
@@ -949,16 +949,16 @@ Foam::labelList Foam::snappySnapDriver::getZoneSurfacePoints
const word& zoneName
)
{
- label zoneI = mesh.faceZones().findZoneID(zoneName);
+ label zonei = mesh.faceZones().findZoneID(zoneName);
- if (zoneI == -1)
+ if (zonei == -1)
{
FatalErrorInFunction
<< "Cannot find zone " << zoneName
<< exit(FatalError);
}
- const faceZone& fZone = mesh.faceZones()[zoneI];
+ const faceZone& fZone = mesh.faceZones()[zonei];
// Could use PrimitivePatch & localFaces to extract points but might just
@@ -972,15 +972,15 @@ Foam::labelList Foam::snappySnapDriver::getZoneSurfacePoints
forAll(f, fp)
{
- label meshPointI = f[fp];
+ label meshPointi = f[fp];
Map<label>::const_iterator iter =
- pp.meshPointMap().find(meshPointI);
+ pp.meshPointMap().find(meshPointi);
if (iter != pp.meshPointMap().end())
{
- label pointI = iter();
- pointOnZone[pointI] = true;
+ label pointi = iter();
+ pointOnZone[pointi] = true;
}
}
}
@@ -1005,18 +1005,18 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
pointField& avgBoundary = tavgBoundary.ref();
labelList nBoundary(pointFaces.size(), 0);
- forAll(pointFaces, pointI)
+ forAll(pointFaces, pointi)
{
- const labelList& pFaces = pointFaces[pointI];
+ const labelList& pFaces = pointFaces[pointi];
- forAll(pFaces, pfI)
+ forAll(pFaces, pfi)
{
- label faceI = pFaces[pfI];
- label meshFaceI = pp.addressing()[faceI];
+ label facei = pFaces[pfi];
+ label meshFacei = pp.addressing()[facei];
- label own = mesh.faceOwner()[meshFaceI];
- avgBoundary[pointI] += mesh.cellCentres()[own];
- nBoundary[pointI]++;
+ label own = mesh.faceOwner()[meshFacei];
+ avgBoundary[pointi] += mesh.cellCentres()[own];
+ nBoundary[pointi]++;
}
}
@@ -1083,10 +1083,10 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
// );
//
//
-// forAll(maxPointLevel, pointI)
+// forAll(maxPointLevel, pointi)
// {
// // Find undistorted edge size for this level.
-// edgeLen[pointI] = edge0Len/(1<<maxPointLevel[pointI]);
+// edgeLen[pointi] = edge0Len/(1<<maxPointLevel[pointi]);
// }
// }
// return tedgeLen;
@@ -1124,113 +1124,113 @@ void Foam::snappySnapDriver::detectNearSurfaces
// pointField start(14*pp.nPoints());
// pointField end(start.size());
//
- // label rayI = 0;
- // forAll(localPoints, pointI)
+ // label rayi = 0;
+ // forAll(localPoints, pointi)
// {
- // const point& pt = localPoints[pointI];
+ // const point& pt = localPoints[pointi];
//
// // Along coordinate axes
//
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
- // endPt.x() -= edgeLen[pointI];
+ // endPt.x() -= edgeLen[pointi];
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
- // endPt.x() += edgeLen[pointI];
+ // endPt.x() += edgeLen[pointi];
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
- // endPt.y() -= edgeLen[pointI];
+ // endPt.y() -= edgeLen[pointi];
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
- // endPt.y() += edgeLen[pointI];
+ // endPt.y() += edgeLen[pointi];
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
- // endPt.z() -= edgeLen[pointI];
+ // endPt.z() -= edgeLen[pointi];
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
- // endPt.z() += edgeLen[pointI];
+ // endPt.z() += edgeLen[pointi];
// }
//
// // At 45 degrees
//
- // const vector vec(edgeLen[pointI]*n);
+ // const vector vec(edgeLen[pointi]*n);
//
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
// endPt.x() += vec.x();
// endPt.y() += vec.y();
// endPt.z() += vec.z();
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
// endPt.x() -= vec.x();
// endPt.y() += vec.y();
// endPt.z() += vec.z();
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
// endPt.x() += vec.x();
// endPt.y() -= vec.y();
// endPt.z() += vec.z();
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
// endPt.x() -= vec.x();
// endPt.y() -= vec.y();
// endPt.z() += vec.z();
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
// endPt.x() += vec.x();
// endPt.y() += vec.y();
// endPt.z() -= vec.z();
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
// endPt.x() -= vec.x();
// endPt.y() += vec.y();
// endPt.z() -= vec.z();
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
// endPt.x() += vec.x();
// endPt.y() -= vec.y();
// endPt.z() -= vec.z();
// }
// {
- // start[rayI] = pt;
- // point& endPt = end[rayI++];
+ // start[rayi] = pt;
+ // point& endPt = end[rayi++];
// endPt = pt;
// endPt.x() -= vec.x();
// endPt.y() -= vec.y();
@@ -1299,7 +1299,7 @@ void Foam::snappySnapDriver::detectNearSurfaces
// Info<< "Dumping intersections with co-planar surfaces to "
// << str.name() << endl;
//
- // forAll(localPoints, pointI)
+ // forAll(localPoints, pointi)
// {
// bool hasNormal = false;
// point surfPointA;
@@ -1309,13 +1309,13 @@ void Foam::snappySnapDriver::detectNearSurfaces
//
// bool isCoplanar = false;
//
- // label rayI = 14*pointI;
+ // label rayi = 14*pointi;
// for (label i = 0; i < 14; i++)
// {
- // if (hit1[rayI].hit())
+ // if (hit1[rayi].hit())
// {
- // const point& pt = hit1[rayI].hitPoint();
- // const vector& n = normal1[rayI];
+ // const point& pt = hit1[rayi].hitPoint();
+ // const vector& n = normal1[rayi];
//
// if (!hasNormal)
// {
@@ -1344,10 +1344,10 @@ void Foam::snappySnapDriver::detectNearSurfaces
// }
// }
// }
- // if (hit2[rayI].hit())
+ // if (hit2[rayi].hit())
// {
- // const point& pt = hit2[rayI].hitPoint();
- // const vector& n = normal2[rayI];
+ // const point& pt = hit2[rayi].hitPoint();
+ // const vector& n = normal2[rayi];
//
// if (!hasNormal)
// {
@@ -1377,7 +1377,7 @@ void Foam::snappySnapDriver::detectNearSurfaces
// }
// }
//
- // rayI++;
+ // rayi++;
// }
//
// if (isCoplanar)
@@ -1394,12 +1394,12 @@ void Foam::snappySnapDriver::detectNearSurfaces
// Construct rays through localPoints to beyond cell centre
pointField start(pp.nPoints());
pointField end(pp.nPoints());
- forAll(localPoints, pointI)
+ forAll(localPoints, pointi)
{
- const point& pt = localPoints[pointI];
- const vector d = 2*(avgCc[pointI]-pt);
- start[pointI] = pt - d;
- end[pointI] = pt + d;
+ const point& pt = localPoints[pointi];
+ const vector d = 2*(avgCc[pointi]-pt);
+ start[pointi] = pt - d;
+ end[pointi] = pt + d;
}
@@ -1465,61 +1465,61 @@ void Foam::snappySnapDriver::detectNearSurfaces
);
- forAll(localPoints, pointI)
+ forAll(localPoints, pointi)
{
// Current location
- const point& pt = localPoints[pointI];
+ const point& pt = localPoints[pointi];
bool override = false;
- //if (hit1[pointI].hit())
+ //if (hit1[pointi].hit())
//{
// if
// (
// meshRefiner_.isGap
// (
// planarCos,
- // nearestPoint[pointI],
- // nearestNormal[pointI],
- // hit1[pointI].hitPoint(),
- // normal1[pointI]
+ // nearestPoint[pointi],
+ // nearestNormal[pointi],
+ // hit1[pointi].hitPoint(),
+ // normal1[pointi]
// )
// )
// {
- // disp[pointI] = hit1[pointI].hitPoint()-pt;
+ // disp[pointi] = hit1[pointi].hitPoint()-pt;
// override = true;
// }
//}
- //if (hit2[pointI].hit())
+ //if (hit2[pointi].hit())
//{
// if
// (
// meshRefiner_.isGap
// (
// planarCos,
- // nearestPoint[pointI],
- // nearestNormal[pointI],
- // hit2[pointI].hitPoint(),
- // normal2[pointI]
+ // nearestPoint[pointi],
+ // nearestNormal[pointi],
+ // hit2[pointi].hitPoint(),
+ // normal2[pointi]
// )
// )
// {
- // disp[pointI] = hit2[pointI].hitPoint()-pt;
+ // disp[pointi] = hit2[pointi].hitPoint()-pt;
// override = true;
// }
//}
- if (hit1[pointI].hit() && hit2[pointI].hit())
+ if (hit1[pointi].hit() && hit2[pointi].hit())
{
if
(
meshRefiner_.isGap
(
planarCos,
- hit1[pointI].hitPoint(),
- normal1[pointI],
- hit2[pointI].hitPoint(),
- normal2[pointI]
+ hit1[pointi].hitPoint(),
+ normal1[pointi],
+ hit2[pointi].hitPoint(),
+ normal2[pointi]
)
)
{
@@ -1528,17 +1528,17 @@ void Foam::snappySnapDriver::detectNearSurfaces
if (gapStr.valid())
{
- const point& intPt = hit2[pointI].hitPoint();
+ const point& intPt = hit2[pointi].hitPoint();
gapStr().write(linePointRef(pt, intPt));
}
// Choose hit2 : nearest to end point (so inside the domain)
- disp[pointI] = hit2[pointI].hitPoint()-pt;
+ disp[pointi] = hit2[pointi].hitPoint()-pt;
override = true;
}
}
- if (override && isPatchMasterPoint[pointI])
+ if (override && isPatchMasterPoint[pointi])
{
nOverride++;
}
@@ -1560,11 +1560,11 @@ void Foam::snappySnapDriver::detectNearSurfaces
forAll(zonedSurfaces, i)
{
- label zoneSurfI = zonedSurfaces[i];
+ label zoneSurfi = zonedSurfaces[i];
- const word& faceZoneName = surfZones[zoneSurfI].faceZoneName();
+ const word& faceZoneName = surfZones[zoneSurfi].faceZoneName();
- const labelList surfacesToTest(1, zoneSurfI);
+ const labelList surfacesToTest(1, zoneSurfi);
// Get indices of points both on faceZone and on pp.
labelList zonePointIndices
@@ -1607,10 +1607,10 @@ void Foam::snappySnapDriver::detectNearSurfaces
forAll(hit1, i)
{
- label pointI = zonePointIndices[i];
+ label pointi = zonePointIndices[i];
// Current location
- const point& pt = localPoints[pointI];
+ const point& pt = localPoints[pointi];
bool override = false;
@@ -1621,14 +1621,14 @@ void Foam::snappySnapDriver::detectNearSurfaces
// meshRefiner_.isGap
// (
// planarCos,
- // nearestPoint[pointI],
- // nearestNormal[pointI],
+ // nearestPoint[pointi],
+ // nearestNormal[pointi],
// hit1[i].hitPoint(),
// normal1[i]
// )
// )
// {
- // disp[pointI] = hit1[i].hitPoint()-pt;
+ // disp[pointi] = hit1[i].hitPoint()-pt;
// override = true;
// }
//}
@@ -1639,14 +1639,14 @@ void Foam::snappySnapDriver::detectNearSurfaces
// meshRefiner_.isGap
// (
// planarCos,
- // nearestPoint[pointI],
- // nearestNormal[pointI],
+ // nearestPoint[pointi],
+ // nearestNormal[pointi],
// hit2[i].hitPoint(),
// normal2[i]
// )
// )
// {
- // disp[pointI] = hit2[i].hitPoint()-pt;
+ // disp[pointi] = hit2[i].hitPoint()-pt;
// override = true;
// }
//}
@@ -1671,12 +1671,12 @@ void Foam::snappySnapDriver::detectNearSurfaces
gapStr().write(linePointRef(pt, intPt));
}
- disp[pointI] = hit2[i].hitPoint()-pt;
+ disp[pointi] = hit2[i].hitPoint()-pt;
override = true;
}
}
- if (override && isPatchMasterPoint[pointI])
+ if (override && isPatchMasterPoint[pointi])
{
nOverride++;
}
@@ -1736,9 +1736,9 @@ void Foam::snappySnapDriver::calcNearestSurface
{
if (hitInfo[i].hit())
{
- label pointI = zonePointIndices[i];
- nearestPoint[pointI] = hitInfo[i].hitPoint();
- nearestNormal[pointI] = hitNormal[i];
+ label pointi = zonePointIndices[i];
+ nearestPoint[pointi] = hitInfo[i].hitPoint();
+ nearestNormal[pointi] = hitNormal[i];
}
}
}
@@ -1761,11 +1761,11 @@ void Foam::snappySnapDriver::calcNearestSurface
{
if (hitInfo[i].hit())
{
- label pointI = zonePointIndices[i];
+ label pointi = zonePointIndices[i];
- patchDisp[pointI] = hitInfo[i].hitPoint() - localPoints[pointI];
- minSnapDist[pointI] = mag(patchDisp[pointI]);
- snapSurf[pointI] = hitSurface[i];
+ patchDisp[pointi] = hitInfo[i].hitPoint() - localPoints[pointi];
+ minSnapDist[pointi] = mag(patchDisp[pointi]);
+ snapSurf[pointi] = hitSurface[i];
}
}
}
@@ -1825,17 +1825,17 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
{
// Attract patch points to same region only
- forAll(surfaces.surfaces(), surfI)
+ forAll(surfaces.surfaces(), surfi)
{
- label geomI = surfaces.surfaces()[surfI];
- label nRegions = surfaces.geometry()[geomI].regions().size();
+ label geomi = surfaces.surfaces()[surfi];
+ label nRegions = surfaces.geometry()[geomi].regions().size();
- const labelList surfacesToTest(1, surfI);
+ const labelList surfacesToTest(1, surfi);
- for (label regionI = 0; regionI < nRegions; regionI++)
+ for (label regioni = 0; regioni < nRegions; regioni++)
{
- label globalI = surfaces.globalRegion(surfI, regionI);
- label masterPatchI = globalToMasterPatch[globalI];
+ label globali = surfaces.globalRegion(surfi, regioni);
+ label masterPatchi = globalToMasterPatch[globali];
// Get indices of points both on patch and on pp
labelList zonePointIndices
@@ -1843,7 +1843,7 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
getFacePoints
(
pp,
- mesh.boundaryMesh()[masterPatchI]
+ mesh.boundaryMesh()[masterPatchi]
)
);
@@ -1852,7 +1852,7 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
surfaces,
surfacesToTest,
- labelListList(1, labelList(1, regionI)), //regionsToTest
+ labelListList(1, labelList(1, regioni)), //regionsToTest
localPoints,
zonePointIndices,
@@ -1866,9 +1866,9 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
nearestNormal
);
- if (globalToSlavePatch[globalI] != masterPatchI)
+ if (globalToSlavePatch[globali] != masterPatchi)
{
- label slavePatchI = globalToSlavePatch[globalI];
+ label slavePatchi = globalToSlavePatch[globali];
// Get indices of points both on patch and on pp
labelList zonePointIndices
@@ -1876,7 +1876,7 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
getFacePoints
(
pp,
- mesh.boundaryMesh()[slavePatchI]
+ mesh.boundaryMesh()[slavePatchi]
)
);
@@ -1885,7 +1885,7 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
surfaces,
surfacesToTest,
- labelListList(1, labelList(1, regionI)),
+ labelListList(1, labelList(1, regioni)),
localPoints,
zonePointIndices,
@@ -1933,12 +1933,12 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
hitNormal
);
- forAll(hitInfo, pointI)
+ forAll(hitInfo, pointi)
{
- if (hitInfo[pointI].hit())
+ if (hitInfo[pointi].hit())
{
- nearestPoint[pointI] = hitInfo[pointI].hitPoint();
- nearestNormal[pointI] = hitNormal[pointI];
+ nearestPoint[pointi] = hitInfo[pointi].hitPoint();
+ nearestNormal[pointi] = hitNormal[pointi];
}
}
}
@@ -1954,15 +1954,15 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
);
}
- forAll(hitInfo, pointI)
+ forAll(hitInfo, pointi)
{
- if (hitInfo[pointI].hit())
+ if (hitInfo[pointi].hit())
{
- patchDisp[pointI] =
- hitInfo[pointI].hitPoint()
- - localPoints[pointI];
+ patchDisp[pointi] =
+ hitInfo[pointi].hitPoint()
+ - localPoints[pointi];
- snapSurf[pointI] = hitSurface[pointI];
+ snapSurf[pointi] = hitSurface[pointi];
}
}
@@ -1982,14 +1982,14 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
forAll(zonedSurfaces, i)
{
- label surfI = zonedSurfaces[i];
+ label surfi = zonedSurfaces[i];
- const word& faceZoneName = surfZones[surfI].faceZoneName();
+ const word& faceZoneName = surfZones[surfi].faceZoneName();
- const labelList surfacesToTest(1, surfI);
+ const labelList surfacesToTest(1, surfi);
- label geomI = surfaces.surfaces()[surfI];
- label nRegions = surfaces.geometry()[geomI].regions().size();
+ label geomi = surfaces.surfaces()[surfi];
+ label nRegions = surfaces.geometry()[geomi].regions().size();
// Get indices of points both on faceZone and on pp.
@@ -2027,15 +2027,15 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
// Check if all points are being snapped
- forAll(snapSurf, pointI)
+ forAll(snapSurf, pointi)
{
- if (snapSurf[pointI] == -1)
+ if (snapSurf[pointi] == -1)
{
WarningInFunction
- << "For point:" << pointI
- << " coordinate:" << localPoints[pointI]
+ << "For point:" << pointi
+ << " coordinate:" << localPoints[pointi]
<< " did not find any surface within:"
- << minSnapDist[pointI]
+ << minSnapDist[pointi]
<< " metre." << endl;
}
}
@@ -2065,16 +2065,16 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
// Limit amount of movement. Can not happen for triSurfaceMesh but
// can happen for some analytical shapes?
- forAll(patchDisp, patchPointI)
+ forAll(patchDisp, patchPointi)
{
- scalar magDisp = mag(patchDisp[patchPointI]);
+ scalar magDisp = mag(patchDisp[patchPointi]);
- if (magDisp > snapDist[patchPointI])
+ if (magDisp > snapDist[patchPointi])
{
- patchDisp[patchPointI] *= snapDist[patchPointI] / magDisp;
+ patchDisp[patchPointi] *= snapDist[patchPointi] / magDisp;
- Pout<< "Limiting displacement for " << patchPointI
- << " from " << magDisp << " to " << snapDist[patchPointI]
+ Pout<< "Limiting displacement for " << patchPointi
+ << " from " << magDisp << " to " << snapDist[patchPointi]
<< endl;
}
}
@@ -2264,11 +2264,11 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::repatchToSurface
PackedBoolList isZonedFace(mesh.nFaces());
{
// 1. Preserve faces in preserveFaces list
- forAll(preserveFaces, faceI)
+ forAll(preserveFaces, facei)
{
- if (preserveFaces[faceI] != -1)
+ if (preserveFaces[facei] != -1)
{
- isZonedFace.set(faceI, 1);
+ isZonedFace.set(facei, 1);
}
}
@@ -2278,8 +2278,8 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::repatchToSurface
forAll(zonedSurfaces, i)
{
- const label zoneSurfI = zonedSurfaces[i];
- const faceZone& fZone = fZones[surfZones[zoneSurfI].faceZoneName()];
+ const label zoneSurfi = zonedSurfaces[i];
+ const faceZone& fZone = fZones[surfZones[zoneSurfi].faceZoneName()];
forAll(fZone, i)
{
@@ -2311,15 +2311,15 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::repatchToSurface
const faceList& localFaces = pp.localFaces();
- forAll(localFaces, faceI)
+ forAll(localFaces, facei)
{
- const face& f = localFaces[faceI];
+ const face& f = localFaces[facei];
forAll(f, fp)
{
- faceSnapDist[faceI] = max
+ faceSnapDist[facei] = max
(
- faceSnapDist[faceI],
+ faceSnapDist[facei],
snapDist[f[fp]]
);
}
@@ -2343,9 +2343,9 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::repatchToSurface
// Get patch
forAll(pp, i)
{
- label faceI = pp.addressing()[i];
+ label facei = pp.addressing()[i];
- if (hitSurface[i] != -1 && !isZonedFace.get(faceI))
+ if (hitSurface[i] != -1 && !isZonedFace.get(facei))
{
closestPatch[i] = globalToMasterPatch_
[
@@ -2368,26 +2368,26 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::repatchToSurface
const polyBoundaryMesh& patches = mesh.boundaryMesh();
- forAll(patches, patchI)
+ forAll(patches, patchi)
{
- const polyPatch& pp = patches[patchI];
+ const polyPatch& pp = patches[patchi];
forAll(pp, i)
{
- ownPatch[pp.start()+i] = patchI;
- neiPatch[pp.start()+i] = patchI;
+ ownPatch[pp.start()+i] = patchi;
+ neiPatch[pp.start()+i] = patchi;
}
}
label nChanged = 0;
forAll(closestPatch, i)
{
- label faceI = pp.addressing()[i];
+ label facei = pp.addressing()[i];
- if (closestPatch[i] != -1 && closestPatch[i] != ownPatch[faceI])
+ if (closestPatch[i] != -1 && closestPatch[i] != ownPatch[facei])
{
- ownPatch[faceI] = closestPatch[i];
- neiPatch[faceI] = closestPatch[i];
+ ownPatch[facei] = closestPatch[i];
+ neiPatch[facei] = closestPatch[i];
nChanged++;
}
}
@@ -2425,9 +2425,9 @@ void Foam::snappySnapDriver::detectWarpedFaces
face f0(4);
face f1(4);
- forAll(localFaces, faceI)
+ forAll(localFaces, facei)
{
- const face& f = localFaces[faceI];
+ const face& f = localFaces[facei];
if (f.size() >= 4)
{
@@ -2486,7 +2486,7 @@ void Foam::snappySnapDriver::detectWarpedFaces
if (minCos < featureCos)
{
- splitFaces.append(bFaces[faceI]);
+ splitFaces.append(bFaces[facei]);
splits.append(minDiag);
}
}
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index 45535a7f1949e1494c0be9a26196bb3a1c238353..2846704f8013072ea36ba45ba6851759c4d9d301 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -70,12 +70,12 @@ bool Foam::snappySnapDriver::isFeaturePoint
const scalar featureCos,
const indirectPrimitivePatch& pp,
const PackedBoolList& isFeatureEdge,
- const label pointI
+ const label pointi
) const
{
const pointField& points = pp.localPoints();
const edgeList& edges = pp.edges();
- const labelList& pEdges = pp.pointEdges()[pointI];
+ const labelList& pEdges = pp.pointEdges()[pointi];
label nFeatEdges = 0;
@@ -89,24 +89,24 @@ bool Foam::snappySnapDriver::isFeaturePoint
{
if (isFeatureEdge[pEdges[j]])
{
- const edge& eI = edges[pEdges[i]];
- const edge& eJ = edges[pEdges[j]];
+ const edge& ei = edges[pEdges[i]];
+ const edge& ej = edges[pEdges[j]];
- const point& p = points[pointI];
- const point& pI = points[eI.otherVertex(pointI)];
- const point& pJ = points[eJ.otherVertex(pointI)];
+ const point& p = points[pointi];
+ const point& pi = points[ei.otherVertex(pointi)];
+ const point& pj = points[ej.otherVertex(pointi)];
- vector vI = p-pI;
- scalar vIMag = mag(vI);
+ vector vi = p-pi;
+ scalar viMag = mag(vi);
- vector vJ = pJ-p;
- scalar vJMag = mag(vJ);
+ vector vj = pj-p;
+ scalar vjMag = mag(vj);
if
(
- vIMag > SMALL
- && vJMag > SMALL
- && ((vI/vIMag & vJ/vJMag) < featureCos)
+ viMag > SMALL
+ && vjMag > SMALL
+ && ((vi/viMag & vj/vjMag) < featureCos)
)
{
return true;
@@ -158,25 +158,25 @@ void Foam::snappySnapDriver::smoothAndConstrain
const labelListList& pointEdges = pp.pointEdges();
const edgeList& edges = pp.edges();
- forAll(pointEdges, pointI)
+ forAll(pointEdges, pointi)
{
- const labelList& pEdges = pointEdges[pointI];
+ const labelList& pEdges = pointEdges[pointi];
- label nConstraints = constraints[pointI].first();
+ label nConstraints = constraints[pointi].first();
if (nConstraints <= 1)
{
forAll(pEdges, i)
{
- label edgeI = pEdges[i];
+ label edgei = pEdges[i];
- if (isPatchMasterEdge[edgeI])
+ if (isPatchMasterEdge[edgei])
{
- label nbrPointI = edges[edgeI].otherVertex(pointI);
- if (constraints[nbrPointI].first() >= nConstraints)
+ label nbrPointi = edges[edgei].otherVertex(pointi);
+ if (constraints[nbrPointi].first() >= nConstraints)
{
- dispSum[pointI] += disp[nbrPointI];
- dispCount[pointI]++;
+ dispSum[pointi] += disp[nbrPointi];
+ dispCount[pointi]++;
}
}
}
@@ -203,14 +203,14 @@ void Foam::snappySnapDriver::smoothAndConstrain
);
// Constraints
- forAll(constraints, pointI)
+ forAll(constraints, pointi)
{
- if (dispCount[pointI] > 0)
+ if (dispCount[pointi] > 0)
{
// Mix my displacement with neighbours' displacement
- disp[pointI] =
+ disp[pointi] =
0.5
- *(disp[pointI] + dispSum[pointI]/dispCount[pointI]);
+ *(disp[pointi] + dispSum[pointi]/dispCount[pointi]);
}
}
}
@@ -258,19 +258,19 @@ void Foam::snappySnapDriver::calcNearestFace
forAll(zonedSurfaces, i)
{
- label zoneSurfI = zonedSurfaces[i];
+ label zoneSurfi = zonedSurfaces[i];
- const word& faceZoneName = surfZones[zoneSurfI].faceZoneName();
+ const word& faceZoneName = surfZones[zoneSurfi].faceZoneName();
// Get indices of faces on pp that are also in zone
- label zoneI = mesh.faceZones().findZoneID(faceZoneName);
- if (zoneI == -1)
+ label zonei = mesh.faceZones().findZoneID(faceZoneName);
+ if (zonei == -1)
{
FatalErrorInFunction
<< "Problem. Cannot find zone " << faceZoneName
<< exit(FatalError);
}
- const faceZone& fZone = mesh.faceZones()[zoneI];
+ const faceZone& fZone = mesh.faceZones()[zonei];
PackedBoolList isZonedFace(mesh.nFaces());
forAll(fZone, i)
{
@@ -283,7 +283,7 @@ void Foam::snappySnapDriver::calcNearestFace
{
if (isZonedFace[pp.addressing()[i]])
{
- snapSurf[i] = zoneSurfI;
+ snapSurf[i] = zoneSurfi;
ppFaces.append(i);
meshFaces.append(pp.addressing()[i]);
}
@@ -308,7 +308,7 @@ void Foam::snappySnapDriver::calcNearestFace
vectorField hitNormal;
surfaces.findNearestRegion
(
- labelList(1, zoneSurfI),
+ labelList(1, zoneSurfi),
fc,
sqr(faceSnapDist),// sqr of attract dist
hitSurface,
@@ -317,23 +317,23 @@ void Foam::snappySnapDriver::calcNearestFace
hitNormal
);
- forAll(hitInfo, hitI)
+ forAll(hitInfo, hiti)
{
- if (hitInfo[hitI].hit())
+ if (hitInfo[hiti].hit())
{
- label faceI = ppFaces[hitI];
- faceDisp[faceI] = hitInfo[hitI].hitPoint() - fc[hitI];
- faceSurfaceNormal[faceI] = hitNormal[hitI];
- faceSurfaceGlobalRegion[faceI] = surfaces.globalRegion
+ label facei = ppFaces[hiti];
+ faceDisp[facei] = hitInfo[hiti].hitPoint() - fc[hiti];
+ faceSurfaceNormal[facei] = hitNormal[hiti];
+ faceSurfaceGlobalRegion[facei] = surfaces.globalRegion
(
- hitSurface[hitI],
- hitRegion[hitI]
+ hitSurface[hiti],
+ hitRegion[hiti]
);
}
else
{
WarningInFunction
- << "Did not find surface near face centre " << fc[hitI]
+ << "Did not find surface near face centre " << fc[hiti]
<< endl;
}
}
@@ -381,23 +381,23 @@ void Foam::snappySnapDriver::calcNearestFace
hitNormal
);
- forAll(hitInfo, hitI)
+ forAll(hitInfo, hiti)
{
- if (hitInfo[hitI].hit())
+ if (hitInfo[hiti].hit())
{
- label faceI = ppFaces[hitI];
- faceDisp[faceI] = hitInfo[hitI].hitPoint() - fc[hitI];
- faceSurfaceNormal[faceI] = hitNormal[hitI];
- faceSurfaceGlobalRegion[faceI] = surfaces.globalRegion
+ label facei = ppFaces[hiti];
+ faceDisp[facei] = hitInfo[hiti].hitPoint() - fc[hiti];
+ faceSurfaceNormal[facei] = hitNormal[hiti];
+ faceSurfaceGlobalRegion[facei] = surfaces.globalRegion
(
- hitSurface[hitI],
- hitRegion[hitI]
+ hitSurface[hiti],
+ hitRegion[hiti]
);
}
else
{
WarningInFunction
- << "Did not find surface near face centre " << fc[hitI]
+ << "Did not find surface near face centre " << fc[hiti]
<< endl;
}
}
@@ -410,12 +410,12 @@ void Foam::snappySnapDriver::calcNearestFace
//faceRotation.setSize(pp.size());
//faceRotation = Zero;
//
- //forAll(faceRotation, faceI)
+ //forAll(faceRotation, facei)
//{
// // Note: extend to >180 degrees checking
- // faceRotation[faceI] =
- // pp.faceNormals()[faceI]
- // ^ faceSurfaceNormal[faceI];
+ // faceRotation[facei] =
+ // pp.faceNormals()[facei]
+ // ^ faceSurfaceNormal[facei];
//}
//
//if (debug&meshRefinement::ATTRACTION)
@@ -473,43 +473,43 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
pointFacePatchID.setSize(pp.nPoints());
// Fill local data
- forAll(pp.pointFaces(), pointI)
+ forAll(pp.pointFaces(), pointi)
{
- const labelList& pFaces = pp.pointFaces()[pointI];
+ const labelList& pFaces = pp.pointFaces()[pointi];
// Count valid face normals
label nFaces = 0;
forAll(pFaces, i)
{
- label faceI = pFaces[i];
- if (isMasterFace[faceI] && faceSurfaceGlobalRegion[faceI] != -1)
+ label facei = pFaces[i];
+ if (isMasterFace[facei] && faceSurfaceGlobalRegion[facei] != -1)
{
nFaces++;
}
}
- List<point>& pNormals = pointFaceSurfNormals[pointI];
+ List<point>& pNormals = pointFaceSurfNormals[pointi];
pNormals.setSize(nFaces);
- List<point>& pDisp = pointFaceDisp[pointI];
+ List<point>& pDisp = pointFaceDisp[pointi];
pDisp.setSize(nFaces);
- List<point>& pFc = pointFaceCentres[pointI];
+ List<point>& pFc = pointFaceCentres[pointi];
pFc.setSize(nFaces);
- labelList& pFid = pointFacePatchID[pointI];
+ labelList& pFid = pointFacePatchID[pointi];
pFid.setSize(nFaces);
nFaces = 0;
forAll(pFaces, i)
{
- label faceI = pFaces[i];
- label globalRegionI = faceSurfaceGlobalRegion[faceI];
+ label facei = pFaces[i];
+ label globalRegioni = faceSurfaceGlobalRegion[facei];
- if (isMasterFace[faceI] && globalRegionI != -1)
+ if (isMasterFace[facei] && globalRegioni != -1)
{
- pNormals[nFaces] = faceSurfaceNormal[faceI];
- pDisp[nFaces] = faceDisp[faceI];
- pFc[nFaces] = pp.faceCentres()[faceI];
- pFid[nFaces] = globalToMasterPatch_[globalRegionI];
+ pNormals[nFaces] = faceSurfaceNormal[facei];
+ pDisp[nFaces] = faceDisp[facei];
+ pFc[nFaces] = pp.faceCentres()[facei];
+ pFid[nFaces] = globalToMasterPatch_[globalRegioni];
nFaces++;
}
}
@@ -528,16 +528,16 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
labelList patchID(pbm.patchID());
// Unmark all non-coupled boundary faces
- forAll(pbm, patchI)
+ forAll(pbm, patchi)
{
- const polyPatch& pp = pbm[patchI];
+ const polyPatch& pp = pbm[patchi];
if (pp.coupled() || isA<emptyPolyPatch>(pp))
{
forAll(pp, i)
{
- label meshFaceI = pp.start()+i;
- patchID[meshFaceI-mesh.nInternalFaces()] = -1;
+ label meshFacei = pp.start()+i;
+ patchID[meshFacei-mesh.nInternalFaces()] = -1;
}
}
}
@@ -545,8 +545,8 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
// Remove any meshed faces
forAll(pp.addressing(), i)
{
- label meshFaceI = pp.addressing()[i];
- patchID[meshFaceI-mesh.nInternalFaces()] = -1;
+ label meshFacei = pp.addressing()[i];
+ patchID[meshFacei-mesh.nInternalFaces()] = -1;
}
@@ -567,10 +567,10 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
const labelListList& edgeFaces = pp.edgeFaces();
const edgeList& edges = pp.edges();
- forAll(edgeFaces, edgeI)
+ forAll(edgeFaces, edgei)
{
- const edge& e = edges[edgeI];
- const labelList& eFaces = edgeFaces[edgeI];
+ const edge& e = edges[edgei];
+ const labelList& eFaces = edgeFaces[edgei];
if (eFaces.size() == 1)
{
@@ -589,38 +589,38 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
// Construct labelList equivalent of meshPointMap
labelList meshToPatchPoint(mesh.nPoints(), -1);
- forAll(pp.meshPoints(), pointI)
+ forAll(pp.meshPoints(), pointi)
{
- meshToPatchPoint[pp.meshPoints()[pointI]] = pointI;
+ meshToPatchPoint[pp.meshPoints()[pointi]] = pointi;
}
- forAll(patchID, bFaceI)
+ forAll(patchID, bFacei)
{
- label patchI = patchID[bFaceI];
+ label patchi = patchID[bFacei];
- if (patchI != -1)
+ if (patchi != -1)
{
- label faceI = mesh.nInternalFaces()+bFaceI;
- const face& f = mesh.faces()[faceI];
+ label facei = mesh.nInternalFaces()+bFacei;
+ const face& f = mesh.faces()[facei];
forAll(f, fp)
{
- label pointI = meshToPatchPoint[f[fp]];
+ label pointi = meshToPatchPoint[f[fp]];
- if (pointI != -1 && isBoundaryPoint[pointI])
+ if (pointi != -1 && isBoundaryPoint[pointi])
{
- List<point>& pNormals = pointFaceSurfNormals[pointI];
- List<point>& pDisp = pointFaceDisp[pointI];
- List<point>& pFc = pointFaceCentres[pointI];
- labelList& pFid = pointFacePatchID[pointI];
+ List<point>& pNormals = pointFaceSurfNormals[pointi];
+ List<point>& pDisp = pointFaceDisp[pointi];
+ List<point>& pFc = pointFaceCentres[pointi];
+ labelList& pFid = pointFacePatchID[pointi];
const point& pt = mesh.points()[f[fp]];
- vector fn = mesh.faceAreas()[faceI];
+ vector fn = mesh.faceAreas()[facei];
pNormals.append(fn/mag(fn));
- pDisp.append(mesh.faceCentres()[faceI]-pt);
- pFc.append(mesh.faceCentres()[faceI]);
- pFid.append(patchI);
+ pDisp.append(mesh.faceCentres()[facei]-pt);
+ pFc.append(mesh.faceCentres()[facei]);
+ pFid.append(patchi);
}
}
}
@@ -667,12 +667,12 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
// Sort the data according to the face centres. This is only so we get
// consistent behaviour serial and parallel.
labelList visitOrder;
- forAll(pointFaceDisp, pointI)
+ forAll(pointFaceDisp, pointi)
{
- List<point>& pNormals = pointFaceSurfNormals[pointI];
- List<point>& pDisp = pointFaceDisp[pointI];
- List<point>& pFc = pointFaceCentres[pointI];
- labelList& pFid = pointFacePatchID[pointI];
+ List<point>& pNormals = pointFaceSurfNormals[pointi];
+ List<point>& pDisp = pointFaceDisp[pointi];
+ List<point>& pFc = pointFaceCentres[pointi];
+ labelList& pFid = pointFacePatchID[pointi];
sortedOrder(mag(pFc)(), visitOrder);
@@ -845,9 +845,9 @@ Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
}
}
- forAll(normalToPatch, normalI)
+ forAll(normalToPatch, normali)
{
- if (normalToPatch[normalI] == -2)
+ if (normalToPatch[normali] == -2)
{
// Multiple patches on same normals plane, flat region
// edge
@@ -874,21 +874,21 @@ void Foam::snappySnapDriver::writeStats
label nEdge = 0;
label nPoint = 0;
- forAll(patchConstraints, pointI)
+ forAll(patchConstraints, pointi)
{
- if (isPatchMasterPoint[pointI])
+ if (isPatchMasterPoint[pointi])
{
nMasterPoints++;
- if (patchConstraints[pointI].first() == 1)
+ if (patchConstraints[pointi].first() == 1)
{
nPlanar++;
}
- else if (patchConstraints[pointI].first() == 2)
+ else if (patchConstraints[pointi].first() == 2)
{
nEdge++;
}
- else if (patchConstraints[pointI].first() == 3)
+ else if (patchConstraints[pointi].first() == 3)
{
nPoint++;
}
@@ -918,7 +918,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
const indirectPrimitivePatch& pp,
const scalarField& snapDist,
const vectorField& nearestDisp,
- const label pointI,
+ const label pointi,
const List<List<point>>& pointFaceSurfNormals,
const List<List<point>>& pointFaceDisp,
@@ -936,9 +936,9 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
patchAttraction = Zero;
patchConstraint = pointConstraint();
- const List<point>& pfSurfNormals = pointFaceSurfNormals[pointI];
- const List<point>& pfDisp = pointFaceDisp[pointI];
- const List<point>& pfCentres = pointFaceCentres[pointI];
+ const List<point>& pfSurfNormals = pointFaceSurfNormals[pointi];
+ const List<point>& pfDisp = pointFaceDisp[pointi];
+ const List<point>& pfCentres = pointFaceCentres[pointi];
// Bin according to surface normal
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -962,7 +962,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
const vector& fDisp = pfDisp[i];
// What to do with very far attraction? For now just ignore the face
- if (magSqr(fDisp) < sqr(snapDist[pointI]) && mag(fSNormal) > VSMALL)
+ if (magSqr(fDisp) < sqr(snapDist[pointi]) && mag(fSNormal) > VSMALL)
{
const point pt = fc + fDisp;
@@ -1019,7 +1019,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
plane pl3(pt, fSNormal);
point p013(pl0.planePlaneIntersect(pl1, pl3));
- if (mag(p012-p013) > snapDist[pointI])
+ if (mag(p012-p013) > snapDist[pointi])
{
// Different feature point
surfacePoints.append(pt);
@@ -1033,7 +1033,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
}
- const point& pt = pp.localPoints()[pointI];
+ const point& pt = pp.localPoints()[pointi];
// Check the number of directions
if (surfaceNormals.size() == 1)
@@ -1044,9 +1044,9 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
*surfaceNormals[0];
// Trim to snap distance
- if (magSqr(d) > sqr(snapDist[pointI]))
+ if (magSqr(d) > sqr(snapDist[pointi]))
{
- d *= Foam::sqrt(sqr(snapDist[pointI])/magSqr(d));
+ d *= Foam::sqrt(sqr(snapDist[pointi])/magSqr(d));
}
patchAttraction = d;
@@ -1066,9 +1066,9 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
d -= (d&n)*n;
// Trim to snap distance
- if (magSqr(d) > sqr(snapDist[pointI]))
+ if (magSqr(d) > sqr(snapDist[pointi]))
{
- d *= Foam::sqrt(sqr(snapDist[pointI])/magSqr(d));
+ d *= Foam::sqrt(sqr(snapDist[pointi])/magSqr(d));
}
patchAttraction = d;
@@ -1087,9 +1087,9 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
vector d = cornerPt - pt;
// Trim to snap distance
- if (magSqr(d) > sqr(snapDist[pointI]))
+ if (magSqr(d) > sqr(snapDist[pointi]))
{
- d *= Foam::sqrt(sqr(snapDist[pointI])/magSqr(d));
+ d *= Foam::sqrt(sqr(snapDist[pointi])/magSqr(d));
}
patchAttraction = d;
@@ -1153,7 +1153,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
DynamicList<vector> surfaceNormals(4);
labelList faceToNormalBin;
- forAll(pp.localPoints(), pointI)
+ forAll(pp.localPoints(), pointi)
{
vector attraction = Zero;
pointConstraint constraint;
@@ -1167,7 +1167,7 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
snapDist,
nearestDisp,
- pointI,
+ pointi,
pointFaceSurfNormals,
pointFaceDisp,
@@ -1184,25 +1184,25 @@ void Foam::snappySnapDriver::featureAttractionUsingReconstruction
if
(
- (constraint.first() > patchConstraints[pointI].first())
+ (constraint.first() > patchConstraints[pointi].first())
|| (
- (constraint.first() == patchConstraints[pointI].first())
- && (magSqr(attraction) < magSqr(patchAttraction[pointI]))
+ (constraint.first() == patchConstraints[pointi].first())
+ && (magSqr(attraction) < magSqr(patchAttraction[pointi]))
)
)
{
- patchAttraction[pointI] = attraction;
- patchConstraints[pointI] = constraint;
+ patchAttraction[pointi] = attraction;
+ patchConstraints[pointi] = constraint;
- const point& pt = pp.localPoints()[pointI];
+ const point& pt = pp.localPoints()[pointi];
- if (patchConstraints[pointI].first() == 2 && feStr.valid())
+ if (patchConstraints[pointi].first() == 2 && feStr.valid())
{
- feStr().write(linePointRef(pt, pt+patchAttraction[pointI]));
+ feStr().write(linePointRef(pt, pt+patchAttraction[pointi]));
}
- else if (patchConstraints[pointI].first() == 3 && fpStr.valid())
+ else if (patchConstraints[pointi].first() == 3 && fpStr.valid())
{
- fpStr().write(linePointRef(pt, pt+patchAttraction[pointI]));
+ fpStr().write(linePointRef(pt, pt+patchAttraction[pointi]));
}
}
}
@@ -1251,29 +1251,29 @@ void Foam::snappySnapDriver::stringFeatureEdges
label nChanged = 0;
const labelListList& pointEdges = pp.pointEdges();
- forAll(pointEdges, pointI)
+ forAll(pointEdges, pointi)
{
- if (patchConstraints[pointI].first() == 2)
+ if (patchConstraints[pointi].first() == 2)
{
- const point& pt = pp.localPoints()[pointI];
- const labelList& pEdges = pointEdges[pointI];
- const vector& featVec = patchConstraints[pointI].second();
+ const point& pt = pp.localPoints()[pointi];
+ const labelList& pEdges = pointEdges[pointi];
+ const vector& featVec = patchConstraints[pointi].second();
// Detect whether there are edges in both directions.
// (direction along the feature edge that is)
bool hasPos = false;
bool hasNeg = false;
- forAll(pEdges, pEdgeI)
+ forAll(pEdges, pEdgei)
{
- const edge& e = pp.edges()[pEdges[pEdgeI]];
- label nbrPointI = e.otherVertex(pointI);
+ const edge& e = pp.edges()[pEdges[pEdgei]];
+ label nbrPointi = e.otherVertex(pointi);
- if (patchConstraints[nbrPointI].first() > 1)
+ if (patchConstraints[nbrPointi].first() > 1)
{
- const point& nbrPt = pp.localPoints()[nbrPointI];
+ const point& nbrPt = pp.localPoints()[nbrPointi];
const point featPt =
- nbrPt + patchAttraction[nbrPointI];
+ nbrPt + patchAttraction[nbrPointi];
const scalar cosAngle = (featVec & (featPt-pt));
if (cosAngle > 0)
@@ -1290,41 +1290,41 @@ void Foam::snappySnapDriver::stringFeatureEdges
if (!hasPos || !hasNeg)
{
//Pout<< "**Detected feature string end at "
- // << pp.localPoints()[pointI] << endl;
+ // << pp.localPoints()[pointi] << endl;
// No string. Assign best choice on either side
- label bestPosPointI = -1;
+ label bestPosPointi = -1;
scalar minPosDistSqr = GREAT;
- label bestNegPointI = -1;
+ label bestNegPointi = -1;
scalar minNegDistSqr = GREAT;
- forAll(pEdges, pEdgeI)
+ forAll(pEdges, pEdgei)
{
- const edge& e = pp.edges()[pEdges[pEdgeI]];
- label nbrPointI = e.otherVertex(pointI);
+ const edge& e = pp.edges()[pEdges[pEdgei]];
+ label nbrPointi = e.otherVertex(pointi);
if
(
- patchConstraints[nbrPointI].first() <= 1
- && rawPatchConstraints[nbrPointI].first() > 1
+ patchConstraints[nbrPointi].first() <= 1
+ && rawPatchConstraints[nbrPointi].first() > 1
)
{
const vector& nbrFeatVec =
- rawPatchConstraints[pointI].second();
+ rawPatchConstraints[pointi].second();
if (mag(featVec&nbrFeatVec) > featureCos)
{
- // nbrPointI attracted to sameish feature
+ // nbrPointi attracted to sameish feature
// Note: also check on position.
scalar d2 = magSqr
(
- rawPatchAttraction[nbrPointI]
+ rawPatchAttraction[nbrPointi]
);
const point featPt =
- pp.localPoints()[nbrPointI]
- + rawPatchAttraction[nbrPointI];
+ pp.localPoints()[nbrPointi]
+ + rawPatchAttraction[nbrPointi];
const scalar cosAngle =
(featVec & (featPt-pt));
@@ -1333,7 +1333,7 @@ void Foam::snappySnapDriver::stringFeatureEdges
if (!hasPos && d2 < minPosDistSqr)
{
minPosDistSqr = d2;
- bestPosPointI = nbrPointI;
+ bestPosPointi = nbrPointi;
}
}
else
@@ -1341,44 +1341,44 @@ void Foam::snappySnapDriver::stringFeatureEdges
if (!hasNeg && d2 < minNegDistSqr)
{
minNegDistSqr = d2;
- bestNegPointI = nbrPointI;
+ bestNegPointi = nbrPointi;
}
}
}
}
}
- if (bestPosPointI != -1)
+ if (bestPosPointi != -1)
{
// Use reconstructed-feature attraction. Use only
// part of it since not sure...
//const point& bestPt =
- // pp.localPoints()[bestPosPointI];
+ // pp.localPoints()[bestPosPointi];
//Pout<< "**Overriding point " << bestPt
// << " on reconstructed feature edge at "
- // << rawPatchAttraction[bestPosPointI]+bestPt
+ // << rawPatchAttraction[bestPosPointi]+bestPt
// << " to attracted-to-feature-edge." << endl;
- patchAttraction[bestPosPointI] =
- 0.5*rawPatchAttraction[bestPosPointI];
- patchConstraints[bestPosPointI] =
- rawPatchConstraints[bestPosPointI];
+ patchAttraction[bestPosPointi] =
+ 0.5*rawPatchAttraction[bestPosPointi];
+ patchConstraints[bestPosPointi] =
+ rawPatchConstraints[bestPosPointi];
nChanged++;
}
- if (bestNegPointI != -1)
+ if (bestNegPointi != -1)
{
// Use reconstructed-feature attraction. Use only
// part of it since not sure...
//const point& bestPt =
- // pp.localPoints()[bestNegPointI];
+ // pp.localPoints()[bestNegPointi];
//Pout<< "**Overriding point " << bestPt
// << " on reconstructed feature edge at "
- // << rawPatchAttraction[bestNegPointI]+bestPt
+ // << rawPatchAttraction[bestNegPointi]+bestPt
// << " to attracted-to-feature-edge." << endl;
- patchAttraction[bestNegPointI] =
- 0.5*rawPatchAttraction[bestNegPointI];
- patchConstraints[bestNegPointI] =
- rawPatchConstraints[bestNegPointI];
+ patchAttraction[bestNegPointi] =
+ 0.5*rawPatchAttraction[bestNegPointi];
+ patchConstraints[bestNegPointi] =
+ rawPatchConstraints[bestNegPointi];
nChanged++;
}
@@ -1436,37 +1436,37 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
// 1. Mark points on multiple patches
PackedBoolList isMultiPatchPoint(pp.size());
- forAll(pointFacePatchID, pointI)
+ forAll(pointFacePatchID, pointi)
{
pointIndexHit multiPatchPt = findMultiPatchPoint
(
- pp.localPoints()[pointI],
- pointFacePatchID[pointI],
- pointFaceCentres[pointI]
+ pp.localPoints()[pointi],
+ pointFacePatchID[pointi],
+ pointFaceCentres[pointi]
);
- isMultiPatchPoint[pointI] = multiPatchPt.hit();
+ isMultiPatchPoint[pointi] = multiPatchPt.hit();
}
// 2. Make sure multi-patch points are also attracted
- forAll(isMultiPatchPoint, pointI)
+ forAll(isMultiPatchPoint, pointi)
{
- if (isMultiPatchPoint[pointI])
+ if (isMultiPatchPoint[pointi])
{
if
(
- patchConstraints[pointI].first() <= 1
- && rawPatchConstraints[pointI].first() > 1
+ patchConstraints[pointi].first() <= 1
+ && rawPatchConstraints[pointi].first() > 1
)
{
- patchAttraction[pointI] = rawPatchAttraction[pointI];
- patchConstraints[pointI] = rawPatchConstraints[pointI];
+ patchAttraction[pointi] = rawPatchAttraction[pointi];
+ patchConstraints[pointi] = rawPatchConstraints[pointi];
//if (multiPatchStr.valid())
//{
// Pout<< "Adding constraint on multiPatchPoint:"
- // << pp.localPoints()[pointI]
- // << " constraint:" << patchConstraints[pointI]
- // << " attraction:" << patchAttraction[pointI]
+ // << pp.localPoints()[pointi]
+ // << " constraint:" << patchConstraints[pointi]
+ // << " attraction:" << patchAttraction[pointi]
// << endl;
//}
}
@@ -1478,18 +1478,18 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
// 3. Knock out any attraction on faces with multi-patch points
label nChanged = 0;
- forAll(pp.localFaces(), faceI)
+ forAll(pp.localFaces(), facei)
{
- const face& f = pp.localFaces()[faceI];
+ const face& f = pp.localFaces()[facei];
label nMultiPatchPoints = 0;
forAll(f, fp)
{
- label pointI = f[fp];
+ label pointi = f[fp];
if
(
- isMultiPatchPoint[pointI]
- && patchConstraints[pointI].first() > 1
+ isMultiPatchPoint[pointi]
+ && patchConstraints[pointi].first() > 1
)
{
nMultiPatchPoints++;
@@ -1500,23 +1500,23 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
{
forAll(f, fp)
{
- label pointI = f[fp];
+ label pointi = f[fp];
if
(
- !isMultiPatchPoint[pointI]
- && patchConstraints[pointI].first() > 1
+ !isMultiPatchPoint[pointi]
+ && patchConstraints[pointi].first() > 1
)
{
//Pout<< "Knocking out constraint"
// << " on non-multiPatchPoint:"
- // << pp.localPoints()[pointI] << endl;
- patchAttraction[pointI] = Zero;
- patchConstraints[pointI] = pointConstraint();
+ // << pp.localPoints()[pointi] << endl;
+ patchAttraction[pointi] = Zero;
+ patchConstraints[pointi] = pointConstraint();
nChanged++;
if (multiPatchStr.valid())
{
- multiPatchStr().write(pp.localPoints()[pointI]);
+ multiPatchStr().write(pp.localPoints()[pointi]);
}
}
}
@@ -1534,10 +1534,10 @@ Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
const indirectPrimitivePatch& pp,
const vectorField& patchAttraction,
const List<pointConstraint>& patchConstraints,
- const label faceI
+ const label facei
) const
{
- const face& f = pp.localFaces()[faceI];
+ const face& f = pp.localFaces()[facei];
// For now just detect any attraction. Improve this to look at
// actual attraction position and orientation
@@ -1672,13 +1672,13 @@ Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
const List<pointConstraint>& patchConstraints,
const vectorField& nearestAttr,
const vectorField& nearestNormal,
- const label faceI,
+ const label facei,
DynamicField<point>& points0,
DynamicField<point>& points1
) const
{
- const face& localF = pp.localFaces()[faceI];
+ const face& localF = pp.localFaces()[facei];
labelPair attractIndices(-1, -1);
@@ -1690,10 +1690,10 @@ Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
//// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//// (is this necessary?)
//const polyMesh& mesh = meshRefiner_.mesh();
- //label meshFaceI = pp.addressing()[faceI];
- //const face& meshF = mesh.faces()[meshFaceI];
- //label cellI = mesh.faceOwner()[meshFaceI];
- //const labelList& cPoints = mesh.cellPoints(cellI);
+ //label meshFacei = pp.addressing()[facei];
+ //const face& meshF = mesh.faces()[meshFacei];
+ //label celli = mesh.faceOwner()[meshFacei];
+ //const labelList& cPoints = mesh.cellPoints(celli);
//
//point cc(mesh.points()[meshF[0]]);
//for (label i = 1; i < meshF.size(); i++)
@@ -1702,14 +1702,14 @@ Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
//}
//forAll(cPoints, i)
//{
- // label pointI = cPoints[i];
- // if (findIndex(meshF, pointI) == -1)
+ // label pointi = cPoints[i];
+ // if (findIndex(meshF, pointi) == -1)
// {
- // cc += mesh.points()[pointI];
+ // cc += mesh.points()[pointi];
// }
//}
//cc /= cPoints.size();
- ////const point& cc = mesh.cellCentres()[cellI];
+ ////const point& cc = mesh.cellCentres()[celli];
//
//const scalar vol = pyrVol(pp, patchAttr, localF, cc);
//const scalar area = localF.mag(localPts);
@@ -1733,11 +1733,11 @@ Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
endFp++
)
{
- label startPtI = localF[startFp];
- label endPtI = localF[endFp];
+ label startPti = localF[startFp];
+ label endPti = localF[endFp];
- const pointConstraint& startPc = patchConstraints[startPtI];
- const pointConstraint& endPc = patchConstraints[endPtI];
+ const pointConstraint& startPc = patchConstraints[startPti];
+ const pointConstraint& endPc = patchConstraints[endPti];
if (startPc.first() >= 2 && endPc.first() >= 2)
{
@@ -1746,8 +1746,8 @@ Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
// Check if
// - sameish feature edge normal
// - diagonal aligned with feature edge normal
- point start = localPts[startPtI]+patchAttr[startPtI];
- point end = localPts[endPtI]+patchAttr[endPtI];
+ point start = localPts[startPti]+patchAttr[startPti];
+ point end = localPts[endPti]+patchAttr[endPti];
if
(
@@ -1790,8 +1790,8 @@ Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
points0.append(localPts[f0[0]] + patchAttr[f0[0]]);
for (label fp=1; fp < f0.size()-1; fp++)
{
- label pI = f0[fp];
- points0.append(localPts[pI] + nearestAttr[pI]);
+ label pi = f0[fp];
+ points0.append(localPts[pi] + nearestAttr[pi]);
}
points0.append
(
@@ -1821,8 +1821,8 @@ Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
points1.append(localPts[f1[0]] + patchAttr[f1[0]]);
for (label fp=1; fp < f1.size()-1; fp++)
{
- label pI = f1[fp];
- points1.append(localPts[pI] + nearestAttr[pI]);
+ label pi = f1[fp];
+ points1.append(localPts[pi] + nearestAttr[pi]);
}
points1.append
(
@@ -1909,7 +1909,7 @@ void Foam::snappySnapDriver::splitDiagonals
DynamicField<point> facePoints0;
DynamicField<point> facePoints1;
- forAll(bFaces, faceI)
+ forAll(bFaces, facei)
{
const labelPair split
(
@@ -1925,7 +1925,7 @@ void Foam::snappySnapDriver::splitDiagonals
nearestAttraction,
nearestNormal,
- faceI,
+ facei,
facePoints0,
facePoints1
@@ -1934,10 +1934,10 @@ void Foam::snappySnapDriver::splitDiagonals
if (split != labelPair(-1, -1))
{
- splitFaces.append(bFaces[faceI]);
+ splitFaces.append(bFaces[facei]);
splits.append(split);
- const face& f = pp.localFaces()[faceI];
+ const face& f = pp.localFaces()[facei];
// Knock out other attractions on face
forAll(f, fp)
@@ -1977,16 +1977,16 @@ void Foam::snappySnapDriver::avoidDiagonalAttraction
List<pointConstraint>& patchConstraints
) const
{
- forAll(pp.localFaces(), faceI)
+ forAll(pp.localFaces(), facei)
{
- const face& f = pp.localFaces()[faceI];
+ const face& f = pp.localFaces()[facei];
labelPair diag = findDiagonalAttraction
(
pp,
patchAttraction,
patchConstraints,
- faceI
+ facei
);
if (diag[0] != -1 && diag[1] != -1)
@@ -2022,10 +2022,10 @@ void Foam::snappySnapDriver::avoidDiagonalAttraction
scalar minDistSqr = GREAT;
forAll(f, fp)
{
- label pointI = f[fp];
- if (patchConstraints[pointI].first() <= 1)
+ label pointi = f[fp];
+ if (patchConstraints[pointi].first() <= 1)
{
- const point& pt = pp.localPoints()[pointI];
+ const point& pt = pp.localPoints()[pointi];
scalar distSqr = magSqr(mid-pt);
if (distSqr < minDistSqr)
{
@@ -2036,10 +2036,10 @@ void Foam::snappySnapDriver::avoidDiagonalAttraction
}
if (minFp != -1)
{
- label minPointI = f[minFp];
- patchAttraction[minPointI] =
- mid-pp.localPoints()[minPointI];
- patchConstraints[minPointI] = patchConstraints[f[diag[0]]];
+ label minPointi = f[minFp];
+ patchAttraction[minPointi] =
+ mid-pp.localPoints()[minPointi];
+ patchConstraints[minPointi] = patchConstraints[f[diag[0]]];
}
}
else
@@ -2071,7 +2071,7 @@ Foam::snappySnapDriver::findNearFeatureEdge
const indirectPrimitivePatch& pp,
const scalarField& snapDist,
- const label pointI,
+ const label pointi,
const point& estimatedPt,
List<List<DynamicList<point>>>& edgeAttractors,
@@ -2091,7 +2091,7 @@ Foam::snappySnapDriver::findNearFeatureEdge
features.findNearestRegionEdge
(
pointField(1, estimatedPt),
- scalarField(1, sqr(snapDist[pointI])),
+ scalarField(1, sqr(snapDist[pointi])),
nearEdgeFeat,
nearEdgeInfo,
nearNormal
@@ -2102,7 +2102,7 @@ Foam::snappySnapDriver::findNearFeatureEdge
features.findNearestEdge
(
pointField(1, estimatedPt),
- scalarField(1, sqr(snapDist[pointI])),
+ scalarField(1, sqr(snapDist[pointi])),
nearEdgeFeat,
nearEdgeInfo,
nearNormal
@@ -2110,24 +2110,24 @@ Foam::snappySnapDriver::findNearFeatureEdge
}
const pointIndexHit& nearInfo = nearEdgeInfo[0];
- label featI = nearEdgeFeat[0];
+ label feati = nearEdgeFeat[0];
if (nearInfo.hit())
{
// So we have a point on the feature edge. Use this
// instead of our estimate from planes.
- edgeAttractors[featI][nearInfo.index()].append
+ edgeAttractors[feati][nearInfo.index()].append
(
nearInfo.hitPoint()
);
pointConstraint c(Tuple2<label, vector>(2, nearNormal[0]));
- edgeConstraints[featI][nearInfo.index()].append(c);
+ edgeConstraints[feati][nearInfo.index()].append(c);
// Store for later use
- patchAttraction[pointI] = nearInfo.hitPoint()-pp.localPoints()[pointI];
- patchConstraints[pointI] = c;
+ patchAttraction[pointi] = nearInfo.hitPoint()-pp.localPoints()[pointi];
+ patchConstraints[pointi] = c;
}
- return Tuple2<label, pointIndexHit>(featI, nearInfo);
+ return Tuple2<label, pointIndexHit>(feati, nearInfo);
}
@@ -2138,7 +2138,7 @@ Foam::snappySnapDriver::findNearFeaturePoint
const indirectPrimitivePatch& pp,
const scalarField& snapDist,
- const label pointI,
+ const label pointi,
const point& estimatedPt,
// Feature-point to pp point
@@ -2161,47 +2161,47 @@ Foam::snappySnapDriver::findNearFeaturePoint
features.findNearestPoint
(
pointField(1, estimatedPt),
- scalarField(1, sqr(snapDist[pointI])),
+ scalarField(1, sqr(snapDist[pointi])),
nearFeat,
nearInfo
);
- label featI = nearFeat[0];
+ label feati = nearFeat[0];
- if (featI != -1)
+ if (feati != -1)
{
- const point& pt = pp.localPoints()[pointI];
+ const point& pt = pp.localPoints()[pointi];
- label featPointI = nearInfo[0].index();
+ label featPointi = nearInfo[0].index();
const point& featPt = nearInfo[0].hitPoint();
scalar distSqr = magSqr(featPt-pt);
// Check if already attracted
- label oldPointI = pointAttractor[featI][featPointI];
+ label oldPointi = pointAttractor[feati][featPointi];
- if (oldPointI != -1)
+ if (oldPointi != -1)
{
// Check distance
- if (distSqr >= magSqr(featPt-pp.localPoints()[oldPointI]))
+ if (distSqr >= magSqr(featPt-pp.localPoints()[oldPointi]))
{
- // oldPointI nearest. Keep.
- featI = -1;
- featPointI = -1;
+ // oldPointi nearest. Keep.
+ feati = -1;
+ featPointi = -1;
}
else
{
- // Current pointI nearer.
- pointAttractor[featI][featPointI] = pointI;
- pointConstraints[featI][featPointI].first() = 3;
- pointConstraints[featI][featPointI].second() = Zero;
+ // Current pointi nearer.
+ pointAttractor[feati][featPointi] = pointi;
+ pointConstraints[feati][featPointi].first() = 3;
+ pointConstraints[feati][featPointi].second() = Zero;
// Store for later use
- patchAttraction[pointI] = featPt-pt;
- patchConstraints[pointI] = pointConstraints[featI][featPointI];
+ patchAttraction[pointi] = featPt-pt;
+ patchConstraints[pointi] = pointConstraints[feati][featPointi];
- // Reset oldPointI to nearest on feature edge
- patchAttraction[oldPointI] = Zero;
- patchConstraints[oldPointI] = pointConstraint();
+ // Reset oldPointi to nearest on feature edge
+ patchAttraction[oldPointi] = Zero;
+ patchConstraints[oldPointi] = pointConstraint();
findNearFeatureEdge
(
@@ -2209,8 +2209,8 @@ Foam::snappySnapDriver::findNearFeaturePoint
pp,
snapDist,
- oldPointI,
- pp.localPoints()[oldPointI],
+ oldPointi,
+ pp.localPoints()[oldPointi],
edgeAttractors,
edgeConstraints,
@@ -2221,18 +2221,18 @@ Foam::snappySnapDriver::findNearFeaturePoint
}
else
{
- // Current pointI nearer.
- pointAttractor[featI][featPointI] = pointI;
- pointConstraints[featI][featPointI].first() = 3;
- pointConstraints[featI][featPointI].second() = Zero;
+ // Current pointi nearer.
+ pointAttractor[feati][featPointi] = pointi;
+ pointConstraints[feati][featPointi].first() = 3;
+ pointConstraints[feati][featPointi].second() = Zero;
// Store for later use
- patchAttraction[pointI] = featPt-pt;
- patchConstraints[pointI] = pointConstraints[featI][featPointI];
+ patchAttraction[pointi] = featPt-pt;
+ patchConstraints[pointi] = pointConstraints[feati][featPointi];
}
}
- return Tuple2<label, pointIndexHit>(featI, nearInfo[0]);
+ return Tuple2<label, pointIndexHit>(feati, nearInfo[0]);
}
@@ -2333,9 +2333,9 @@ void Foam::snappySnapDriver::determineFeatures
DynamicList<vector> surfaceNormals(4);
labelList faceToNormalBin;
- forAll(pp.localPoints(), pointI)
+ forAll(pp.localPoints(), pointi)
{
- const point& pt = pp.localPoints()[pointI];
+ const point& pt = pp.localPoints()[pointi];
// Determine the geometric planes the point is (approximately) on.
@@ -2358,7 +2358,7 @@ void Foam::snappySnapDriver::determineFeatures
snapDist,
nearestDisp,
- pointI,
+ pointi,
pointFaceSurfNormals,
pointFaceDisp,
@@ -2405,29 +2405,29 @@ void Foam::snappySnapDriver::determineFeatures
if
(
- (constraint.first() > patchConstraints[pointI].first())
+ (constraint.first() > patchConstraints[pointi].first())
|| (
- (constraint.first() == patchConstraints[pointI].first())
- && (magSqr(attraction) < magSqr(patchAttraction[pointI]))
+ (constraint.first() == patchConstraints[pointi].first())
+ && (magSqr(attraction) < magSqr(patchAttraction[pointi]))
)
)
{
- patchAttraction[pointI] = attraction;
- patchConstraints[pointI] = constraint;
+ patchAttraction[pointi] = attraction;
+ patchConstraints[pointi] = constraint;
// Check the number of directions
- if (patchConstraints[pointI].first() == 1)
+ if (patchConstraints[pointi].first() == 1)
{
// Flat surface. Check for different patchIDs
if (multiRegionFeatureSnap)
{
- const point estimatedPt(pt + nearestDisp[pointI]);
+ const point estimatedPt(pt + nearestDisp[pointi]);
pointIndexHit multiPatchPt
(
findMultiPatchPoint
(
estimatedPt,
- pointFacePatchID[pointI],
+ pointFacePatchID[pointi],
surfaceNormals,
faceToNormalBin
)
@@ -2444,7 +2444,7 @@ void Foam::snappySnapDriver::determineFeatures
true, // isRegionEdge
pp,
snapDist,
- pointI,
+ pointi,
multiPatchPt.hitPoint(), // estimatedPt
edgeAttractors,
@@ -2479,12 +2479,12 @@ void Foam::snappySnapDriver::determineFeatures
}
}
}
- else if (patchConstraints[pointI].first() == 2)
+ else if (patchConstraints[pointi].first() == 2)
{
// Mark point on the nearest feature edge. Note that we
// only search within the surrounding since the plane
// reconstruction might find a feature where there isn't one.
- const point estimatedPt(pt + patchAttraction[pointI]);
+ const point estimatedPt(pt + patchAttraction[pointi]);
Tuple2<label, pointIndexHit> nearInfo(-1, pointIndexHit());
@@ -2497,7 +2497,7 @@ void Foam::snappySnapDriver::determineFeatures
findMultiPatchPoint
(
estimatedPt,
- pointFacePatchID[pointI],
+ pointFacePatchID[pointi],
surfaceNormals,
faceToNormalBin
)
@@ -2512,7 +2512,7 @@ void Foam::snappySnapDriver::determineFeatures
true, // isRegionEdge
pp,
snapDist,
- pointI,
+ pointi,
estimatedPt,
edgeAttractors,
@@ -2549,7 +2549,7 @@ void Foam::snappySnapDriver::determineFeatures
true, // isRegionPoint
pp,
snapDist,
- pointI,
+ pointi,
estimatedPt,
// Feature-point to pp point
@@ -2580,7 +2580,7 @@ void Foam::snappySnapDriver::determineFeatures
true, // isRegionEdge
pp,
snapDist,
- pointI,
+ pointi,
estimatedPt,
// Feature-edge to pp point
@@ -2619,7 +2619,7 @@ void Foam::snappySnapDriver::determineFeatures
false, // isRegionPoint
pp,
snapDist,
- pointI,
+ pointi,
estimatedPt,
edgeAttractors,
@@ -2637,7 +2637,7 @@ void Foam::snappySnapDriver::determineFeatures
{
if
(
- patchConstraints[pointI].first() == 3
+ patchConstraints[pointi].first() == 3
&& featurePointStr.valid()
)
{
@@ -2648,7 +2648,7 @@ void Foam::snappySnapDriver::determineFeatures
}
else if
(
- patchConstraints[pointI].first() == 2
+ patchConstraints[pointi].first() == 2
&& featureEdgeStr.valid()
)
{
@@ -2669,10 +2669,10 @@ void Foam::snappySnapDriver::determineFeatures
}
}
}
- else if (patchConstraints[pointI].first() == 3)
+ else if (patchConstraints[pointi].first() == 3)
{
// Mark point on the nearest feature point.
- const point estimatedPt(pt + patchAttraction[pointI]);
+ const point estimatedPt(pt + patchAttraction[pointi]);
Tuple2<label, pointIndexHit> nearInfo(-1, pointIndexHit());
@@ -2683,7 +2683,7 @@ void Foam::snappySnapDriver::determineFeatures
findMultiPatchPoint
(
estimatedPt,
- pointFacePatchID[pointI],
+ pointFacePatchID[pointi],
surfaceNormals,
faceToNormalBin
)
@@ -2696,7 +2696,7 @@ void Foam::snappySnapDriver::determineFeatures
true, // isRegionPoint
pp,
snapDist,
- pointI,
+ pointi,
estimatedPt,
// Feature-point to pp point
@@ -2717,7 +2717,7 @@ void Foam::snappySnapDriver::determineFeatures
false, // isRegionPoint
pp,
snapDist,
- pointI,
+ pointi,
estimatedPt,
// Feature-point to pp point
@@ -2740,7 +2740,7 @@ void Foam::snappySnapDriver::determineFeatures
false, // isRegionPoint
pp,
snapDist,
- pointI,
+ pointi,
estimatedPt,
// Feature-point to pp point
@@ -2807,15 +2807,15 @@ void Foam::snappySnapDriver::determineBaffleFeatures
List<List<point>> edgeFaceNormals(pp.nEdges());
// Fill local data
- forAll(pp.edgeFaces(), edgeI)
+ forAll(pp.edgeFaces(), edgei)
{
- const labelList& eFaces = pp.edgeFaces()[edgeI];
- List<point>& eFc = edgeFaceNormals[edgeI];
+ const labelList& eFaces = pp.edgeFaces()[edgei];
+ List<point>& eFc = edgeFaceNormals[edgei];
eFc.setSize(eFaces.size());
forAll(eFaces, i)
{
- label faceI = eFaces[i];
- eFc[i] = pp.faceNormals()[faceI];
+ label facei = eFaces[i];
+ eFc[i] = pp.faceNormals()[facei];
}
}
@@ -2867,15 +2867,15 @@ void Foam::snappySnapDriver::determineBaffleFeatures
// -1 : rest
labelList pointStatus(pp.nPoints(), -1);
- forAll(edgeFaceNormals, edgeI)
+ forAll(edgeFaceNormals, edgei)
{
- const List<point>& efn = edgeFaceNormals[edgeI];
+ const List<point>& efn = edgeFaceNormals[edgei];
if (efn.size() == 2 && (efn[0]&efn[1]) < baffleFeatureCos)
{
- isBaffleEdge[edgeI] = true;
+ isBaffleEdge[edgei] = true;
nBaffleEdges++;
- const edge& e = pp.edges()[edgeI];
+ const edge& e = pp.edges()[edgei];
pointStatus[e[0]] = 0;
pointStatus[e[1]] = 0;
@@ -2897,7 +2897,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
//- Baffle edges will be too ragged to sensibly determine feature points
- //forAll(pp.pointEdges(), pointI)
+ //forAll(pp.pointEdges(), pointi)
//{
// if
// (
@@ -2906,22 +2906,22 @@ void Foam::snappySnapDriver::determineBaffleFeatures
// featureCos,
// pp,
// isBaffleEdge,
- // pointI
+ // pointi
// )
// )
// {
- // //Pout<< "Detected feature point:" << pp.localPoints()[pointI]
+ // //Pout<< "Detected feature point:" << pp.localPoints()[pointi]
// // << endl;
// //-TEMPORARILY DISABLED:
- // //pointStatus[pointI] = 1;
+ // //pointStatus[pointi] = 1;
// }
//}
label nBafflePoints = 0;
- forAll(pointStatus, pointI)
+ forAll(pointStatus, pointi)
{
- if (pointStatus[pointI] != -1)
+ if (pointStatus[pointi] != -1)
{
nBafflePoints++;
}
@@ -2932,11 +2932,11 @@ void Foam::snappySnapDriver::determineBaffleFeatures
label nPointAttract = 0;
label nEdgeAttract = 0;
- forAll(pointStatus, pointI)
+ forAll(pointStatus, pointi)
{
- const point& pt = pp.localPoints()[pointI];
+ const point& pt = pp.localPoints()[pointi];
- if (pointStatus[pointI] == 0) // baffle edge
+ if (pointStatus[pointi] == 0) // baffle edge
{
// 1: attract to near feature edge first
@@ -2945,7 +2945,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
false, // isRegionPoint?
pp,
snapDist,
- pointI,
+ pointi,
pt,
edgeAttractors,
@@ -2971,7 +2971,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
pp,
snapDist,
- pointI,
+ pointi,
pt, // estimatedPt,
// Feature-point to pp point
@@ -2993,50 +2993,50 @@ void Foam::snappySnapDriver::determineBaffleFeatures
}
}
}
- else if (pointStatus[pointI] == 1) // baffle point
+ else if (pointStatus[pointi] == 1) // baffle point
{
labelList nearFeat;
List<pointIndexHit> nearInfo;
features.findNearestPoint
(
pointField(1, pt),
- scalarField(1, sqr(snapDist[pointI])),
+ scalarField(1, sqr(snapDist[pointi])),
nearFeat,
nearInfo
);
- label featI = nearFeat[0];
+ label feati = nearFeat[0];
- if (featI != -1)
+ if (feati != -1)
{
nPointAttract++;
- label featPointI = nearInfo[0].index();
+ label featPointi = nearInfo[0].index();
const point& featPt = nearInfo[0].hitPoint();
scalar distSqr = magSqr(featPt-pt);
// Check if already attracted
- label oldPointI = pointAttractor[featI][featPointI];
+ label oldPointi = pointAttractor[feati][featPointi];
if
(
- oldPointI == -1
+ oldPointi == -1
|| (
distSqr
- < magSqr(featPt-pp.localPoints()[oldPointI])
+ < magSqr(featPt-pp.localPoints()[oldPointi])
)
)
{
- pointAttractor[featI][featPointI] = pointI;
- pointConstraints[featI][featPointI].first() = 3;
- pointConstraints[featI][featPointI].second() = Zero;
+ pointAttractor[feati][featPointi] = pointi;
+ pointConstraints[feati][featPointi].first() = 3;
+ pointConstraints[feati][featPointi].second() = Zero;
// Store for later use
- patchAttraction[pointI] = featPt-pt;
- patchConstraints[pointI] =
- pointConstraints[featI][featPointI];
+ patchAttraction[pointi] = featPt-pt;
+ patchConstraints[pointi] =
+ pointConstraints[feati][featPointi];
- if (oldPointI != -1)
+ if (oldPointi != -1)
{
// The current point is closer so wins. Reset
// the old point to attract to nearest edge
@@ -3046,8 +3046,8 @@ void Foam::snappySnapDriver::determineBaffleFeatures
false, // isRegionPoint
pp,
snapDist,
- oldPointI,
- pp.localPoints()[oldPointI],
+ oldPointi,
+ pp.localPoints()[oldPointi],
edgeAttractors,
edgeConstraints,
@@ -3059,13 +3059,13 @@ void Foam::snappySnapDriver::determineBaffleFeatures
else
{
// Make it fall through to check below
- featI = -1;
+ feati = -1;
}
}
// Not found a feature point or another point is already
// closer to that feature
- if (featI == -1)
+ if (feati == -1)
{
//Pout<< "*** Falling back to finding nearest feature"
// << " edge"
@@ -3077,7 +3077,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
false, // isRegionPoint
pp,
snapDist,
- pointI,
+ pointi,
pt, // starting point
edgeAttractors,
@@ -3156,11 +3156,11 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
boolList isFeatureEdgeOrPoint(pp.nPoints(), false);
label nFeats = 0;
- forAll(rawPatchConstraints, pointI)
+ forAll(rawPatchConstraints, pointi)
{
- if (rawPatchConstraints[pointI].first() >= 2)
+ if (rawPatchConstraints[pointi].first() >= 2)
{
- isFeatureEdgeOrPoint[pointI] = true;
+ isFeatureEdgeOrPoint[pointi] = true;
nFeats++;
}
}
@@ -3185,9 +3185,9 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
{
boolList newIsFeatureEdgeOrPoint(isFeatureEdgeOrPoint);
- forAll(pp.localFaces(), faceI)
+ forAll(pp.localFaces(), facei)
{
- const face& f = pp.localFaces()[faceI];
+ const face& f = pp.localFaces()[facei];
forAll(f, fp)
{
@@ -3217,11 +3217,11 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
// Collect attractPoints
- forAll(isFeatureEdgeOrPoint, pointI)
+ forAll(isFeatureEdgeOrPoint, pointi)
{
- if (isFeatureEdgeOrPoint[pointI])
+ if (isFeatureEdgeOrPoint[pointi])
{
- attractPoints.append(pointI);
+ attractPoints.append(pointi);
}
}
@@ -3248,15 +3248,15 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
patchConstraints.setSize(pp.nPoints());
patchConstraints = pointConstraint();
- forAll(edgeAttractors, featI)
+ forAll(edgeAttractors, feati)
{
- const List<DynamicList<point>>& edgeAttr = edgeAttractors[featI];
+ const List<DynamicList<point>>& edgeAttr = edgeAttractors[feati];
const List<DynamicList<pointConstraint>>& edgeConstr =
- edgeConstraints[featI];
+ edgeConstraints[feati];
- forAll(edgeAttr, featEdgeI)
+ forAll(edgeAttr, featEdgei)
{
- const DynamicList<point>& attr = edgeAttr[featEdgeI];
+ const DynamicList<point>& attr = edgeAttr[featEdgei];
forAll(attr, i)
{
// Find nearest pp point
@@ -3269,20 +3269,20 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
if (nearInfo.hit())
{
- label pointI =
+ label pointi =
ppTree.shapes().pointLabels()[nearInfo.index()];
- const point attraction = featPt-pp.localPoints()[pointI];
+ const point attraction = featPt-pp.localPoints()[pointi];
// Check if this point is already being attracted. If so
// override it only if nearer.
if
(
- patchConstraints[pointI].first() <= 1
- || magSqr(attraction) < magSqr(patchAttraction[pointI])
+ patchConstraints[pointi].first() <= 1
+ || magSqr(attraction) < magSqr(patchAttraction[pointi])
)
{
- patchAttraction[pointI] = attraction;
- patchConstraints[pointI] = edgeConstr[featEdgeI][i];
+ patchAttraction[pointi] = attraction;
+ patchConstraints[pointi] = edgeConstr[featEdgei][i];
}
}
else
@@ -3305,18 +3305,18 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
// Find nearest mesh point to feature point
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// (overrides attraction to feature edge)
- forAll(pointAttractor, featI)
+ forAll(pointAttractor, feati)
{
- const labelList& pointAttr = pointAttractor[featI];
- const List<pointConstraint>& pointConstr = pointConstraints[featI];
+ const labelList& pointAttr = pointAttractor[feati];
+ const List<pointConstraint>& pointConstr = pointConstraints[feati];
- forAll(pointAttr, featPointI)
+ forAll(pointAttr, featPointi)
{
- if (pointAttr[featPointI] != -1)
+ if (pointAttr[featPointi] != -1)
{
- const point& featPt = features[featI].points()
+ const point& featPt = features[feati].points()
[
- featPointI
+ featPointi
];
// Find nearest pp point
@@ -3328,37 +3328,37 @@ void Foam::snappySnapDriver::reverseAttractMeshPoints
if (nearInfo.hit())
{
- label pointI =
+ label pointi =
ppTree.shapes().pointLabels()[nearInfo.index()];
- const point& pt = pp.localPoints()[pointI];
+ const point& pt = pp.localPoints()[pointi];
const point attraction = featPt-pt;
// - already attracted to feature edge : point always wins
// - already attracted to feature point: nearest wins
- if (patchConstraints[pointI].first() <= 1)
+ if (patchConstraints[pointi].first() <= 1)
{
- patchAttraction[pointI] = attraction;
- patchConstraints[pointI] = pointConstr[featPointI];
+ patchAttraction[pointi] = attraction;
+ patchConstraints[pointi] = pointConstr[featPointi];
}
- else if (patchConstraints[pointI].first() == 2)
+ else if (patchConstraints[pointi].first() == 2)
{
- patchAttraction[pointI] = attraction;
- patchConstraints[pointI] = pointConstr[featPointI];
+ patchAttraction[pointi] = attraction;
+ patchConstraints[pointi] = pointConstr[featPointi];
}
- else if (patchConstraints[pointI].first() == 3)
+ else if (patchConstraints[pointi].first() == 3)
{
// Only if nearer
if
(
magSqr(attraction)
- < magSqr(patchAttraction[pointI])
+ < magSqr(patchAttraction[pointi])
)
{
- patchAttraction[pointI] = attraction;
- patchConstraints[pointI] =
- pointConstr[featPointI];
+ patchAttraction[pointi] = attraction;
+ patchConstraints[pointi] =
+ pointConstr[featPointi];
}
}
}
@@ -3419,11 +3419,11 @@ void Foam::snappySnapDriver::featureAttractionUsingFeatureEdges
(
features.size()
);
- forAll(features, featI)
+ forAll(features, feati)
{
- label nFeatEdges = features[featI].edges().size();
- edgeAttractors[featI].setSize(nFeatEdges);
- edgeConstraints[featI].setSize(nFeatEdges);
+ label nFeatEdges = features[feati].edges().size();
+ edgeAttractors[feati].setSize(nFeatEdges);
+ edgeConstraints[feati].setSize(nFeatEdges);
}
// Per feature, per feature-point the pp point that is attracted to it.
@@ -3431,11 +3431,11 @@ void Foam::snappySnapDriver::featureAttractionUsingFeatureEdges
// used.
List<labelList> pointAttractor(features.size());
List<List<pointConstraint>> pointConstraints(features.size());
- forAll(features, featI)
+ forAll(features, feati)
{
- label nFeatPoints = features[featI].points().size();
- pointAttractor[featI].setSize(nFeatPoints, -1);
- pointConstraints[featI].setSize(nFeatPoints);
+ label nFeatPoints = features[feati].points().size();
+ pointAttractor[feati].setSize(nFeatPoints, -1);
+ pointConstraints[feati].setSize(nFeatPoints);
}
// Reverse: from pp point to nearest feature
@@ -3570,16 +3570,16 @@ void Foam::snappySnapDriver::featureAttractionUsingFeatureEdges
Info<< "Dumping feature-point attraction to "
<< featurePointStr.name() << endl;
- forAll(patchConstraints, pointI)
+ forAll(patchConstraints, pointi)
{
- const point& pt = pp.localPoints()[pointI];
- const vector& attr = patchAttraction[pointI];
+ const point& pt = pp.localPoints()[pointi];
+ const vector& attr = patchAttraction[pointi];
- if (patchConstraints[pointI].first() == 2)
+ if (patchConstraints[pointi].first() == 2)
{
featureEdgeStr.write(linePointRef(pt, pt+attr));
}
- else if (patchConstraints[pointI].first() == 3)
+ else if (patchConstraints[pointi].first() == 3)
{
featurePointStr.write(linePointRef(pt, pt+attr));
}
@@ -3696,9 +3696,9 @@ void Foam::snappySnapDriver::preventFaceSqueeze
pointField points;
face singleF;
- forAll(pp.localFaces(), faceI)
+ forAll(pp.localFaces(), facei)
{
- const face& f = pp.localFaces()[faceI];
+ const face& f = pp.localFaces()[facei];
if (f.size() != points.size())
{
@@ -3712,12 +3712,12 @@ void Foam::snappySnapDriver::preventFaceSqueeze
label nConstraints = 0;
forAll(f, fp)
{
- label pointI = f[fp];
- const point& pt = pp.localPoints()[pointI];
+ label pointi = f[fp];
+ const point& pt = pp.localPoints()[pointi];
- if (patchConstraints[pointI].first() > 1)
+ if (patchConstraints[pointi].first() > 1)
{
- points[fp] = pt + patchAttraction[pointI];
+ points[fp] = pt + patchAttraction[pointi];
nConstraints++;
}
else
@@ -3749,24 +3749,24 @@ void Foam::snappySnapDriver::preventFaceSqueeze
}
if (maxFp != -1)
{
- label pointI = f.prevLabel(maxFp);
+ label pointi = f.prevLabel(maxFp);
- // Reset attraction on pointI to nearest
+ // Reset attraction on pointi to nearest
- const point& pt = pp.localPoints()[pointI];
+ const point& pt = pp.localPoints()[pointi];
- //Pout<< "** on triangle " << pp.faceCentres()[faceI]
- // << " knocking out attraction to " << pointI
+ //Pout<< "** on triangle " << pp.faceCentres()[facei]
+ // << " knocking out attraction to " << pointi
// << " at:" << pt
// << endl;
- patchAttraction[pointI] = nearestAttraction[pointI];
+ patchAttraction[pointi] = nearestAttraction[pointi];
if (strPtr.valid())
{
strPtr().write
(
- linePointRef(pt, pt+patchAttraction[pointI])
+ linePointRef(pt, pt+patchAttraction[pointi])
);
}
}
@@ -3791,9 +3791,9 @@ void Foam::snappySnapDriver::preventFaceSqueeze
}
if (maxFp != -1)
{
- label pointI = f[maxFp];
- // Lower attraction on pointI
- patchAttraction[pointI] *= 0.5;
+ label pointi = f[maxFp];
+ // Lower attraction on pointi
+ patchAttraction[pointi] *= 0.5;
}
}
}
@@ -3860,12 +3860,12 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
// Calculate attraction distance per face (from the attraction distance
// per point)
scalarField faceSnapDist(pp.size(), -GREAT);
- forAll(pp.localFaces(), faceI)
+ forAll(pp.localFaces(), facei)
{
- const face& f = pp.localFaces()[faceI];
+ const face& f = pp.localFaces()[facei];
forAll(f, fp)
{
- faceSnapDist[faceI] = max(faceSnapDist[faceI], snapDist[f[fp]]);
+ faceSnapDist[facei] = max(faceSnapDist[facei], snapDist[f[fp]]);
}
}
@@ -4088,13 +4088,13 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
// Mix with direct feature attraction
- forAll(patchConstraints, pointI)
+ forAll(patchConstraints, pointi)
{
- if (patchConstraints[pointI].first() > 1)
+ if (patchConstraints[pointi].first() > 1)
{
- patchDisp[pointI] =
- (1.0-featureAttract)*patchDisp[pointI]
- + featureAttract*patchAttraction[pointI];
+ patchDisp[pointi] =
+ (1.0-featureAttract)*patchDisp[pointi]
+ + featureAttract*patchAttraction[pointi];
}
}
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C
index b0f87e462b5dbd6efce8a6ad5473b225fe57b53b..95bbdf2220d977cc7cbae5455921742ca88763e0 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C
@@ -45,15 +45,15 @@ Foam::labelList Foam::snappySnapDriver::getFacePoints
forAll(f, fp)
{
- label meshPointI = f[fp];
+ label meshPointi = f[fp];
Map<label>::const_iterator iter =
- pp.meshPointMap().find(meshPointI);
+ pp.meshPointMap().find(meshPointi);
if (iter != pp.meshPointMap().end())
{
- label pointI = iter();
- pointOnZone[pointI] = true;
+ label pointi = iter();
+ pointOnZone[pointi] = true;
}
}
}
diff --git a/src/sampling/probes/patchProbes.H b/src/sampling/probes/patchProbes.H
index d2742b2f682dae1e57e225ecf4dbcf9e7059e5b9..f290bd11e02f5333cf9740ed5aaa9bc293d92abe 100644
--- a/src/sampling/probes/patchProbes.H
+++ b/src/sampling/probes/patchProbes.H
@@ -37,7 +37,7 @@ Description
patchProbes
{
type patchProbes;
- functionObjectLibs ( "libsampling.so" );
+ libs ( "libsampling.so" );
// Name of the directory for probe data
name patchProbes;
@@ -46,14 +46,11 @@ Description
patches (".*inl.*");
// Write at same frequency as fields
- outputControl outputTime;
- outputInterval 1;
+ writeControl writeTime;
+ writeInterval 1;
// Fields to be probed
- fields
- (
- p U
- );
+ fields (p U);
// Locations to probe. These get snapped onto the nearest point
// on the selected patches
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index 9f6e898cf638ed0aefe17e05ce2f7cf985fdd293..2f8bb4e13891fc8ce653a24f7a59aac144b5860b 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -37,20 +37,17 @@ Description
probes
{
type probes;
- functionObjectLibs ( "libsampling.so" );
+ libs ("libsampling.so");
// Name of the directory for probe data
name probes;
// Write at same frequency as fields
- outputControl outputTime;
- outputInterval 1;
+ writeControl outputTime;
+ writeInterval 1;
// Fields to be probed
- fields
- (
- p U
- );
+ fields (p U);
// Optional: do not recalculate cells if mesh moves
fixedLocations false;
diff --git a/tutorials/combustion/chemFoam/gri/system/controlDict b/tutorials/combustion/chemFoam/gri/system/controlDict
index cb4c6ab7aa84fd7069823453e1f8e034d0994320..caaf117c7cedf56bd9e3b95b68f0557864e5a722 100644
--- a/tutorials/combustion/chemFoam/gri/system/controlDict
+++ b/tutorials/combustion/chemFoam/gri/system/controlDict
@@ -56,7 +56,7 @@ functions
{
sensitivityAnalysis
{
- functionObjectLibs ("libfieldFunctionObjects.so");
+ libs ("libfieldFunctionObjects.so");
type psiReactionsSensitivityAnalysis;
writeControl writeTime;
}
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/chemkin/transportProperties b/tutorials/combustion/chemFoam/ic8h18_TDAC/chemkin/transportProperties
index 6e932ca799beaca89ccf5f9e9f961104e2170037..c54853202cd6df830b492e4205e3456cf6c1a7e9 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/chemkin/transportProperties
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/chemkin/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/chemistryProperties b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/chemistryProperties
index 7b032d90c1a51f36d145e7a41f8ba56ff8556034..943a0a7de93ffb259ff8f8a647c53e4264004c73 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/chemistryProperties
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/chemistryProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/initialConditions b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/initialConditions
index 34ebb058dea2146d18c87b3ac523ab517b8fb74e..76dff0b122fffda12cd154287976ece02417cd5c 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/initialConditions
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/initialConditions
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties
index 90267ad29f80d4d560f2aed28d1b15d908e2f8e5..58207acbee0e230080795d405c67608ac4db4f90 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/controlDict b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/controlDict
index 7c100daec0e3a42b5adecfe711c2b202d344c0d0..a9b2c7e829b649733fda285402304c58029aec5a 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/controlDict
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution
index 6b16dd4035184065e7d5c3f4b52f2c3c1fe89d30..bb187637d0eb89edca721bdd86738d6aaf326459 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/ph_rgh.orig b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/ph_rgh.orig
index c8d764aa048b519a24b86fbf7596fe70557ed87c..833aae7d10a2a0d30d9fb158df59a97247e6e009 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/ph_rgh.orig
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/ph_rgh.orig
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pRef b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pRef
index 2f1d6789fe47433b943d0d92780d649736a21516..ff8869e9e49da67abfd23ffb5d2af97979961833 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pRef
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pRef
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/ph_rgh.orig b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/ph_rgh.orig
index bf41c4365a54e9e3e40011702762c16b8d1e4080..64fa134b335524d88ee7f32d741f0bcb37385306 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/ph_rgh.orig
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/ph_rgh.orig
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pRef b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pRef
index 2f1d6789fe47433b943d0d92780d649736a21516..ff8869e9e49da67abfd23ffb5d2af97979961833 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pRef
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pRef
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ph_rgh.orig b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ph_rgh.orig
index e2fcf692f233fad17f8c074e65973be92a27927f..e984cf2b4c7f6a8bd94a5fdbabb7084f3c7a7e0e 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ph_rgh.orig
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ph_rgh.orig
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pRef b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pRef
index 2f1d6789fe47433b943d0d92780d649736a21516..ff8869e9e49da67abfd23ffb5d2af97979961833 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pRef
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pRef
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ph_rgh.orig b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ph_rgh.orig
index 3a5ed69ec5fbfab4fa3e1f51d982ef70866eb05d..988375bfe996c2bc06338dac4858da4399150b2a 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ph_rgh.orig
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ph_rgh.orig
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pRef b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pRef
index 2f1d6789fe47433b943d0d92780d649736a21516..ff8869e9e49da67abfd23ffb5d2af97979961833 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pRef
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pRef
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CH4 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CH4
index 15dd5eddf1636eec4cbfa1925991bfcb2ad39311..61f76d6a2a8daa3736f322ab111b3d28eaccf64d 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CH4
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CH4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CO2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CO2
index 2fef379ec761a9a98aec2cce70b70f25f08d8d68..12efa11dc690c8291faeec4b42088983f6d9387f 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CO2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/CO2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/H2O b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/H2O
index ca2273563064fa528f36a9e642e4fe90a1126376..8e065f3e2cec11ae2b8737e6e610dec7c2b63e68 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/H2O
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/H2O
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/N2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/N2
index f1b3314273db256625bad38c50358dc109013532..7947ecd71c2476df6d30dfbf4b68d4821c95ec48 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/N2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/N2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/O2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/O2
index 95649fdac4d49cfb0bf4c106761a3d7835c25504..b29ae9dffbc5bb2e32e1880ffba2a1e0f8abb0f7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/O2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/O2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/T b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/T
index 8825b9971cb34f196f66cbb3760dec9c45a32cce..31d0ed3bf12dbf1786420a832ced70f57d15c9cd 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/T
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/U b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/U
index c235ba3d6599d2ee0addf202f46971a86b27b928..ca32ebfb981dc921b5c0c7424b95e793f8209386 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/U
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/Ydefault b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/Ydefault
index 96004af717f654335a5de7623b30a6415b42542b..cf322de72d562d513e75ffa8c6d10ce1790fbbee 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/Ydefault
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/alphat b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/alphat
index c74018bbdb33b027d8c9098fc95a61eae2024749..3244699b19d9e39007e78216bc4d8b7ebcca5b3e 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/alphat
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/alphat
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/p
index d3bca9b21e593adc7bfc355153d035ce24783825..f6f689df0a93c3dfc51feabc588fd2898d6712c0 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/p
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/chemistryProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/chemistryProperties
index 6cadb7e70ad666b8feff2af7867dfcbcd8871af9..d60be0eea4654eb290787f2d990e92be763e4bae 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/chemistryProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/combustionProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/combustionProperties
index d5c12209c1dac6c3e38c74191d14bc79977d6b3b..9b50afab09627f5999855c7f05828a9661a5357e 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/combustionProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas
index 33208fc6c041f4e73a02a1042d79f93e5f3a2177..b60fcfc6a62b4e67944e33bfce95f9d4af5e72a7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 3.0.x |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties
index 98c192c7cf0a61ecf410870a2320eec1b166e663..e1b9d2481310030578cf8b9776333af0c32d9685 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/blockMeshDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/blockMeshDict
index 3683ab33882557a8a1dda26ddb4ca3213da69c25..df1f24f54c3e68da3135cb263a945bd2c3eed128 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/controlDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/controlDict
index a87c823f8f83a6291d5d464b166aedfc46ace9bf..12aa45d177065362226e31f8670fb322b08099d6 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSchemes b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSchemes
index 9208e7ca8f4158aeeaf1dfdd907b6a0397457fa0..ece96fde64e3e48e0bbfd568b15bd88ae8adc67f 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution
index 7ff37c8434d5caf54eb170a11543f915a259db9a..bd938b85db1d0cd293e32b319bf709ebcfecca3d 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CH4 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CH4
index 15dd5eddf1636eec4cbfa1925991bfcb2ad39311..61f76d6a2a8daa3736f322ab111b3d28eaccf64d 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CH4
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CH4
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CO2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CO2
index 2fef379ec761a9a98aec2cce70b70f25f08d8d68..12efa11dc690c8291faeec4b42088983f6d9387f 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CO2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/CO2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/H2O b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/H2O
index ca2273563064fa528f36a9e642e4fe90a1126376..8e065f3e2cec11ae2b8737e6e610dec7c2b63e68 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/H2O
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/H2O
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/N2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/N2
index c0af2935811856c682ebcabd441d4c5271765312..34b42690c415542fc3b634253713fc34aa468546 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/N2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/N2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/O2 b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/O2
index 95649fdac4d49cfb0bf4c106761a3d7835c25504..b29ae9dffbc5bb2e32e1880ffba2a1e0f8abb0f7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/O2
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/O2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/T b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/T
index 8825b9971cb34f196f66cbb3760dec9c45a32cce..31d0ed3bf12dbf1786420a832ced70f57d15c9cd 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/T
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/U b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/U
index c235ba3d6599d2ee0addf202f46971a86b27b928..ca32ebfb981dc921b5c0c7424b95e793f8209386 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/U
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/Ydefault b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/Ydefault
index 96004af717f654335a5de7623b30a6415b42542b..cf322de72d562d513e75ffa8c6d10ce1790fbbee 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/Ydefault
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/Ydefault
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/alphat b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/alphat
index c74018bbdb33b027d8c9098fc95a61eae2024749..3244699b19d9e39007e78216bc4d8b7ebcca5b3e 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/alphat
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/alphat
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/p
index d3bca9b21e593adc7bfc355153d035ce24783825..f6f689df0a93c3dfc51feabc588fd2898d6712c0 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/p
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties
index 6a2a326f127db93ce4172ffbcc2b2d32c0937877..cb60fbf59d43024bbba7f263071ebadff7a50f4c 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties.new b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties.new
index e7efd6ee16af6b795dee7500431ff2af0f5ee0fb..514fa711adcaf52a59adee9824a3fa622e8027a0 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties.new
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/chemistryProperties.new
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/combustionProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/combustionProperties
index d5c12209c1dac6c3e38c74191d14bc79977d6b3b..9b50afab09627f5999855c7f05828a9661a5357e 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/combustionProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/combustionProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas
index 33208fc6c041f4e73a02a1042d79f93e5f3a2177..b60fcfc6a62b4e67944e33bfce95f9d4af5e72a7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 3.0.x |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties
index 98c192c7cf0a61ecf410870a2320eec1b166e663..e1b9d2481310030578cf8b9776333af0c32d9685 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/blockMeshDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/blockMeshDict
index 3683ab33882557a8a1dda26ddb4ca3213da69c25..df1f24f54c3e68da3135cb263a945bd2c3eed128 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/blockMeshDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict
index a87c823f8f83a6291d5d464b166aedfc46ace9bf..12aa45d177065362226e31f8670fb322b08099d6 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/decomposeParDict b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/decomposeParDict
index 43667b412c462133ba225b6705ec589fa9904dd8..4401dc3a336dbc63700b86379ed526bab6abb451 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/decomposeParDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSchemes b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSchemes
index 9208e7ca8f4158aeeaf1dfdd907b6a0397457fa0..ece96fde64e3e48e0bbfd568b15bd88ae8adc67f 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSchemes
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution
index 7ff37c8434d5caf54eb170a11543f915a259db9a..bd938b85db1d0cd293e32b319bf709ebcfecca3d 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/T b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/T
index 08c022f92f38c2ee8c8ecafd7f22b7742d387bdc..6a8286ff87b43db4dfbfa593c23f7609de3d32b4 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/T
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/U b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/U
index 37b1c45ea10966b672d05bb9766e0add319ef2e7..81c690b7ce5f0dd0e4206e2d7222f845c27f1b07 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/p b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/p
index e9b41399de39be294b60f13a70ef987d1d84b191..79f422967446237f3f7c08e028d15a17eb25bbd1 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties
index 392e2e045bf30bfbf162b0f531cf855d8a6056b8..f418d51cdd863796d3bb40cf8326f2178840b0ac 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties
index c2c3b28a1b4e8f4a2cae55f58bd61f9b1a67b488..d0a0998654c0e013d16bc1b9e58e51ff26d40edc 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/blockMeshDict
index e4dabbfe23c9ce735e938267e22da5c977145ff3..3cf178ed203db156cc2ea129b68d75e0113dfccb 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/blockMeshDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/decomposeParDict b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/decomposeParDict
index 702df4decde3f6db59fed02c6d657cebf90c8e94..0f97fd08eeb8bf372d308eada925a743633c3238 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/decomposeParDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes
index 6a8292d18718c9a118b08a2e2a3c3dc177ece5ae..c271104f45e52b48abff3b3994298461bbe9e2a1 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSolution
index 4eddb387211b68f540ad69979408dacf480d5255..af3250664149a0bbd5771157132d4179f212be11 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
index 6e94f2d9da6aad4e33d77f78a333c0a8efb266b7..ea06ee44e4a644b27faa316683704cbd2f1ac709 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# Remove 0.org/ copy
+# Remove 0.orig/ copy
\rm -rf 0
cleanCase
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict
index ec844d5a568dc326631ee3df0edaf53fe36a92a0..adf9935141aea0a6e8c9c6720e8d2bc8b4afa865 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/bottomWater/changeDictionaryDict
@@ -70,8 +70,8 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict
index 0e3628fdc5ff1f27bef4c994e77fc2ef2f5f1d50..5f0519e7e102541cf45068990fb92964d8b5a79c 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/heater/changeDictionaryDict
@@ -49,8 +49,8 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
value uniform 300;
}
@@ -58,8 +58,8 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict
index 8e96133ac2d5d0ae86b12e5b92decd6505a75128..917043d203cbe6fdc9bb72185d24960d7f0fef8f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -43,8 +43,8 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
value uniform 300;
}
@@ -52,8 +52,8 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict
index 20e446ba05621a3d9f8c0b9fb6985b00a52c5d92..77bebe210e7502c311b4062a6a85e4ac902ba161 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -43,8 +43,8 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict
index a5fdd7b1c06698e41dbeb6ca9390b7d81f4cfbaa..40ce87668ba58c36162a8732b036bbcfbb376531 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -76,8 +76,8 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/T
index 446c1e3ab2e8133a9658b8c05ed9b73c33c90d04..a7d921215a3c3703368d3346e3d966429a973fb2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/air/T
@@ -57,10 +57,10 @@ boundaryField
value uniform 300;
inletValue uniform 300;
Tnbr T;
- kappa fluidThermo;
+ kappaMethod fluidThermo;
QrNbr none;
Qr Qr;
- kappaName none;
+ kappa none;
}
air_to_solid
{
@@ -68,10 +68,10 @@ boundaryField
value uniform 300;
inletValue uniform 300;
Tnbr T;
- kappa fluidThermo;
+ kappaMethod fluidThermo;
QrNbr none;
Qr Qr;
- kappaName none;
+ kappa none;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/T
index 01add2ab205e9a36fa7c97a15b4d80c035bd099b..267473f7901eabb2dbace17c9760348d5e01e180 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/floor/T
@@ -45,12 +45,12 @@ boundaryField
{
type externalWallHeatFluxTemperature;
value uniform 300;
- kappa solidThermo;
+ kappaMethod solidThermo;
Ta uniform 313;
h uniform 1000000;
thicknessLayers ( 1 2 );
kappaLayers ( 100 200 );
- kappaName none;
+ kappa none;
}
floor_to_domain3
{
@@ -62,20 +62,20 @@ boundaryField
type compressible::turbulentTemperatureRadCoupledMixed;
value uniform 300;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
- kappaName none;
+ kappa none;
}
floor_to_solid
{
type compressible::turbulentTemperatureRadCoupledMixed;
value uniform 300;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr none;
Qr none;
- kappaName none;
+ kappa none;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/T b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/T
index fd81c80c4e85db8b31582bb6f1d59d97ffc19ccc..4e1f26a8c48a2fe050afe249eb90e5f745e78282 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/0/solid/T
@@ -31,20 +31,20 @@ boundaryField
type compressible::turbulentTemperatureRadCoupledMixed;
value uniform 300;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
- kappaName none;
+ kappa none;
}
solid_to_floor
{
type compressible::turbulentTemperatureRadCoupledMixed;
value uniform 300;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr none;
Qr none;
- kappaName none;
+ kappa none;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict
index 25ac73691ab85d1ca389b1b3f088d73109af1cc0..92b630af9bf14896a91c097cd35e62e294530974 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/air/changeDictionaryDict
@@ -68,10 +68,10 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa fluidThermo;
+ kappaMethod fluidThermo;
QrNbr none;
Qr Qr;
- kappaName none;
+ kappa none;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict
index 5189b5faef4dd1f5a28825c08c224657fe290ebc..faf294c0843ef6557154e19f9ff98949d21bacd7 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/floor/changeDictionaryDict
@@ -39,10 +39,10 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr none;
Qr none;
- kappaName none;
+ kappa none;
value uniform 300;
}
@@ -50,10 +50,10 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
- kappaName none;
+ kappa none;
value uniform 300;
}
@@ -66,13 +66,13 @@ dictionaryReplacement
minZ
{
type externalWallHeatFluxTemperature;
- kappa solidThermo;
+ kappaMethod solidThermo;
Ta uniform 313.0;
h uniform 10e5;
thicknessLayers (1 2);
kappaLayers (100 200);
value uniform 300.0;
- kappaName none;
+ kappa none;
}
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict
index 92da12adfb04ff1b8f27d0c454f718a1eb902b60..1a3e5fe65c845c29b3d24f04f445a2eadb64a591 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/solid/changeDictionaryDict
@@ -33,10 +33,10 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
- kappaName none;
+ kappa none;
value uniform 300;
}
@@ -44,10 +44,10 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr none;
Qr none;
- kappaName none;
+ kappa none;
value uniform 300;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
index ccb0d3183fb2d698ff0b6b23ca6367efb9adfe00..cb81d3185993a5de1377b41c0e3be231454aa316 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
index ccb0d3183fb2d698ff0b6b23ca6367efb9adfe00..cb81d3185993a5de1377b41c0e3be231454aa316 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
index 0eb178deb7442d6482f7419353e96187dabf0148..21da1747408a3ee835aff788874376e5c3ffcec5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
index ccb0d3183fb2d698ff0b6b23ca6367efb9adfe00..cb81d3185993a5de1377b41c0e3be231454aa316 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
index ccb0d3183fb2d698ff0b6b23ca6367efb9adfe00..cb81d3185993a5de1377b41c0e3be231454aa316 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
index 066616d5534bcb0645d1365cffa100d383aeb5e6..b986d2efb2fd04039639748c2adbb711705dba14 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/T
index 5dd082096f5668b392c5f1757c9d38afc8acc2ee..a384823f320069c53d6f6d0d125a40c589dbde65 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/windshield/T
@@ -32,15 +32,15 @@ boundaryField
windshield_to_cabin
{
type humidityTemperatureCoupledMixed;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
value uniform 260;
}
exterior
{
type externalWallHeatFluxTemperature;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
+ kappa none;
h uniform 10;
Ta uniform 260;
value uniform 260;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
index 9ea87b6028da0fb5e7aab21190b316f3c3e4a07f..1dd1497a4ac0f7dd7c2bd2b359f669da749298db 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
@@ -58,7 +58,8 @@ functions
type scalarTransport;
libs ("libsolverFunctionObjects.so");
resetOnStartUp no;
- region cabin;
+ region cabin;
+ field H2O;
fvOptions
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T
index 420465cbb293a6b3de273b55fb251ae01d6c4774..cb41965f6d01c80f5be714ccfabd3ff3edeee398 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/T
@@ -50,8 +50,8 @@ boundaryField
type compressible::turbulentTemperatureCoupledBaffleMixed;
value uniform 260;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
// windshield 3 mm
thicknessLayers (0.003);
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T
index d3c0de7d18f7cdbcf03c8716e539c79ab53e0b83..dd56368c3933e47d6e7dec3a91c0e38f10cfa3c9 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/exterior/T
@@ -36,8 +36,8 @@ boundaryField
type compressible::turbulentTemperatureCoupledBaffleMixed;
value uniform 260;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T
index 290057824fedea727a0c8bd1b6fca68b4376583f..e48d2b0c5a91beb557bb102866ccc61fc51d4e6b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/ice/T
@@ -34,16 +34,16 @@ boundaryField
type compressible::turbulentTemperatureCoupledBaffleMixed;
value uniform 260;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
}
ice_to_exterior
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
value uniform 260;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
+ kappa none;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/controlDict
index 07835724cf5bf8756a9556b5d77c2dc5f54fab02..61de766e1226fdfd2728ae955158e3c86d274d67 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/system/controlDict
@@ -61,9 +61,9 @@ functions
writeControl timeStep; //writeTime;
writeInterval 1;
log yes;
- valueOutput no;
- source patch;
- sourceName inlet;
+ writeFields no;
+ regionType patch;
+ name inlet;
operation sum;
fields (phi);
region cabin;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
index b743687b83ade1b7608083b5a72b5746d37033a8..852536f64afb212ddae195d7de7bf118550880b4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
index b743687b83ade1b7608083b5a72b5746d37033a8..852536f64afb212ddae195d7de7bf118550880b4 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
index 2f353374cdcebe05c339674695d1313b590f1ccf..176ec43fecfaa2afdc418f1299ef12fc0691e4f1 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/controlDict b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/controlDict
index 2d4b47d56da7d065ee87577e6ec7c5ea382df4c0..1efeae985112ea44c30a5fe8062f75d2bc2a4036 100644
--- a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/controlDict
@@ -50,25 +50,25 @@ functions
Q1
{
type Q;
- functionObjectLibs ("libfieldFunctionObjects.so");
+ libs ("libfieldFunctionObjects.so");
writeControl writeTime;
}
vorticity1
{
type vorticity;
- functionObjectLibs ("libfieldFunctionObjects.so");
+ libs ("libfieldFunctionObjects.so");
writeControl writeTime;
}
yPlus
{
type yPlus;
- functionObjectLibs ("libfieldFunctionObjects.so");
+ libs ("libfieldFunctionObjects.so");
writeControl writeTime;
}
fieldAverage1
{
type fieldAverage;
- functionObjectLibs ( "libfieldFunctionObjects.so" );
+ libs ("libfieldFunctionObjects.so");
writeControl writeTime;
timeStart 8.5;
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/s b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/s
index be72c6e32e92dbfec2fed86d25e8206c476f11ae..d97d6a3337fa569f2634805dd9e48aa0cded8dac 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/0/s
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/s
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution
index 1f971d4c7d7814d045bfd88b936a5891547f28be..23ffd4fbadc06cb87f641a49faf8e36abc797b73 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/backgroundMeshDecomposition/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution
index 1f971d4c7d7814d045bfd88b936a5891547f28be..23ffd4fbadc06cb87f641a49faf8e36abc797b73 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/cellShapeControlMesh/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/0/ReThetat b/tutorials/incompressible/simpleFoam/T3A/0/ReThetat
index 1f872c7cef40b12f1526616f87ddc786b9b62faa..3e9835876eb7ffd11add2dd4a01ff7f7c8d84f95 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0/ReThetat
+++ b/tutorials/incompressible/simpleFoam/T3A/0/ReThetat
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/0/U b/tutorials/incompressible/simpleFoam/T3A/0/U
index 2812c86759b6c77157e30026597e35fb3f6385cc..2add32cb42f5533a20cad855f1e3e62723dbe827 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0/U
+++ b/tutorials/incompressible/simpleFoam/T3A/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/0/gammaInt b/tutorials/incompressible/simpleFoam/T3A/0/gammaInt
index e5dd8891e66d8c75aee31a34d466cd87659ba005..38097fcf8a19ba2d5dc3b2388ea95b81bda5a13b 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0/gammaInt
+++ b/tutorials/incompressible/simpleFoam/T3A/0/gammaInt
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/0/k b/tutorials/incompressible/simpleFoam/T3A/0/k
index 8ad21a4d6c7fd457a5e4e28e538a07e138be5dbb..08ad0b449a4be7ce9b5c0482667eb217a9e8e2b9 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0/k
+++ b/tutorials/incompressible/simpleFoam/T3A/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/0/nut b/tutorials/incompressible/simpleFoam/T3A/0/nut
index 74358080dbfd685d2ee678ace44c59da8b0e5cce..129d1ce2d4c7d6d3412cd06d6972930b7f74f677 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0/nut
+++ b/tutorials/incompressible/simpleFoam/T3A/0/nut
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/0/omega b/tutorials/incompressible/simpleFoam/T3A/0/omega
index 1e3679a1b1d927cbc51f9a839e616cfea34c9785..7c997929cf4730521b86484ff4510b50492f9cc6 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0/omega
+++ b/tutorials/incompressible/simpleFoam/T3A/0/omega
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/0/p b/tutorials/incompressible/simpleFoam/T3A/0/p
index c0d9d3395be8c0f317d1549fceca8fd123cb4709..bb97e35c711f863792a046eab6fbc37b2e5c9d82 100644
--- a/tutorials/incompressible/simpleFoam/T3A/0/p
+++ b/tutorials/incompressible/simpleFoam/T3A/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/constant/transportProperties b/tutorials/incompressible/simpleFoam/T3A/constant/transportProperties
index a84d773be4801a8136c93043bb927f406d177ea2..09310886be9e2c20028c1507a7625456084fb31d 100644
--- a/tutorials/incompressible/simpleFoam/T3A/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/T3A/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/blockMeshDict b/tutorials/incompressible/simpleFoam/T3A/system/blockMeshDict
index 8be326f93bbdf0dcdb2b510fdef6e303a25a5a94..552d5a733afadc35ba9e7aca2de510cfc5ea1190 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/blockMeshDict
+++ b/tutorials/incompressible/simpleFoam/T3A/system/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes b/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes
index 50a05500cf6e1693ab22f5ae726c467f6b3c89ea..feaf482086bac5d68f1f8b2024866f424b6f6951 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/T3A/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/fvSolution b/tutorials/incompressible/simpleFoam/T3A/system/fvSolution
index c62270502d51b8ffb57750185c8cc2b6c4a74aad..ae094c0e71a6c6a079c8bdbd67c3430819299bab 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/T3A/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/kGraph b/tutorials/incompressible/simpleFoam/T3A/system/kGraph
index 9afad88eb1ef72a87d37573fce4aa94db776101e..708ad369e1d0e26703e1e2bce0982654ae00c228 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/kGraph
+++ b/tutorials/incompressible/simpleFoam/T3A/system/kGraph
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/wallShearStressGraph b/tutorials/incompressible/simpleFoam/T3A/system/wallShearStressGraph
index 127e647d384676c7b2f9016941b7e4c34a5d80b0..8774ccff609985dd16582a90587d4a829f354cb6 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/wallShearStressGraph
+++ b/tutorials/incompressible/simpleFoam/T3A/system/wallShearStressGraph
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/streamlines b/tutorials/incompressible/simpleFoam/pitzDaily/system/streamlines
index 3ed986047c5c83dba4adbe8e39cf68314a6b89c8..bcf7a7d5322436ac0f53d00e79d4356ff0adbc0b 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/streamlines
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/streamlines
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Web: www.OpenFOAM.org
+ \\ / A nd | Web: www.OpenFOAM.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Description
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
index eddae4496c8c0fd5a2837494ab2b86277b794034..7e7333f78c35c9d0bdc6794e91a776d808b25757 100755
--- a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# Remove 0.org/ copy and post-processing directories
+# Remove 0.orig/ copy and post-processing directories
\rm -rf 0 postProcessing
cleanCase
diff --git a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution
index 740eb61a4bcb97e64ae0b33558f5c7057e7a6d20..39c45aff34bc35d20e87c93cabdbee88918ad277 100644
--- a/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/blob/system/backgroundMeshDecomposition/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution
index 6368c1229865b54c53db9d5d239567540a12540b..003764a1865a92aeac4f27bbb7148e0fd441cd14 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/flange/system/backgroundMeshDecomposition/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution
index b5fc05a8355026cbbf2a38dd0eaee22e3ac9d188..ba2b8c03f3f78eebebfe47ddb170f6f5e9f6916c 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/backgroundMeshDecomposition/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/mesh/parallel/filter/Allclean b/tutorials/mesh/parallel/filter/Allclean
index eddae4496c8c0fd5a2837494ab2b86277b794034..7e7333f78c35c9d0bdc6794e91a776d808b25757 100755
--- a/tutorials/mesh/parallel/filter/Allclean
+++ b/tutorials/mesh/parallel/filter/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# Remove 0.org/ copy and post-processing directories
+# Remove 0.orig/ copy and post-processing directories
\rm -rf 0 postProcessing
cleanCase
diff --git a/tutorials/mesh/parallel/filter/Allrun b/tutorials/mesh/parallel/filter/Allrun
index 4be640030bc21cd4ba3faceacaa35ed29cb43fa4..0114f7829d55dc091a0406f0ebead592710c7641 100755
--- a/tutorials/mesh/parallel/filter/Allrun
+++ b/tutorials/mesh/parallel/filter/Allrun
@@ -9,7 +9,7 @@ application=$(getApplication)
# Create mesh
runApplication blockMesh
-# Restore 0/ from 0.org/
+# Restore 0/ from 0.orig/
restore0Dir
# Create sets
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
index 188dbba1cde0064156c4222d3fd5ebbad406d04f..b5139052585786476764b1b342c5f887339d82f8 100755
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun
@@ -13,7 +13,7 @@ m4 system/pachuka.m4 > system/blockMeshDict
runApplication blockMesh
-\cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.orig 0/alpha.water
# create faceSet for burner inlet and faceZone for coupled wall
runApplication topoSet
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/alpha.water.orig b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/alpha.water.orig
index 70366ec29f7aae0cb1cc50f62a3d186553321883..0a30f6e7e0765778415db83c9943c5350310ecad 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/alpha.water.orig
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/0/alpha.water.orig
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun
index 41332c6843ed23a0ff8789d36d0005423cca4025..c1f08e0d5a1992512f06dfb64a4de45e49cd36d0 100755
--- a/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
-\cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication $(getApplication)
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.orig
index 70366ec29f7aae0cb1cc50f62a3d186553321883..0a30f6e7e0765778415db83c9943c5350310ecad 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.orig
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha.water.orig
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.orig
index bdebcf1ab45a891b0e5d3ace86f053118bc90d3b..a33fee45053ed867220c07ed75450bd8c0770117 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.orig
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/alpha.water.orig
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.orig
index bdebcf1ab45a891b0e5d3ace86f053118bc90d3b..a33fee45053ed867220c07ed75450bd8c0770117 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.orig
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/alpha.water.orig
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.orig
index bdebcf1ab45a891b0e5d3ace86f053118bc90d3b..a33fee45053ed867220c07ed75450bd8c0770117 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.orig
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/alpha.water.orig
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.orig b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.orig
index bdebcf1ab45a891b0e5d3ace86f053118bc90d3b..a33fee45053ed867220c07ed75450bd8c0770117 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.orig
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/0/alpha.water.orig
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
index 1f8c00ace35d3196a075d27bd292a0e7ece61f12..a79b4bd61edcf46eb9a138bd255fa23502df9f0c 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object alpha.water.org;
+ object alpha.water.orig;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.orig b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.orig
index 1f8c00ace35d3196a075d27bd292a0e7ece61f12..a79b4bd61edcf46eb9a138bd255fa23502df9f0c 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.orig
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.orig
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object alpha.water.org;
+ object alpha.water.orig;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas
index b997ba8d87f6993e039af15822ff20ef1ae7fb74..f925c8267b9fc25d3ee4d2ac12959569f9371634 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids
index f89c81a228121fb7c9f8bf40cb654863af290e75..971e96154cb42c167becdd040bba6996eafbd1cb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids
index 15e74863026c46ab8db16d6a4896ff6ee1a0118a..1b11e50edc7b164b04147818cfbe55296e214c6a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas
index c2eba7f790c9c2056d4892e0b8a6e3d685862d37..71500e3613d9b036e390a2992ae9398dd8d3bf38 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids
index 83efb2917f8162c1447bc7e6cb18dd931c5bfe66..23ebd382c57dbc596e263ade1ca60f1912b67cf4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids
index 7b10e13ea304e9742e3812e2cc472b45ce6106ef..db8b80b9c4f778d1310e5a242b27db4140240317 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas
index a427a3d22089f842b607efd6b3a95e9efb8e1571..295400540e0c2fc9b5a37a664c5538b83d7f61cf 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids
index 629d9b81b2f7592eba1aede232120a7e2a938493..eabaa373442dc0ed8029519a3eea1bb5f7cfd2a8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas
index d71220e918cbb5cdc0e6524ec2f0fe5d4128f242..cf9e1352a1c91cee9ca10795003786b5423d6cd9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas
index 7b712450dbfbc4661e4cafad3dfb1db514b467de..b67628e301369b74529c37b8cdb7a2e88c10d775 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas
index 48bbb42864d6a9634bb033d1f6d11df1b00b781f..a3ade361a473168ed6d8b162422382657453d6ed 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids
index 978d7897046179ac59325dc1f87c8121a103c976..07f8dac1141f36616f5a7c7ca26d8d4e47282d5d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p
index 2ab8e8cdcccf07a4eb0de680c83a7dbfd681efbb..c5e3021065863fa464c86cf5d87db5474992d0b1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh
index 0b84a879587303f2279405666bf5d0d61e4ff843..e430732d90710979b990a4b37ef45a13699f768b 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g
index e0ac2653b5b370ad62f6770588121d30cac51627..4fea433a003518e15418a7270bcf4842db7b2126 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties
index d53b4d7196fad22aec495f92d8c5b7ab70920b79..7984f24f13a657ba301398a59372724b27defc36 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
index a2a98f45f2c4e162d59c784de1b5e58f8a22348b..4022da7200574e41b2f9026894bc295795cc6f82 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
index 84dae4b7166c241435c8fc55987ee9a24ce067d8..2c26b40cf592d8dfca2c2d11ad0220669f20affe 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas
index d92fbf9947c21aa42bebab8def094f82ace2005e..41653530eec9364676ec9ee7b6cf62033b02b8ae 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids
index 04793a45c21c537f1d65870f4372fea7a7c2224d..80a08be521e39cb0a0d3c9b94a338c1f693e5f94 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict
index ebf2ada3b0145848997436388a6b41acd3c4ac99..cb039838a1d273f7b0d46a48cf1fb97ce8f8a2a4 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict
index f929ca081e9e0ab9142f219e8a754064247647eb..66ad117e76b46ae02549e6eddf0e6e94c20d4196 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
index 293328da6c694edaeb03b00089f1f712180b7fc6..2ec7a2729c27f750de606ffb0dd2ce791b04b174 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution
index 50a63b0825742cad125cc7f1d9b70edb5e6fc8e5..65108876cf4bae9f8fbc64e6e960d9759e3af517 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph
index 5a4229eed63714f16c7cce4e4ea0e6eb9e538304..67931a12408f09bb379121505e6c8a50fe37c201 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/