Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Development
openfoam
Commits
93ed9337
Commit
93ed9337
authored
Aug 05, 2020
by
Mark Olesen
Committed by
Sergio Ferraris
Aug 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
STYLE: use unitConversion degToRad() from instead of separate value
parent
915c0785
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
27 deletions
+11
-27
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
...terFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+1
-3
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
...terFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
+0
-4
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
...uler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
+5
-8
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
...uler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
+0
-3
src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
...uler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
+5
-6
src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
...uler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
+0
-3
No files found.
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
View file @
93ed9337
...
...
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -45,9 +46,6 @@ namespace Foam
defineTypeNameAndDebug
(
multiphaseMixtureThermo
,
0
);
}
const
Foam
::
scalar
Foam
::
multiphaseMixtureThermo
::
convertToRad
=
Foam
::
constant
::
mathematical
::
pi
/
180
.
0
;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
...
...
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
View file @
93ed9337
...
...
@@ -139,10 +139,6 @@ private:
//- Stabilisation for normalisation of the interface normal
const
dimensionedScalar
deltaN_
;
//- Conversion factor for degrees into radians
static
const
scalar
convertToRad
;
// Private member functions
...
...
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
View file @
93ed9337
...
...
@@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2018 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -38,11 +39,7 @@ License
#include "fvcFlux.H"
#include "fvcAverage.H"
// * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * //
const
Foam
::
scalar
Foam
::
multiphaseSystem
::
convertToRad
=
Foam
::
constant
::
mathematical
::
pi
/
180
.
0
;
#include "unitConversion.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
...
...
@@ -281,7 +278,7 @@ void Foam::multiphaseSystem::correctContactAngle
bool
matched
=
(
tp
.
key
().
first
()
==
phase1
.
name
());
scalar
theta0
=
convert
ToRad
*
tp
().
theta0
(
matched
);
const
scalar
theta0
=
deg
ToRad
(
tp
().
theta0
(
matched
)
)
;
scalarField
theta
(
boundary
[
patchi
].
size
(),
theta0
);
scalar
uTheta
=
tp
().
uTheta
();
...
...
@@ -289,8 +286,8 @@ void Foam::multiphaseSystem::correctContactAngle
// Calculate the dynamic contact angle if required
if
(
uTheta
>
SMALL
)
{
scalar
thetaA
=
convert
ToRad
*
tp
().
thetaA
(
matched
);
scalar
thetaR
=
convert
ToRad
*
tp
().
thetaR
(
matched
);
const
scalar
thetaA
=
deg
ToRad
(
tp
().
thetaA
(
matched
)
)
;
const
scalar
thetaR
=
deg
ToRad
(
tp
().
thetaR
(
matched
)
)
;
// Calculated the component of the velocity parallel to the wall
vectorField
Uwall
...
...
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
View file @
93ed9337
...
...
@@ -190,9 +190,6 @@ private:
//- Stabilisation for normalisation of the interface normal
const
dimensionedScalar
deltaN_
;
//- Conversion factor for degrees into radians
static
const
scalar
convertToRad
;
// Private member functions
...
...
src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
View file @
93ed9337
...
...
@@ -44,6 +44,8 @@ License
#include "fvmLaplacian.H"
#include "fvmSup.H"
#include "unitConversion.H"
// * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * //
namespace
Foam
...
...
@@ -52,9 +54,6 @@ namespace Foam
defineRunTimeSelectionTable
(
multiphaseSystem
,
dictionary
);
}
const
Foam
::
scalar
Foam
::
multiphaseSystem
::
convertToRad
=
Foam
::
constant
::
mathematical
::
pi
/
180
.
0
;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
...
...
@@ -425,7 +424,7 @@ void Foam::multiphaseSystem::correctContactAngle
bool
matched
=
(
tp
.
key
().
first
()
==
phase1
.
name
());
scalar
theta0
=
convert
ToRad
*
tp
().
theta0
(
matched
);
scalar
theta0
=
deg
ToRad
(
tp
().
theta0
(
matched
)
)
;
scalarField
theta
(
boundary
[
patchi
].
size
(),
theta0
);
scalar
uTheta
=
tp
().
uTheta
();
...
...
@@ -433,8 +432,8 @@ void Foam::multiphaseSystem::correctContactAngle
// Calculate the dynamic contact angle if required
if
(
uTheta
>
SMALL
)
{
scalar
thetaA
=
convert
ToRad
*
tp
().
thetaA
(
matched
);
scalar
thetaR
=
convert
ToRad
*
tp
().
thetaR
(
matched
);
const
scalar
thetaA
=
deg
ToRad
(
tp
().
thetaA
(
matched
)
)
;
const
scalar
thetaR
=
deg
ToRad
(
tp
().
thetaR
(
matched
)
)
;
// Calculated the component of the velocity parallel to the wall
vectorField
Uwall
...
...
src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
View file @
93ed9337
...
...
@@ -75,9 +75,6 @@ private:
//- Stabilisation for normalisation of the interface normal
const
dimensionedScalar
deltaN_
;
//- Conversion factor for degrees into radians
static
const
scalar
convertToRad
;
// Private member functions
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment