correct a few bugs in the source code for OpenFOAM

NHERI-SimCenter · Jul 29, 2020 · fc499b3 · fc499b3
1 parent e4d3dec
commit fc499b3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/...AM_code/OpenFOAM6/turbulentInflow/turbulentDFMInlet/turbulentDFMInletFvPatchVectorField.C b/...AM_code/OpenFOAM6/turbulentInflow/turbulentDFMInlet/turbulentDFMInletFvPatchVectorField.C
@@ -282,11 +282,9 @@ void Foam::turbulentDFMInletFvPatchVectorField::initialiseParameters()
         const vector ey = Lund2.y()/R_[label].yy();
         const vector ez = Lund2.z()/R_[label].zz();
 
-        tensor E = tensor(ex, ey, ez);
+        const tensor E = tensor(ex, ey, ez);
 
-        const tensor L = inv(E)&L_[label].T();
-
-        L_[label] = L.T();
+        L_[label] = inv(E)&L_[label];
     }
 }
 
@@ -371,8 +369,8 @@ void Foam::turbulentDFMInletFvPatchVectorField::initialiseFilterCoeff()
 
     forAll(L, label)
     {
-        ny_[label] = vector(ceil(L[label].yx()/delta_), ceil(L[label].yy()/delta_), ceil(L[label].yz()/delta_));
-        nz_[label] = vector(ceil(L[label].zx()/delta_), ceil(L[label].zy()/delta_), ceil(L[label].zz()/delta_));
+        ny_[label] = vector(ceil(L[label].xy()/delta_), ceil(L[label].yy()/delta_), ceil(L[label].zy()/delta_));
+        nz_[label] = vector(ceil(L[label].xz()/delta_), ceil(L[label].yz()/delta_), ceil(L[label].zz()/delta_));
     }
 
     const labelVector nyMax = gMax(ny_);
@@ -769,7 +767,8 @@ void Foam::turbulentDFMInletFvPatchVectorField::temporalCorr()
 
     forAll(uFluctTemporal_, faceI)
     {
-        vector T = L_[faceI].x()/U_[faceI];
+        const vector L = vector(L_[faceI].xx(),L_[faceI].yx(),L_[faceI].zx());
+        const vector T = L/U_[faceI];
 
         for (label ii = 0; ii <= 2; ii++)
         {

diff --git a/openFOAM_code/OpenFOAM6/turbulentInflow/turbulentSEMInlet/eddy/eddy.C b/openFOAM_code/OpenFOAM6/turbulentInflow/turbulentSEMInlet/eddy/eddy.C
@@ -73,10 +73,9 @@ Foam::eddy::eddy
     const vector ey = Lund2.y()/R.yy();
     const vector ez = Lund2.z()/R.zz();
 
-    tensor E = tensor(ex, ey, ez);
+    const tensor E = tensor(ex, ey, ez);
 
-    sigma_ = 2.0*(inv(E)&L.T());
-    sigma_ = sigma_.T();
+    sigma_ = 2.0*(inv(E)&L);
 }
 
 Foam::eddy::eddy

diff --git a/...AM_code/OpenFOAM7/turbulentInflow/turbulentDFMInlet/turbulentDFMInletFvPatchVectorField.C b/...AM_code/OpenFOAM7/turbulentInflow/turbulentDFMInlet/turbulentDFMInletFvPatchVectorField.C
@@ -282,11 +282,9 @@ void Foam::turbulentDFMInletFvPatchVectorField::initialiseParameters()
         const vector ey = Lund2.y()/R_[label].yy();
         const vector ez = Lund2.z()/R_[label].zz();
 
-        tensor E = tensor(ex, ey, ez);
+        const tensor E = tensor(ex, ey, ez);
 
-        const tensor L = inv(E)&L_[label].T();
-
-        L_[label] = L.T();
+        L_[label] = inv(E)&L_[label].T();
     }
 }
 
@@ -371,8 +369,8 @@ void Foam::turbulentDFMInletFvPatchVectorField::initialiseFilterCoeff()
 
     forAll(L, label)
     {
-        ny_[label] = vector(ceil(L[label].yx()/delta_), ceil(L[label].yy()/delta_), ceil(L[label].yz()/delta_));
-        nz_[label] = vector(ceil(L[label].zx()/delta_), ceil(L[label].zy()/delta_), ceil(L[label].zz()/delta_));
+        ny_[label] = vector(ceil(L[label].xy()/delta_), ceil(L[label].yy()/delta_), ceil(L[label].zy()/delta_));
+        nz_[label] = vector(ceil(L[label].xz()/delta_), ceil(L[label].yz()/delta_), ceil(L[label].zz()/delta_));
     }
 
     const labelVector nyMax = gMax(ny_);
@@ -769,7 +767,8 @@ void Foam::turbulentDFMInletFvPatchVectorField::temporalCorr()
 
     forAll(uFluctTemporal_, faceI)
     {
-        vector T = L_[faceI].x()/U_[faceI];
+        const vector L = vector(L_[faceI].xx(),L_[faceI].yx(),L_[faceI].zx());
+        const vector T = L/U_[faceI];
 
         for (label ii = 0; ii <= 2; ii++)
         {

diff --git a/openFOAM_code/OpenFOAM7/turbulentInflow/turbulentSEMInlet/eddy/eddy.C b/openFOAM_code/OpenFOAM7/turbulentInflow/turbulentSEMInlet/eddy/eddy.C
@@ -73,10 +73,9 @@ Foam::eddy::eddy
     const vector ey = Lund2.y()/R.yy();
     const vector ez = Lund2.z()/R.zz();
 
-    tensor E = tensor(ex, ey, ez);
+    const tensor E = tensor(ex, ey, ez);
 
-    sigma_ = 2.0*(inv(E)&L.T());
-    sigma_ = sigma_.T();
+    sigma_ = 2.0*(inv(E)&L);
 }
 
 Foam::eddy::eddy