zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolving merge issues

Browse Source
This commit is contained in:
ekinaci
2016-05-17 09:37:20 +02:00
parent a731d14e72
commit a986592e0a
3 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lagrangian/cfdemParticle/subModels/thermCondModel/noTherm/noThermCond.C
View File

@ -88,7 +88,7 @@ tmp<volScalarField> noThermCond::thermDiff() const
(
IOobject
(
"fake1",
"fake2",
particleCloud_.mesh().time().timeName(),
particleCloud_.mesh(),
IOobject::NO_READ,

31
tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/0/thDiff
View File

@ -1,13 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
<<<<<<< HEAD
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
=======
| \\ / O peration | Version: 2.3.0 |
| \\ / A nd | Web: www.OpenFOAM.org |
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -15,54 +10,34 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
<<<<<<< HEAD
object thDiff;
=======
location "0";
object T;
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -1 0 0 0 0];
<<<<<<< HEAD
internalField uniform 0.0;
=======
internalField uniform 0;
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
boundaryField
{
top
{
type fixedValue;
<<<<<<< HEAD
value uniform 6e-05;
=======
value uniform 2.3e-5;
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
}
bottom
{
type fixedValue;
<<<<<<< HEAD
value uniform 6e-05;
=======
value uniform 2.3e-5;
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
}
walls
{
type fixedValue;
<<<<<<< HEAD
value uniform 6e-05;
=======
value uniform 2.3e-5;
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80
}
symmetry
@ -76,11 +51,5 @@ boundaryField
}
}
<<<<<<< HEAD
// ************************************************************************* //
=======
// ************************************************************************* //
>>>>>>> 8eb000e27b9eff183742ea5b6406b9d058456b80

2
tutorials/cfdemSolverRhoPimpleChem/simplifiedSiwek_in_CFDEM/CFD/constant/couplingProperties
View File

@ -78,7 +78,7 @@ energyModels
//reactionHeat
);
thermCondModel SyamlalThermCond;//thermCondModel;//off;
thermCondModel off;//SyamlalThermCond;//thermCondModel;//off;
chemistryModel species;