multiphaseEulerFoam: Make aspect ratio models sub-models of force models

These models are quite configuration specific. It makes sense to make
them sub-models of the force (drag or lift) models that use them, rather
than making them fundamental properties of the phase system.
This commit is contained in:
Will Bainbridge
2021-12-14 11:19:23 +00:00
parent d9be4381f5
commit 3761c48e1c
48 changed files with 100 additions and 451 deletions

View File

@ -73,21 +73,6 @@ surfaceTension
}
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
);
drag
(
(air in water)

View File

@ -83,6 +83,12 @@ lift
{
type Tomiyama;
Cl 0.288;
aspectRatio
{
type constant;
E0 1;
}
}
wallDamping
@ -122,9 +128,6 @@ blending
}
}
aspectRatio
();
surfaceTension
(
(gas and liquid)

View File

@ -63,10 +63,6 @@ surfaceTension
}
);
aspectRatio
(
);
drag
(
(solids in gas)

View File

@ -73,21 +73,6 @@ surfaceTension
}
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
);
drag
(
(air in water)

View File

@ -78,21 +78,6 @@ surfaceTension
}
);
aspectRatio
(
(gas in liquid)
{
type constant;
E0 1.0;
}
(liquid in gas)
{
type constant;
E0 1.0;
}
);
drag
(
(gas in liquid)

View File

@ -141,19 +141,6 @@ surfaceTension
interfaceCompression
();
aspectRatio
(
(air1 in water)
{
type Wellek;
}
(air2 in water)
{
type Wellek;
}
);
drag
(
(air1 in water)
@ -216,9 +203,9 @@ lift
{
type Tomiyama;
swarmCorrection
aspectRatio
{
type none;
type Wellek;
}
}
}
@ -237,9 +224,9 @@ lift
{
type Tomiyama;
swarmCorrection
aspectRatio
{
type none;
type Wellek;
}
}
}

View File

@ -65,9 +65,6 @@ surfaceTension
}
);
aspectRatio
();
interfaceCompression
();

View File

@ -92,6 +92,12 @@ lift
{
type Tomiyama;
Cl 0.288;
aspectRatio
{
type constant;
E0 1;
}
}
wallDamping
@ -132,9 +138,6 @@ blending
}
}
aspectRatio
();
saturation
(
(gas and liquid)

View File

@ -132,6 +132,12 @@ lift
{
type Tomiyama;
Cl 0.288;
aspectRatio
{
type constant;
E0 1;
}
}
wallDamping
@ -172,9 +178,6 @@ blending
}
}
aspectRatio
();
saturation
(
(gas and liquid)

View File

@ -175,6 +175,12 @@ lift
{
type Tomiyama;
Cl 0.288;
aspectRatio
{
type constant;
E0 1;
}
}
wallDamping
@ -215,9 +221,6 @@ blending
}
}
aspectRatio
();
saturation
(
(gas and liquid)

View File

@ -232,6 +232,12 @@ lift
{
type Tomiyama;
Cl 0.288;
aspectRatio
{
type constant;
E0 1;
}
}
wallDamping
@ -250,6 +256,12 @@ lift
{
type Tomiyama;
Cl 0.288;
aspectRatio
{
type constant;
E0 1;
}
}
wallDamping
@ -304,9 +316,6 @@ blending
}
}
aspectRatio
();
saturation
(
(gas and liquid)

View File

@ -90,45 +90,6 @@ surfaceTension
}
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
(air in solid)
{
type constant;
E0 1.0;
}
(solid in air)
{
type constant;
E0 1.0;
}
(water in solid)
{
type constant;
E0 1.0;
}
(solid in water)
{
type constant;
E0 1.0;
}
);
drag
(
(air in water)

View File

@ -78,21 +78,6 @@ surfaceTension
interfaceCompression
();
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
);
drag
(
(air in water)

View File

@ -78,21 +78,6 @@ surfaceTension
}
);
aspectRatio
(
(gas in liquid)
{
type constant;
E0 1.0;
}
(liquid in gas)
{
type constant;
E0 1.0;
}
);
drag
(
(gas in liquid)

View File

@ -78,21 +78,6 @@ surfaceTension
}
);
aspectRatio
(
(gas in liquid)
{
type constant;
E0 1.0;
}
(liquid in gas)
{
type constant;
E0 1.0;
}
);
drag
(
(gas in liquid)

View File

@ -95,21 +95,6 @@ surfaceTension
}
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
);
drag
(
(air in water)

View File

@ -124,9 +124,6 @@ interfaceCompression
(oil and mercury) 1
);
aspectRatio
();
drag
(
(air and water)

View File

@ -61,9 +61,6 @@ surfaceTension
}
);
aspectRatio
();
drag
(
(particles in air)

View File

@ -73,21 +73,6 @@ surfaceTension
}
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
);
drag
(
(air in water)

View File

@ -139,9 +139,6 @@ interfaceCompression
(oil and mercury) 1
);
aspectRatio
();
drag
(
(air in water)

View File

@ -140,9 +140,6 @@ interfaceCompression
(oil and mercury) 1
);
aspectRatio
();
drag
(
(air in water)

View File

@ -139,9 +139,6 @@ interfaceCompression
(oil and mercury) 1
);
aspectRatio
();
drag
(
(air in water)

View File

@ -73,15 +73,6 @@ saturation
}
);
aspectRatio
(
(steam in water)
{
type constant;
E0 1.0;
}
);
drag
(
(steam in water)

View File

@ -147,9 +147,6 @@ interfaceCompression
surfaceTension
();
aspectRatio
();
drag
(
(particles in vapor)

View File

@ -159,9 +159,6 @@ interfaceCompression
surfaceTension
();
aspectRatio
();
drag
(
(particles in vapor)

View File

@ -85,45 +85,6 @@ surfaceTension
}
);
aspectRatio
(
(air in water)
{
type constant;
E0 1.0;
}
(water in air)
{
type constant;
E0 1.0;
}
(air in solid)
{
type constant;
E0 1.0;
}
(solid in air)
{
type constant;
E0 1.0;
}
(water in solid)
{
type constant;
E0 1.0;
}
(solid in water)
{
type constant;
E0 1.0;
}
);
drag
(
(air and water)