From 39f6e7d0566033712ded003e85eec96c26108413 Mon Sep 17 00:00:00 2001
From: s126103 <t.j.m.nijssen@tue.nl>
Date: Tue, 23 Jul 2019 09:13:56 +0200
Subject: [PATCH] pressure eqn and bc updates

---
 applications/solvers/cfdemSolverPiso/pEqn.H               | 4 ++--
 .../uniformFixedValueTubeFvPatchField.C                   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/applications/solvers/cfdemSolverPiso/pEqn.H b/applications/solvers/cfdemSolverPiso/pEqn.H
index 96ca1d77..d4216118 100644
--- a/applications/solvers/cfdemSolverPiso/pEqn.H
+++ b/applications/solvers/cfdemSolverPiso/pEqn.H
@@ -21,7 +21,7 @@ phi = phiHbyA + rAUf*(fvc::interpolate(Ksl/rho) * phiS);
 MRF.makeRelative(phi);
 
 // adjustment of phi (only in cases w.o. p boundary conditions) not tested yet
-adjustPhi(phi, U, p);
+//adjustPhi(phi, U, p);
 
 // Update the pressure BCs to ensure flux consistency
 constrainPressure(p, Uvoidfraction, phiHbyA, rAUvoidfraction, MRF);
@@ -55,4 +55,4 @@ else
     U = HbyA - voidfraction*rAU*fvc::grad(p) + Ksl/rho*Us*rAU;
 
 U.correctBoundaryConditions();
-fvOptions.correct(U);
\ No newline at end of file
+fvOptions.correct(U);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValueTube/uniformFixedValueTubeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValueTube/uniformFixedValueTubeFvPatchField.C
index 00f0033b..e843c66e 100755
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValueTube/uniformFixedValueTubeFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValueTube/uniformFixedValueTubeFvPatchField.C
@@ -89,7 +89,7 @@ uniformFixedValueTubeFvPatchField<Type>::uniformFixedValueTubeFvPatchField
 :
     fixedValueFvPatchField<Type>(p, iF),
     uniformValue_(Function1<Type>::New("uniformValue", dict)),
-	pName_("p"), //JOKER
+	pName_("p_rgh"), //JOKER
 	phiName_("phi"), //JOKER
     velocityFieldName_("U"),
     densityFieldName_("rho"),
@@ -110,7 +110,7 @@ uniformFixedValueTubeFvPatchField<Type>::uniformFixedValueTubeFvPatchField
 :
     fixedValueFvPatchField<Type>(ptf),
     uniformValue_(ptf.uniformValue_().clone().ptr()),
-	pName_("p"), //JOKER
+	pName_("p_rgh"), //JOKER
 	phiName_("phi"), //JOKER
     velocityFieldName_("U"),
     densityFieldName_("rho"),
@@ -132,7 +132,7 @@ uniformFixedValueTubeFvPatchField<Type>::uniformFixedValueTubeFvPatchField
 :
     fixedValueFvPatchField<Type>(ptf, iF),
     uniformValue_(ptf.uniformValue_().clone().ptr()),
-	pName_("p"), //JOKER
+	pName_("p_rgh"), //JOKER
 	phiName_("phi"), //JOKER
     velocityFieldName_("U"),
     densityFieldName_("rho"),
@@ -181,7 +181,7 @@ void uniformFixedValueTubeFvPatchField<Type>::updateCoeffs()
 	//calc cell velocity from flux phip
 	//scalar vel = phip/this->patch().magSf();
     // some relaxation might be useful?
-    
+	
     // calc pressure drop
 //    fvPatchField<Type>::operator==(0.5*zeta*density*mag(velocity)*mag(velocity)*uniformValue_->value(t));
 	//dP = zeta * l/d * rho u^2 / 2