From 94f3919ed602012fa1f321ebfd5337acc7417866 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Wed, 14 Dec 2016 14:10:24 +0000
Subject: [PATCH] Template function objects: corrected forces and forceCoeffs
for code correction See bug-report https://bugs.openfoam.org/view.php?id=2387
---
etc/caseDicts/postProcessing/forces/forceCoeffs.cfg | 1 -
.../postProcessing/forces/forceCoeffsCompressible | 2 +-
.../postProcessing/forces/forceCoeffsCompressible.cfg | 11 -----------
etc/caseDicts/postProcessing/forces/forces.cfg | 1 -
.../postProcessing/forces/forcesCompressible | 2 +-
.../postProcessing/forces/forcesIncompressible | 2 +-
...orcesCompressible.cfg => forcesIncompressible.cfg} | 2 +-
7 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
rename etc/caseDicts/postProcessing/forces/{forcesCompressible.cfg => forcesIncompressible.cfg} (93%)
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
index d9d83a75d3..22b546d521 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
@@ -9,6 +9,5 @@
#includeEtc "caseDicts/postProcessing/forces/forces.cfg"
type forceCoeffs;
-rhoInf 1; // Redundant for incompressible
// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
index abb8f6e391..640d17a08e 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
@@ -25,6 +25,6 @@ dragDir (1 0 0);
CofR (0 0 0);
pitchAxis (0 1 0);
-#includeEtc "caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg"
+#includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg"
// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
deleted file mode 100644
index 87a8667d87..0000000000
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-
-#includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg"
-
-// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forces.cfg b/etc/caseDicts/postProcessing/forces/forces.cfg
index 9f0e3f7780..80237e3368 100644
--- a/etc/caseDicts/postProcessing/forces/forces.cfg
+++ b/etc/caseDicts/postProcessing/forces/forces.cfg
@@ -12,7 +12,6 @@ libs ("libforces.so");
writeControl timeStep;
writeInterval 1;
-rho rhoInf; // Incompressible solver
log off;
// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible b/etc/caseDicts/postProcessing/forces/forcesCompressible
index 000cb97b8c..889dea167c 100644
--- a/etc/caseDicts/postProcessing/forces/forcesCompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesCompressible
@@ -16,6 +16,6 @@ patches (patch1 patch2);
CofR (0 0 0);
pitchAxis (0 1 0);
-#includeEtc "caseDicts/postProcessing/forces/forcesCompressible.cfg"
+#includeEtc "caseDicts/postProcessing/forces/forces.cfg"
// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forcesIncompressible b/etc/caseDicts/postProcessing/forces/forcesIncompressible
index 6437ca2279..a507d2675c 100644
--- a/etc/caseDicts/postProcessing/forces/forcesIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesIncompressible
@@ -11,7 +11,7 @@ Description
\*---------------------------------------------------------------------------*/
-#includeEtc "caseDicts/postProcessing/forces/forces.cfg"
+#includeEtc "caseDicts/postProcessing/forces/forcesIncompressible.cfg"
rhoInf 1.225; // Fluid density
patches (patch1 patch2);
diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg b/etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg
similarity index 93%
rename from etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
rename to etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg
index 66604a4a09..8690229d4c 100644
--- a/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
+++ b/etc/caseDicts/postProcessing/forces/forcesIncompressible.cfg
@@ -8,6 +8,6 @@
#includeEtc "caseDicts/postProcessing/forces/forces.cfg"
-rhoInf 1; // Redundant
+rho rhoInf; // Incompressible solver
// ************************************************************************* //
--
GitLab