Commit 64eb38a3 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Merge branch 'JK/solvers' into 'develop' 

JK/solvers

Closes #93

See merge request !113
parents a234f9e5 38c38c0f

src/Examples/flow-sw/RiemannProblemInitialCondition.h

+145 −145
Original line number Diff line number Diff line
@@ -781,60 +781,60 @@ class RiemannProblemInitialCondition 
      static void configSetup( Config::ConfigDescription& config,

                               const String& prefix = "" )

      {

         config.addEntry< double >( prefix + "discontinuity-placement-0", "x-coordinate of the discontinuity placement.", 0.5 );

         config.addEntry< double >( prefix + "discontinuity-placement-1", "y-coordinate of the discontinuity placement.", 0.5 );

         config.addEntry< double >( prefix + "discontinuity-placement-2", "z-coordinate of the discontinuity placement.", 0.5 );

         config.addEntry< double >( prefix + "discontinuity-placement-x", "x-coordinate of the discontinuity placement.", 0.5 );

         config.addEntry< double >( prefix + "discontinuity-placement-y", "y-coordinate of the discontinuity placement.", 0.5 );

         config.addEntry< double >( prefix + "discontinuity-placement-z", "z-coordinate of the discontinuity placement.", 0.5 );

/*

         config.addEntry< double >( prefix + "left-density", "Density on the left side of the discontinuity.", 1.0 );

         config.addEntry< double >( prefix + "right-density", "Density on the right side of the discontinuity.", 0.0 );

         config.addEntry< double >( prefix + "left-velocity-0", "x-coordinate of the velocity on the left side of the discontinuity.", 1.0 );

         config.addEntry< double >( prefix + "left-velocity-1", "y-coordinate of the velocity on the left side of the discontinuity.", 1.0 );

         config.addEntry< double >( prefix + "left-velocity-2", "z-coordinate of the velocity on the left side of the discontinuity.", 1.0 );

         config.addEntry< double >( prefix + "right-velocity-0", "x-coordinate of the velocity on the right side of the discontinuity.", 0.0 );

         config.addEntry< double >( prefix + "right-velocity-1", "y-coordinate of the velocity on the right side of the discontinuity.", 0.0 );

         config.addEntry< double >( prefix + "right-velocity-2", "z-coordinate of the velocity on the right side of the discontinuity.", 0.0 );

         config.addEntry< double >( prefix + "left-velocity-x", "x-coordinate of the velocity on the left side of the discontinuity.", 1.0 );

         config.addEntry< double >( prefix + "left-velocity-y", "y-coordinate of the velocity on the left side of the discontinuity.", 1.0 );

         config.addEntry< double >( prefix + "left-velocity-z", "z-coordinate of the velocity on the left side of the discontinuity.", 1.0 );

         config.addEntry< double >( prefix + "right-velocity-x", "x-coordinate of the velocity on the right side of the discontinuity.", 0.0 );

         config.addEntry< double >( prefix + "right-velocity-y", "y-coordinate of the velocity on the right side of the discontinuity.", 0.0 );

         config.addEntry< double >( prefix + "right-velocity-z", "z-coordinate of the velocity on the right side of the discontinuity.", 0.0 );

         config.addEntry< double >( prefix + "left-pressure", "Pressure on the left side of the discontinuity.", 1.0 );

         config.addEntry< double >( prefix + "right-pressure", "Pressure on the right side of the discontinuity.", 0.0 );

*/

         config.addEntry< double >( prefix + "NWU-density", "This sets a value of northwest up density.", 1.0  );

         config.addEntry< double >( prefix + "NWU-velocity-0", "This sets a value of northwest up x velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWU-velocity-1", "This sets a value of northwest up y velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWU-velocity-2", "This sets a value of northwest up z velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWU-velocity-x", "This sets a value of northwest up x velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWU-velocity-y", "This sets a value of northwest up y velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWU-velocity-z", "This sets a value of northwest up z velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWU-pressure", "This sets a value of northwest up pressure.", 1.0  );

         config.addEntry< double >( prefix + "SWU-density", "This sets a value of southwest up density.", 1.0  );

         config.addEntry< double >( prefix + "SWU-velocity-0", "This sets a value of southwest up x velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWU-velocity-1", "This sets a value of southwest up y velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWU-velocity-2", "This sets a value of southwest up z velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWU-velocity-x", "This sets a value of southwest up x velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWU-velocity-y", "This sets a value of southwest up y velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWU-velocity-z", "This sets a value of southwest up z velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWU-pressure", "This sets a value of southwest up pressure.", 1.0  );

         config.addEntry< double >( prefix + "NWD-density", "This sets a value of northwest down density.", 1.0  );

         config.addEntry< double >( prefix + "NWD-velocity-0", "This sets a value of northwest down x velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWD-velocity-1", "This sets a value of northwest down y velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWD-velocity-2", "This sets a value of northwest down z velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWD-velocity-x", "This sets a value of northwest down x velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWD-velocity-y", "This sets a value of northwest down y velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWD-velocity-z", "This sets a value of northwest down z velocity.", 1.0  );

         config.addEntry< double >( prefix + "NWD-pressure", "This sets a value of northwest down pressure.", 1.0  );

         config.addEntry< double >( prefix + "SWD-density", "This sets a value of southwest down density.", 1.0  );

         config.addEntry< double >( prefix + "SWD-velocity-0", "This sets a value of southwest down x velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWD-velocity-1", "This sets a value of southwest down y velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWD-velocity-2", "This sets a value of southwest down z velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWD-velocity-x", "This sets a value of southwest down x velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWD-velocity-y", "This sets a value of southwest down y velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWD-velocity-z", "This sets a value of southwest down z velocity.", 1.0  );

         config.addEntry< double >( prefix + "SWD-pressure", "This sets a value of southwest down pressure.", 1.0  );

         config.addEntry< double >( prefix + "NEU-density", "This sets a value of northeast up density.", 1.0  );

         config.addEntry< double >( prefix + "NEU-velocity-0", "This sets a value of northeast up x velocity.", 1.0  );

         config.addEntry< double >( prefix + "NEU-velocity-1", "This sets a value of northeast up y velocity.", 1.0  );

         config.addEntry< double >( prefix + "NEU-velocity-2", "This sets a value of northeast up z velocity.", 1.0  );

         config.addEntry< double >( prefix + "NEU-velocity-x", "This sets a value of northeast up x velocity.", 1.0  );

         config.addEntry< double >( prefix + "NEU-velocity-y", "This sets a value of northeast up y velocity.", 1.0  );

         config.addEntry< double >( prefix + "NEU-velocity-z", "This sets a value of northeast up z velocity.", 1.0  );

         config.addEntry< double >( prefix + "NEU-pressure", "This sets a value of northeast up pressure.", 1.0  );

         config.addEntry< double >( prefix + "SEU-density", "This sets a value of southeast up density.", 1.0  );

         config.addEntry< double >( prefix + "SEU-velocity-0", "This sets a value of southeast up x velocity.", 1.0  );

         config.addEntry< double >( prefix + "SEU-velocity-1", "This sets a value of southeast up y velocity.", 1.0  );

         config.addEntry< double >( prefix + "SEU-velocity-2", "This sets a value of southeast up z velocity.", 1.0  );

         config.addEntry< double >( prefix + "SEU-velocity-x", "This sets a value of southeast up x velocity.", 1.0  );

         config.addEntry< double >( prefix + "SEU-velocity-y", "This sets a value of southeast up y velocity.", 1.0  );

         config.addEntry< double >( prefix + "SEU-velocity-z", "This sets a value of southeast up z velocity.", 1.0  );

         config.addEntry< double >( prefix + "SEU-pressure", "This sets a value of southeast up pressure.", 1.0  );

         config.addEntry< double >( prefix + "NED-density", "This sets a value of northeast down density.", 1.0  );

         config.addEntry< double >( prefix + "NED-velocity-0", "This sets a value of northeast down x velocity.", 1.0  );

         config.addEntry< double >( prefix + "NED-velocity-1", "This sets a value of northeast down y velocity.", 1.0  );

         config.addEntry< double >( prefix + "NED-velocity-2", "This sets a value of northeast down z velocity.", 1.0  );

         config.addEntry< double >( prefix + "NED-velocity-x", "This sets a value of northeast down x velocity.", 1.0  );

         config.addEntry< double >( prefix + "NED-velocity-y", "This sets a value of northeast down y velocity.", 1.0  );

         config.addEntry< double >( prefix + "NED-velocity-z", "This sets a value of northeast down z velocity.", 1.0  );

         config.addEntry< double >( prefix + "NED-pressure", "This sets a value of northeast down pressure.", 1.0  );

         config.addEntry< double >( prefix + "SED-density", "This sets a value of southeast down density.", 1.0  );

         config.addEntry< double >( prefix + "SED-velocity-0", "This sets a value of southeast down x velocity.", 1.0  );

         config.addEntry< double >( prefix + "SED-velocity-1", "This sets a value of southeast down y velocity.", 1.0  );

         config.addEntry< double >( prefix + "SED-velocity-2", "This sets a value of southeast down z velocity.", 1.0  );

         config.addEntry< double >( prefix + "SED-velocity-x", "This sets a value of southeast down x velocity.", 1.0  );

         config.addEntry< double >( prefix + "SED-velocity-y", "This sets a value of southeast down y velocity.", 1.0  );

         config.addEntry< double >( prefix + "SED-velocity-z", "This sets a value of southeast down z velocity.", 1.0  );

         config.addEntry< double >( prefix + "SED-pressure", "This sets a value of southeast down pressure.", 1.0  );

         config.addEntry< double >( prefix + "gamma", "Gamma in the ideal gas state equation.", 1.4 );
@@ -861,11 +861,11 @@ class RiemannProblemInitialCondition 
         String initial = parameters.getParameter< String >( prefix + "initial" );

         if(initial == prefix + "none")

            {

               this->discontinuityPlacement.setup( parameters, prefix + "discontinuity-placement-" );

               this->discontinuityPlacement = parameters.getXyz< PointType >( prefix + "discontinuity-placement" );

               this->gamma = parameters.getParameter< double >( prefix + "gamma" );

/*

               this->leftVelocity.setup( parameters, prefix + "left-velocity-" );

               this->rightVelocity.setup( parameters, prefix + "right-velocity-" );

               this->leftVelocity = parameters.getXyz< PointType >( prefix + "left-velocity" );

               this->rightVelocity = parameters.getXyz< PointType >( prefix + "right-velocity" );

               this->leftDensity = parameters.getParameter< double >( prefix + "left-density" );

               this->rightDensity = parameters.getParameter< double >( prefix + "right-density" );

               this->leftPressure = parameters.getParameter< double >( prefix + "left-pressure" );
@@ -873,49 +873,49 @@ class RiemannProblemInitialCondition 
*/



               this->NWUDensity = parameters.getParameter< RealType >( prefix + "NWU-density" );

               this->NWUVelocity.setup( parameters, prefix + "NWU-velocity-" );

               this->NWUVelocity = parameters.getXyz< PointType >( prefix + "NWU-velocity" );

               this->NWUPressure = parameters.getParameter< RealType >( prefix + "NWU-pressure" );

               this->NWUEnergy = Energy( NWUDensity, NWUPressure, gamma, NWUVelocity);

               this->NWUMomentum = NWUVelocity * NWUDensity;



               this->SWUDensity = parameters.getParameter< RealType >( prefix + "SWU-density" );

               this->SWUVelocity.setup( parameters, prefix + "SWU-velocity-" );

               this->SWUVelocity = parameters.getXyz< PointType >( prefix + "SWU-velocity" );

               this->SWUPressure = parameters.getParameter< RealType >( prefix + "SWU-pressure" );

               this->SWUEnergy = Energy( SWUDensity, SWUPressure, gamma, SWUVelocity);

               this->SWUMomentum = SWUVelocity * SWUDensity;



               this->NWDDensity = parameters.getParameter< RealType >( prefix + "NWD-density" );

               this->NWDVelocity.setup( parameters, prefix + "NWD-velocity-" );

               this->NWDVelocity = parameters.getXyz< PointType >( prefix + "NWD-velocity" );

               this->NWDPressure = parameters.getParameter< RealType >( prefix + "NWD-pressure" );

               this->NWDEnergy = Energy( NWDDensity, NWDPressure, gamma, NWDVelocity);

               this->NWDMomentum = NWDVelocity * NWDDensity;



               this->SWDDensity = parameters.getParameter< RealType >( prefix + "SWD-density" );

               this->SWDVelocity.setup( parameters, prefix + "SWD-velocity-" );

               this->SWDVelocity = parameters.getXyz< PointType >( prefix + "SWD-velocity" );

               this->SWDPressure = parameters.getParameter< RealType >( prefix + "SWD-pressure" );

               this->SWDEnergy = Energy( SWDDensity, SWDPressure, gamma, SWDVelocity);

               this->SWDMomentum = SWDVelocity * SWDDensity;



               this->NEUDensity = parameters.getParameter< RealType >( prefix + "NEU-density" );

               this->NEUVelocity.setup( parameters, prefix + "NEU-velocity-" );

               this->NEUVelocity = parameters.getXyz< PointType >( prefix + "NEU-velocity" );

               this->NEUPressure = parameters.getParameter< RealType >( prefix + "NEU-pressure" );

               this->NEUEnergy = Energy( NEUDensity, NEUPressure, gamma, NEUVelocity);

               this->NEUMomentum = NEUVelocity * NEUDensity;



               this->SEUDensity = parameters.getParameter< RealType >( prefix + "SEU-density" );

               this->SEUVelocity.setup( parameters, prefix + "SEU-velocity-" );

               this->SEUVelocity = parameters.getXyz< PointType >( prefix + "SEU-velocity" );

               this->SEUPressure = parameters.getParameter< RealType >( prefix + "SEU-pressure" );

               this->SEUEnergy = Energy( SEUDensity, SEUPressure, gamma, SEUVelocity);

               this->SEUMomentum = SEUVelocity * SEUDensity;



               this->NEDDensity = parameters.getParameter< RealType >( prefix + "NED-density" );

               this->NEDVelocity.setup(parameters, prefix + "NED-velocity-" );

               this->NEDVelocity = parameters.getXyz< PointType >( prefix + "NED-velocity" );

               this->NEDPressure = parameters.getParameter< RealType >( prefix + "NED-pressure" );

               this->NEDEnergy = Energy( NEDDensity, NEDPressure, gamma, NEDVelocity);

               this->NEDMomentum = NEDVelocity * NEDDensity;



               this->SEDDensity = parameters.getParameter< RealType >( prefix + "SED-density" );

               this->SEDVelocity.setup( parameters, prefix + "SED-velocity-" );

               this->SEDVelocity = parameters.getXyz< PointType >( prefix + "SED-velocity" );

               this->SEDPressure = parameters.getParameter< RealType >( prefix + "SED-pressure" );

               this->SEDEnergy = Energy( SEDDensity, SEDPressure, gamma, SEDVelocity);

               this->SEDMomentum = SEDVelocity * SEDDensity;

src/Examples/flow-vl/RiemannProblemInitialCondition.h

+145 −145

File changed.

Preview size limit exceeded, changes collapsed.

src/Examples/flow/RiemannProblemInitialCondition.h

+145 −145

File changed.

Preview size limit exceeded, changes collapsed.

src/Examples/inviscid-flow-sw/RiemannProblemInitialCondition.h

+145 −145

File changed.

Preview size limit exceeded, changes collapsed.

src/Examples/inviscid-flow-vl/RiemannProblemInitialCondition.h

+145 −145

File changed.

Preview size limit exceeded, changes collapsed.