From 115b1ccba2dc5e9abcac55d10bcbc49cbe2115ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4fer?= <schafjan@fjfi.cvut.cz>
Date: Fri, 29 Mar 2019 15:32:16 +0100
Subject: [PATCH] splitted velocities for horizontal and vertical throttles
---
src/Examples/flows/navierStokes.h | 3 +++
src/Examples/flows/navierStokesAUSMPlus.h | 3 +++
src/Examples/flows/navierStokesLaxFriedrichs.h | 3 +++
src/Examples/flows/navierStokesProblem.h | 5 ++++-
src/Examples/flows/navierStokesProblem_impl.h | 6 +++++-
src/Examples/flows/navierStokesStegerWarming.h | 3 +++
src/Examples/flows/navierStokesVanLeer.h | 3 +++
7 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/Examples/flows/navierStokes.h b/src/Examples/flows/navierStokes.h
index e9b09ac31d..18ca18996f 100644
--- a/src/Examples/flows/navierStokes.h
+++ b/src/Examples/flows/navierStokes.h
@@ -59,6 +59,9 @@ template< typename ConfigTag >class navierStokesConfig
config.addEntry< double >( "speed-increment-until", "This sets time until input speed will rose", -0.1 );
config.addEntry< double >( "start-speed", "This sets throttle speed at begining", 0.0 );
config.addEntry< double >( "final-speed", "This sets speed at destined time", 0.0 );
+ config.addEntry< double >( "speed-increment-until-h-throttle", "This sets time until input speed will rose for horizontal throttle", -0.1 );
+ config.addEntry< double >( "start-speed-h-throttle", "This sets throttle speed at begining for horizontal throttle", 0.0 );
+ config.addEntry< double >( "final-speed-h-throttle", "This sets speed at destined time for horizontal throttle", 0.0 );
config.addEntry< double >( "cavity-speed", "This sets speed parameter of cavity", 0.0 );
typedef Meshes::Grid< 3 > Mesh;
LaxFridrichs< Mesh >::configSetup( config, "inviscid-operators-" );
diff --git a/src/Examples/flows/navierStokesAUSMPlus.h b/src/Examples/flows/navierStokesAUSMPlus.h
index a99e078944..9330335413 100644
--- a/src/Examples/flows/navierStokesAUSMPlus.h
+++ b/src/Examples/flows/navierStokesAUSMPlus.h
@@ -52,6 +52,9 @@ template< typename ConfigTag >class navierStokesConfig
config.addEntry< double >( "speed-increment-until", "This sets time until input speed will rose", -0.1 );
config.addEntry< double >( "start-speed", "This sets throttle speed at begining", 0.0 );
config.addEntry< double >( "final-speed", "This sets speed at destined time", 0.0 );
+ config.addEntry< double >( "speed-increment-until-h-throttle", "This sets time until input speed will rose for horizontal throttle", -0.1 );
+ config.addEntry< double >( "start-speed-h-throttle", "This sets throttle speed at begining for horizontal throttle", 0.0 );
+ config.addEntry< double >( "final-speed-h-throttle", "This sets speed at destined time for horizontal throttle", 0.0 );
config.addEntry< double >( "cavity-speed", "This sets speed parameter of cavity", 0.0 );
typedef Meshes::Grid< 3 > Mesh;
AUSMPlus< Mesh >::configSetup( config, "inviscid-operators-" );
diff --git a/src/Examples/flows/navierStokesLaxFriedrichs.h b/src/Examples/flows/navierStokesLaxFriedrichs.h
index ec2207f1b6..6aabedd7d6 100644
--- a/src/Examples/flows/navierStokesLaxFriedrichs.h
+++ b/src/Examples/flows/navierStokesLaxFriedrichs.h
@@ -52,6 +52,9 @@ template< typename ConfigTag >class navierStokesConfig
config.addEntry< double >( "speed-increment-until", "This sets time until input speed will rose", -0.1 );
config.addEntry< double >( "start-speed", "This sets throttle speed at begining", 0.0 );
config.addEntry< double >( "final-speed", "This sets speed at destined time", 0.0 );
+ config.addEntry< double >( "speed-increment-until-h-throttle", "This sets time until input speed will rose for horizontal throttle", -0.1 );
+ config.addEntry< double >( "start-speed-h-throttle", "This sets throttle speed at begining for horizontal throttle", 0.0 );
+ config.addEntry< double >( "final-speed-h-throttle", "This sets speed at destined time for horizontal throttle", 0.0 );
config.addEntry< double >( "cavity-speed", "This sets speed parameter of cavity", 0.0 );
typedef Meshes::Grid< 3 > Mesh;
LaxFridrichs< Mesh >::configSetup( config, "inviscid-operators-" );
diff --git a/src/Examples/flows/navierStokesProblem.h b/src/Examples/flows/navierStokesProblem.h
index 14ccdeb82f..7fed439bf8 100644
--- a/src/Examples/flows/navierStokesProblem.h
+++ b/src/Examples/flows/navierStokesProblem.h
@@ -126,7 +126,10 @@ class navierStokesProblem:
RealType cavitySpeed;
RealType speedIncrementUntil;
RealType finalSpeed;
- RealType startSpeed;
+ RealType startSpeed;
+ RealType speedIncrementUntilHThrottle;
+ RealType finalSpeedHThrottle;
+ RealType startSpeedHThrottle;
};
} // namespace TNL
diff --git a/src/Examples/flows/navierStokesProblem_impl.h b/src/Examples/flows/navierStokesProblem_impl.h
index 48b8ce5cb9..503802aeec 100644
--- a/src/Examples/flows/navierStokesProblem_impl.h
+++ b/src/Examples/flows/navierStokesProblem_impl.h
@@ -80,6 +80,10 @@ setup( const Config::ParameterContainer& parameters,
this->gamma = parameters.getParameter< double >( "gamma" );
this->startSpeed = parameters.getParameter< double >( "start-speed" );
this->finalSpeed = parameters.getParameter< double >( "final-speed" );
+ this->speedIncrementUntil = parameters.getParameter< RealType >( "speed-increment-until" );
+ this->startSpeedHThrottle = parameters.getParameter< double >( "start-speed-h-throttle" );
+ this->finalSpeedHThrottle = parameters.getParameter< double >( "final-speed-h-throttle" );
+ this->speedIncrementUntilHThrottle = parameters.getParameter< RealType >( "speed-increment-until-h-throttle" );
velocity->setMesh( this->getMesh() );
pressure->setMesh( this->getMesh() );
@@ -354,7 +358,7 @@ applyBoundaryConditions( const RealType& time,
this->boundaryConditionPointer->setGamma(this->gamma);
this->boundaryConditionPointer->setPressure(this->pressure);
this->boundaryConditionPointer->setVerticalThrottleSpeed( startSpeed, finalSpeed, time, speedIncrementUntil );
- this->boundaryConditionPointer->setHorizontalThrottleSpeed( startSpeed, finalSpeed, time, speedIncrementUntil );
+ this->boundaryConditionPointer->setHorizontalThrottleSpeed( startSpeedHThrottle, finalSpeedHThrottle, time, speedIncrementUntilHThrottle );
/****
* Bind DOFs
*/
diff --git a/src/Examples/flows/navierStokesStegerWarming.h b/src/Examples/flows/navierStokesStegerWarming.h
index 230f89ed10..f7a1df06a7 100644
--- a/src/Examples/flows/navierStokesStegerWarming.h
+++ b/src/Examples/flows/navierStokesStegerWarming.h
@@ -52,6 +52,9 @@ template< typename ConfigTag >class navierStokesConfig
config.addEntry< double >( "speed-increment-until", "This sets time until input speed will rose", -0.1 );
config.addEntry< double >( "start-speed", "This sets throttle speed at begining", 0.0 );
config.addEntry< double >( "final-speed", "This sets speed at destined time", 0.0 );
+ config.addEntry< double >( "speed-increment-until-h-throttle", "This sets time until input speed will rose for horizontal throttle", -0.1 );
+ config.addEntry< double >( "start-speed-h-throttle", "This sets throttle speed at begining for horizontal throttle", 0.0 );
+ config.addEntry< double >( "final-speed-h-throttle", "This sets speed at destined time for horizontal throttle", 0.0 );
config.addEntry< double >( "cavity-speed", "This sets speed parameter of cavity", 0.0 );
typedef Meshes::Grid< 3 > Mesh;
StegerWarming< Mesh >::configSetup( config, "inviscid-operators-" );
diff --git a/src/Examples/flows/navierStokesVanLeer.h b/src/Examples/flows/navierStokesVanLeer.h
index 379be8d3fb..ed6c73714e 100644
--- a/src/Examples/flows/navierStokesVanLeer.h
+++ b/src/Examples/flows/navierStokesVanLeer.h
@@ -52,6 +52,9 @@ template< typename ConfigTag >class navierStokesConfig
config.addEntry< double >( "speed-increment-until", "This sets time until input speed will rose", -0.1 );
config.addEntry< double >( "start-speed", "This sets throttle speed at begining", 0.0 );
config.addEntry< double >( "final-speed", "This sets speed at destined time", 0.0 );
+ config.addEntry< double >( "speed-increment-until-h-throttle", "This sets time until input speed will rose for horizontal throttle", -0.1 );
+ config.addEntry< double >( "start-speed-h-throttle", "This sets throttle speed at begining for horizontal throttle", 0.0 );
+ config.addEntry< double >( "final-speed-h-throttle", "This sets speed at destined time for horizontal throttle", 0.0 );
config.addEntry< double >( "cavity-speed", "This sets speed parameter of cavity", 0.0 );
typedef Meshes::Grid< 3 > Mesh;
VanLeer< Mesh >::configSetup( config, "inviscid-operators-" );
--
GitLab