Permalink
Browse files

Merge branch 'sedov' into develop

  • Loading branch information...
jbakosi committed Nov 30, 2018
2 parents 4b28f42 + e11576a commit 269e142ea3f79879a492fac4e4b23201ed4001af
@@ -245,6 +245,7 @@ function(ADD_REGRESSION_TEST test_name executable)
foreach(file ${ARG_INPUTFILES})
list(APPEND reqfiles "${CMAKE_CURRENT_SOURCE_DIR}/${file}")
endforeach()
list(APPEND reqfiles "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_TEXT_DIFF_PROG_CONF}")
# Softlink files required to build directory
foreach(target ${reqfiles})
@@ -1,4 +1,4 @@
#rows cols constraints
* 1 # iteration count: no constraint: smallest representable float
* 2-8 rel=1.0e-7 # tolerance for t, dt, and L2 of conserved variables
* 9-$ rel=1.0e-7 # tolerance for L2 errors
* 1 # iteration count: no constraint: smallest representable float
* 2-8 any abs=1.0e-12 rel=1.0e-7 # tolerance for t, dt, and L2 of conserved variables
* 9-$ any abs=1.0e-12 rel=1.0e-7 # tolerance for L2 errors
@@ -28,3 +28,26 @@ add_regression_test(cyl_advect_dgp1 ${INCITER_EXECUTABLE}
TEXT_BASELINE diag_dgp1.std
TEXT_RESULT diag
TEXT_DIFF_PROG_CONF cyl_advect_diag.ndiff.cfg)
add_regression_test(cyl_advect_dgp1 ${INCITER_EXECUTABLE}
NUMPES 4
INPUTFILES cyl_advect_dgp1.q unitsquare_01_3.6k.exo diag_dgp1.std
exodiff.cfg
cyl_advect_dgp1_pe4_u0.0.std.exo.0
cyl_advect_dgp1_pe4_u0.0.std.exo.1
cyl_advect_dgp1_pe4_u0.0.std.exo.2
cyl_advect_dgp1_pe4_u0.0.std.exo.3
ARGS -c cyl_advect_dgp1.q -i unitsquare_01_3.6k.exo -v
BIN_BASELINE cyl_advect_dgp1_pe4_u0.0.std.exo.0
cyl_advect_dgp1_pe4_u0.0.std.exo.1
cyl_advect_dgp1_pe4_u0.0.std.exo.2
cyl_advect_dgp1_pe4_u0.0.std.exo.3
BIN_RESULT out.e-s.0.4.0
out.e-s.0.4.1
out.e-s.0.4.2
out.e-s.0.4.3
BIN_DIFF_PROG_ARGS -m
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag_dgp1.std
TEXT_RESULT diag
TEXT_DIFF_PROG_CONF cyl_advect_diag.ndiff.cfg)
@@ -1,3 +1,3 @@
#rows cols constraints
* 1 # iteration count: no constraint: smallest representable float
* 2-$ rel=1.0e-7 # tolerance for t, dt, and L2 of conserved variables
* 1 # iteration count: no constraint: smallest representable float
* 2-$ any abs=1.0e-12 rel=1.0e-7 # tolerance for t, dt, and L2 of conserved variables
@@ -1,5 +1,5 @@
COORDINATES absolute 1.0e-6
TIME STEPS absolute 1.0e-8
ELEMENT VARIABLES relative 1.0e-7 floor 1.0e-9
ELEMENT VARIABLES relative 1.0e-6 floor 1.0e-9
c0_numerical
c0_analytic
@@ -160,7 +160,8 @@ class InputDeck :
kw::bc_extrapolate,
kw::gauss_hump,
kw::cyl_advect,
kw::sod_shocktube >;
kw::sod_shocktube,
kw::sedov_blastwave >;
//! \brief Constructor: set defaults
//! \param[in] cl Previously parsed and store command line
@@ -29,7 +29,8 @@ enum class ProblemType : uint8_t { USER_DEFINED=0,
SLOT_CYL,
GAUSS_HUMP,
CYL_ADVECT,
SOD_SHOCKTUBE };
SOD_SHOCKTUBE,
SEDOV_BLASTWAVE };
//! Pack/Unpack ProblemType: forward overload to generic enum class packer
inline void operator|( PUP::er& p, ProblemType& e ) { PUP::pup( p, e ); }
@@ -49,6 +50,7 @@ class Problem : public tk::Toggle< ProblemType > {
, kw::gauss_hump
, kw::cyl_advect
, kw::sod_shocktube
, kw::sedov_blastwave
>;
//! \brief Options constructor
@@ -68,7 +70,8 @@ class Problem : public tk::Toggle< ProblemType > {
{ ProblemType::SLOT_CYL, kw::slot_cyl::name() },
{ ProblemType::GAUSS_HUMP, kw::gauss_hump::name() },
{ ProblemType::CYL_ADVECT, kw::cyl_advect::name() },
{ ProblemType::SOD_SHOCKTUBE, kw::sod_shocktube::name() } },
{ ProblemType::SOD_SHOCKTUBE, kw::sod_shocktube::name() },
{ ProblemType::SEDOV_BLASTWAVE, kw::sedov_blastwave::name() } },
//! keywords -> Enums
{ { kw::user_defined::string(), ProblemType::USER_DEFINED },
{ kw::shear_diff::string(), ProblemType::SHEAR_DIFF },
@@ -79,7 +82,8 @@ class Problem : public tk::Toggle< ProblemType > {
{ kw::slot_cyl::string(), ProblemType::SLOT_CYL },
{ kw::gauss_hump::string(), ProblemType::GAUSS_HUMP },
{ kw::cyl_advect::string(), ProblemType::CYL_ADVECT },
{ kw::sod_shocktube::string(), ProblemType::SOD_SHOCKTUBE } } )
{ kw::sod_shocktube::string(), ProblemType::SOD_SHOCKTUBE },
{ kw::sedov_blastwave::string(), ProblemType::SEDOV_BLASTWAVE } } )
{
brigand::for_each< keywords >( assertPolicyCodes() );
}
@@ -119,6 +123,7 @@ class Problem : public tk::Toggle< ProblemType > {
, { ProblemType::GAUSS_HUMP, *kw::gauss_hump::code() }
, { ProblemType::CYL_ADVECT, *kw::cyl_advect::code() }
, { ProblemType::SOD_SHOCKTUBE, *kw::sod_shocktube::code() }
, { ProblemType::SEDOV_BLASTWAVE, *kw::sedov_blastwave::code() }
};
};
@@ -3691,6 +3691,23 @@ struct sod_shocktube_info {
using sod_shocktube =
keyword< sod_shocktube_info, TAOCPP_PEGTL_STRING("sod_shocktube") >;
struct sedov_blastwave_info {
using code = Code< B >;
static std::string name() { return "Sedov blast-wave"; }
static std::string shortDescription() { return
"Select the Sedov blast-wave test problem "; }
static std::string longDescription() { return
R"(This keyword is used to select the Sedov blast-wave test problem. The
purpose of this test problem is to test the correctness of the
approximate Riemann solver and its strong shock and interface capturing
capabilities. Example: "problem sedov_blastwave".)"; }
struct expect {
static std::string description() { return "string"; }
};
};
using sedov_blastwave =
keyword< sedov_blastwave_info, TAOCPP_PEGTL_STRING("sedov_blastwave") >;
struct problem_info {
using code = Code< r >;
static std::string name() { return "Test problem"; }
Oops, something went wrong.

0 comments on commit 269e142

Please sign in to comment.