Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openfoam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
openfoam
Commits
34ecc21e
Commit
34ecc21e
authored
16 years ago
by
Mattijs Janssens
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of /home/noisy2/OpenFOAM/OpenFOAM-dev
parents
e8a706fc
1e072d64
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+15
-21
15 additions, 21 deletions
...lds/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
wmake/rules/General/CGAL
+1
-1
1 addition, 1 deletion
wmake/rules/General/CGAL
with
16 additions
and
22 deletions
src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+
15
−
21
View file @
34ecc21e
...
@@ -30,14 +30,9 @@ License
...
@@ -30,14 +30,9 @@ License
#include
"volFields.H"
#include
"volFields.H"
#include
"basicThermo.H"
#include
"basicThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace
Foam
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
wallHeatTransferFvPatchScalarField
::
wallHeatTransferFvPatchScalarField
Foam
::
wallHeatTransferFvPatchScalarField
::
wallHeatTransferFvPatchScalarField
(
(
const
fvPatch
&
p
,
const
fvPatch
&
p
,
const
DimensionedField
<
scalar
,
volMesh
>&
iF
const
DimensionedField
<
scalar
,
volMesh
>&
iF
...
@@ -53,7 +48,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
...
@@ -53,7 +48,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
}
}
wallHeatTransferFvPatchScalarField
::
wallHeatTransferFvPatchScalarField
Foam
::
wallHeatTransferFvPatchScalarField
::
wallHeatTransferFvPatchScalarField
(
(
const
wallHeatTransferFvPatchScalarField
&
ptf
,
const
wallHeatTransferFvPatchScalarField
&
ptf
,
const
fvPatch
&
p
,
const
fvPatch
&
p
,
...
@@ -67,7 +62,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
...
@@ -67,7 +62,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
{}
{}
wallHeatTransferFvPatchScalarField
::
wallHeatTransferFvPatchScalarField
Foam
::
wallHeatTransferFvPatchScalarField
::
wallHeatTransferFvPatchScalarField
(
(
const
fvPatch
&
p
,
const
fvPatch
&
p
,
const
DimensionedField
<
scalar
,
volMesh
>&
iF
,
const
DimensionedField
<
scalar
,
volMesh
>&
iF
,
...
@@ -96,7 +91,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
...
@@ -96,7 +91,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
}
}
wallHeatTransferFvPatchScalarField
::
wallHeatTransferFvPatchScalarField
Foam
::
wallHeatTransferFvPatchScalarField
::
wallHeatTransferFvPatchScalarField
(
(
const
wallHeatTransferFvPatchScalarField
&
tppsf
const
wallHeatTransferFvPatchScalarField
&
tppsf
)
)
...
@@ -107,7 +102,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
...
@@ -107,7 +102,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
{}
{}
wallHeatTransferFvPatchScalarField
::
wallHeatTransferFvPatchScalarField
Foam
::
wallHeatTransferFvPatchScalarField
::
wallHeatTransferFvPatchScalarField
(
(
const
wallHeatTransferFvPatchScalarField
&
tppsf
,
const
wallHeatTransferFvPatchScalarField
&
tppsf
,
const
DimensionedField
<
scalar
,
volMesh
>&
iF
const
DimensionedField
<
scalar
,
volMesh
>&
iF
...
@@ -121,7 +116,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
...
@@ -121,7 +116,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void
wallHeatTransferFvPatchScalarField
::
autoMap
void
Foam
::
wallHeatTransferFvPatchScalarField
::
autoMap
(
(
const
fvPatchFieldMapper
&
m
const
fvPatchFieldMapper
&
m
)
)
...
@@ -132,7 +127,7 @@ void wallHeatTransferFvPatchScalarField::autoMap
...
@@ -132,7 +127,7 @@ void wallHeatTransferFvPatchScalarField::autoMap
}
}
void
wallHeatTransferFvPatchScalarField
::
rmap
void
Foam
::
wallHeatTransferFvPatchScalarField
::
rmap
(
(
const
fvPatchScalarField
&
ptf
,
const
fvPatchScalarField
&
ptf
,
const
labelList
&
addr
const
labelList
&
addr
...
@@ -148,7 +143,7 @@ void wallHeatTransferFvPatchScalarField::rmap
...
@@ -148,7 +143,7 @@ void wallHeatTransferFvPatchScalarField::rmap
}
}
void
wallHeatTransferFvPatchScalarField
::
updateCoeffs
()
void
Foam
::
wallHeatTransferFvPatchScalarField
::
updateCoeffs
()
{
{
if
(
updated
())
if
(
updated
())
{
{
...
@@ -159,13 +154,13 @@ void wallHeatTransferFvPatchScalarField::updateCoeffs()
...
@@ -159,13 +154,13 @@ void wallHeatTransferFvPatchScalarField::updateCoeffs()
(
(
"thermophysicalProperties"
"thermophysicalProperties"
);
);
const
label
patchi
=
patch
().
index
();
const
label
patchi
=
patch
().
index
();
const
scalarField
&
Tw
=
thermo
.
T
().
boundaryField
()[
patchi
];
const
scalarField
&
Tw
=
thermo
.
T
().
boundaryField
()[
patchi
];
scalarField
Cpw
=
thermo
.
Cp
(
Tw
,
patchi
);
scalarField
Cpw
=
thermo
.
Cp
(
Tw
,
patchi
);
valueFraction
()
=
valueFraction
()
=
1
.
0
/
1
.
0
/
(
(
1
.
0
1
.
0
...
@@ -177,7 +172,7 @@ void wallHeatTransferFvPatchScalarField::updateCoeffs()
...
@@ -177,7 +172,7 @@ void wallHeatTransferFvPatchScalarField::updateCoeffs()
}
}
void
wallHeatTransferFvPatchScalarField
::
write
(
Ostream
&
os
)
const
void
Foam
::
wallHeatTransferFvPatchScalarField
::
write
(
Ostream
&
os
)
const
{
{
fvPatchScalarField
::
write
(
os
);
fvPatchScalarField
::
write
(
os
);
Tinf_
.
writeEntry
(
"Tinf"
,
os
);
Tinf_
.
writeEntry
(
"Tinf"
,
os
);
...
@@ -188,10 +183,9 @@ void wallHeatTransferFvPatchScalarField::write(Ostream& os) const
...
@@ -188,10 +183,9 @@ void wallHeatTransferFvPatchScalarField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField
(
fvPatchScalarField
,
wallHeatTransferFvPatchScalarField
);
namespace
Foam
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField
(
fvPatchScalarField
,
wallHeatTransferFvPatchScalarField
);
}
}
// End namespace Foam
// ************************************************************************* //
// ************************************************************************* //
This diff is collapsed.
Click to expand it.
wmake/rules/General/CGAL
+
1
−
1
View file @
34ecc21e
CGAL_PATH = ${WM_
PROJECT_INST_DIR}/${WM_ARCH
}/CGAL-${CGAL_VERSION}
CGAL_PATH = ${WM_
THIRD_PARTY_DIR
}/CGAL-${CGAL_VERSION}
CGAL_INC = \
CGAL_INC = \
-Wno-old-style-cast \
-Wno-old-style-cast \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment