Permalink
Browse files

Merge commit '3426f195e29f5fa3e3a4968310ee1afc151f3251' into develop

  • Loading branch information...
jbakosi committed Oct 10, 2018
2 parents 764259f + 3426f19 commit bab36f50daab087c45e0dc38b1742337962409c5
Showing with 1,448 additions and 498 deletions.
  1. +13 −3 regression/inciter/compflow/Euler/NLEnergyGrowth/CMakeLists.txt
  2. +11 −4 regression/inciter/compflow/Euler/RayleighTaylor/CMakeLists.txt
  3. +1 −1 regression/inciter/compflow/Euler/SodShocktube/CMakeLists.txt
  4. +13 −3 regression/inciter/compflow/Euler/TaylorGreen/CMakeLists.txt
  5. +63 −14 regression/inciter/compflow/Euler/VorticalFlow/CMakeLists.txt
  6. +37 −37 regression/inciter/mesh_refinement/initial/CMakeLists.txt
  7. +1 −0 regression/inciter/mesh_refinement/initial/slot_cyl_amr.q
  8. +1 −0 regression/inciter/mesh_refinement/initial/slot_cyl_amr_diagcg.q
  9. +1 −0 regression/inciter/mesh_refinement/initial/slot_cyl_amr_diagcg_uniform2steps.q
  10. +1 −0 regression/inciter/mesh_refinement/initial/slot_cyl_amr_reord_diagcg.q
  11. +1 −0 regression/inciter/mesh_refinement/initial/slot_cyl_amr_uniform2steps.q
  12. +1 −0 regression/inciter/mesh_refinement/initial/vortical_flow_dg.q
  13. +1 −0 regression/inciter/mesh_refinement/initial/vortical_flow_reord_dg.q
  14. +53 −19 regression/inciter/transport/GaussHump/CMakeLists.txt
  15. +17 −7 regression/inciter/transport/ShearDiff/CMakeLists.txt
  16. +79 −39 regression/inciter/transport/SlotCyl/cfl/CMakeLists.txt
  17. +16 −16 regression/inciter/transport/SlotCyl/fct/CMakeLists.txt
  18. +6 −8 src/Base/ContainerUtil.h
  19. +1 −0 src/CMakeLists.txt
  20. +16 −2 src/Control/CommonGrammar.h
  21. +26 −11 src/Control/Inciter/InputDeck/Grammar.h
  22. +6 −1 src/Control/Inciter/InputDeck/InputDeck.h
  23. +3 −1 src/Control/Inciter/Types.h
  24. +60 −2 src/Control/Keywords.h
  25. +3 −1 src/Control/Tags.h
  26. +64 −18 src/Inciter/DG.C
  27. +17 −3 src/Inciter/DG.h
  28. +166 −37 src/Inciter/DiagCG.C
  29. +31 −3 src/Inciter/DiagCG.h
  30. +88 −28 src/Inciter/Discretization.C
  31. +29 −20 src/Inciter/Discretization.h
  32. +54 −8 src/Inciter/DistFCT.C
  33. +16 −11 src/Inciter/DistFCT.h
  34. +5 −0 src/Inciter/FluxCorrector.h
  35. +65 −19 src/Inciter/MatCG.C
  36. +17 −3 src/Inciter/MatCG.h
  37. +105 −31 src/Inciter/Refiner.C
  38. +49 −6 src/Inciter/Refiner.h
  39. +182 −107 src/Inciter/Scheme.h
  40. +1 −1 src/Inciter/SchemeBase.h
  41. +69 −19 src/Inciter/Transporter.C
  42. +13 −1 src/Inciter/Transporter.h
  43. +6 −1 src/Inciter/dg.ci
  44. +8 −3 src/Inciter/diagcg.ci
  45. +6 −1 src/Inciter/matcg.ci
  46. +1 −1 src/Inciter/refiner.ci
  47. +8 −1 src/Inciter/transporter.ci
  48. +9 −7 src/Main/InciterPrint.C
  49. +8 −0 src/Mesh/UnsMesh.h
@@ -9,7 +9,7 @@ add_regression_test(compflow_euler_nleg ${INCITER_EXECUTABLE}
exodiff.cfg nleg.std.exo diag.std
ARGS -c nleg.q -i unitcube_1k.exo -v
BIN_BASELINE nleg.std.exo
BIN_RESULT out.0
BIN_RESULT out.e-s.0.1.0
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag.std
TEXT_RESULT diag
@@ -31,7 +31,10 @@ add_regression_test(compflow_euler_nleg ${INCITER_EXECUTABLE}
nleg_pe4.std.exo.1
nleg_pe4.std.exo.2
nleg_pe4.std.exo.3
BIN_RESULT out.0 out.1 out.2 out.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.std
@@ -62,7 +65,14 @@ add_regression_test(compflow_euler_nleg_u0.5 ${INCITER_EXECUTABLE}
nleg_pe4_u0.5.std.exo.5
nleg_pe4_u0.5.std.exo.6
nleg_pe4_u0.5.std.exo.7
BIN_RESULT out.0 out.1 out.2 out.3 out.4 out.5 out.6 out.7
BIN_RESULT out.e-s.0.8.0
out.e-s.0.8.1
out.e-s.0.8.2
out.e-s.0.8.3
out.e-s.0.8.4
out.e-s.0.8.5
out.e-s.0.8.6
out.e-s.0.8.7
BIN_DIFF_PROG_ARGS -m
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag.std
@@ -9,7 +9,7 @@ add_regression_test(compflow_euler_rayleigh_taylor_st ${INCITER_EXECUTABLE}
exodiff.cfg rayleigh_taylor_st.std.exo
ARGS -c rayleigh_taylor_st.q -i unitcube_1k.exo -v
BIN_BASELINE rayleigh_taylor_st.std.exo
BIN_RESULT out.0
BIN_RESULT out.e-s.0.1.0
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag_st.std
TEXT_RESULT diag
@@ -30,7 +30,10 @@ add_regression_test(compflow_euler_rayleigh_taylor_st ${INCITER_EXECUTABLE}
rayleigh_taylor_st_pe4.std.exo.1
rayleigh_taylor_st_pe4.std.exo.2
rayleigh_taylor_st_pe4.std.exo.3
BIN_RESULT out.0 out.1 out.2 out.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_st.std
@@ -45,7 +48,7 @@ add_regression_test(compflow_euler_rayleigh_taylor ${INCITER_EXECUTABLE}
exodiff.cfg rayleigh_taylor.std.exo
ARGS -c rayleigh_taylor.q -i unitcube_1k.exo -v
BIN_BASELINE rayleigh_taylor.std.exo
BIN_RESULT out.0
BIN_RESULT out.e-s.0.1.0
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag.std
TEXT_RESULT diag
@@ -66,7 +69,11 @@ add_regression_test(compflow_euler_rayleigh_taylor ${INCITER_EXECUTABLE}
rayleigh_taylor_pe4.std.exo.1
rayleigh_taylor_pe4.std.exo.2
rayleigh_taylor_pe4.std.exo.3
BIN_RESULT out.0 out.1 out.2 out.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_ARGS -m
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag.std
@@ -10,7 +10,7 @@ add_regression_test(compflow_euler_sodshocktube_dg ${INCITER_EXECUTABLE}
exodiff_dg.cfg sod_shocktube_dg.std.exo
ARGS -c sod_shocktube_dg.q -i rectangle_01_1.5k.exo -v
BIN_BASELINE sod_shocktube_dg.std.exo
BIN_RESULT out.0
BIN_RESULT out.e-s.0.1.0
BIN_DIFF_PROG_CONF exodiff_dg.cfg
BIN_DIFF_PROG_ARGS -m
TEXT_BASELINE diag_dg.std
@@ -9,7 +9,7 @@ add_regression_test(compflow_euler_taylor_green ${INCITER_EXECUTABLE}
exodiff.cfg taylor_green.std.exo
ARGS -c taylor_green.q -i unitcube_1k.exo -v
BIN_BASELINE taylor_green.std.exo
BIN_RESULT out.0
BIN_RESULT out.e-s.0.1.0
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag.std
TEXT_RESULT diag
@@ -31,7 +31,10 @@ add_regression_test(compflow_euler_taylor_green ${INCITER_EXECUTABLE}
taylor_green_pe4.std.exo.1
taylor_green_pe4.std.exo.2
taylor_green_pe4.std.exo.3
BIN_RESULT out.0 out.1 out.2 out.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.std
@@ -62,7 +65,14 @@ add_regression_test(compflow_euler_taylor_green_u0.5 ${INCITER_EXECUTABLE}
taylor_green_pe4_u0.5.std.exo.5
taylor_green_pe4_u0.5.std.exo.6
taylor_green_pe4_u0.5.std.exo.7
BIN_RESULT out.0 out.1 out.2 out.3 out.4 out.5 out.6 out.7
BIN_RESULT out.e-s.0.8.0
out.e-s.0.8.1
out.e-s.0.8.2
out.e-s.0.8.3
out.e-s.0.8.4
out.e-s.0.8.5
out.e-s.0.8.6
out.e-s.0.8.7
BIN_DIFF_PROG_ARGS -m
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag.std
@@ -9,7 +9,7 @@ add_regression_test(compflow_euler_vorticalflow ${INCITER_EXECUTABLE}
exodiff.cfg vortical_flow.std.exo
ARGS -c vortical_flow.q -i unitcube_1k.exo -v
BIN_BASELINE vortical_flow.std.exo
BIN_RESULT out.0
BIN_RESULT out.e-s.0.1.0
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag.std
TEXT_RESULT diag
@@ -22,7 +22,7 @@ add_regression_test(compflow_euler_vorticalflow_diagcg ${INCITER_EXECUTABLE}
exodiff.cfg vortical_flow_diagcg.std.exo
ARGS -c vortical_flow_diagcg.q -i unitcube_1k.exo -v
BIN_BASELINE vortical_flow_diagcg.std.exo
BIN_RESULT out.0
BIN_RESULT out.e-s.0.1.0
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag_diagcg.std
TEXT_RESULT diag
@@ -35,7 +35,7 @@ add_regression_test(compflow_euler_vorticalflow_dg ${INCITER_EXECUTABLE}
exodiff_dg.cfg vortical_flow_dg.std.exo
ARGS -c vortical_flow_dg.q -i unitcube_1k.exo -v
BIN_BASELINE vortical_flow_dg.std.exo
BIN_RESULT out.0
BIN_RESULT out.e-s.0.1.0
BIN_DIFF_PROG_CONF exodiff_dg.cfg
BIN_DIFF_PROG_ARGS -m
TEXT_BASELINE diag_dg.std
@@ -49,7 +49,7 @@ add_regression_test(compflow_euler_vorticalflow_dg_lf ${INCITER_EXECUTABLE}
exodiff_dg.cfg vortical_flow_dg_lf.std.exo
ARGS -c vortical_flow_dg_lf.q -i unitcube_1k.exo -v
BIN_BASELINE vortical_flow_dg_lf.std.exo
BIN_RESULT out.0
BIN_RESULT out.e-s.0.1.0
BIN_DIFF_PROG_CONF exodiff_dg.cfg
BIN_DIFF_PROG_ARGS -m
TEXT_BASELINE diag_dg_lf.std
@@ -63,7 +63,7 @@ add_regression_test(compflow_euler_vorticalflow_reord_dg ${INCITER_EXECUTABLE}
exodiff_dg.cfg vortical_flow_dg.std.exo
ARGS -c vortical_flow_reord_dg.q -i unitcube_1k.exo -v
BIN_BASELINE vortical_flow_dg.std.exo
BIN_RESULT out.0
BIN_RESULT out.e-s.0.1.0
BIN_DIFF_PROG_CONF exodiff_dg.cfg
BIN_DIFF_PROG_ARGS -m
TEXT_BASELINE diag_dg.std
@@ -86,7 +86,10 @@ add_regression_test(compflow_euler_vorticalflow ${INCITER_EXECUTABLE}
vortical_flow_pe4.std.exo.1
vortical_flow_pe4.std.exo.2
vortical_flow_pe4.std.exo.3
BIN_RESULT out.0 out.1 out.2 out.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.std
@@ -117,7 +120,14 @@ add_regression_test(compflow_euler_vorticalflow_u0.5 ${INCITER_EXECUTABLE}
vortical_flow_pe4_u0.5.std.exo.5
vortical_flow_pe4_u0.5.std.exo.6
vortical_flow_pe4_u0.5.std.exo.7
BIN_RESULT out.0 out.1 out.2 out.3 out.4 out.5 out.6 out.7
BIN_RESULT out.e-s.0.8.0
out.e-s.0.8.1
out.e-s.0.8.2
out.e-s.0.8.3
out.e-s.0.8.4
out.e-s.0.8.5
out.e-s.0.8.6
out.e-s.0.8.7
BIN_DIFF_PROG_ARGS -m
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag.std
@@ -145,7 +155,14 @@ add_regression_test(compflow_euler_vorticalflow_diagcg_u0.5 ${INCITER_EXECUTABLE
vortical_flow_diagcg_pe4_u0.5.std.exo.5
vortical_flow_diagcg_pe4_u0.5.std.exo.6
vortical_flow_diagcg_pe4_u0.5.std.exo.7
BIN_RESULT out.0 out.1 out.2 out.3 out.4 out.5 out.6 out.7
BIN_RESULT out.e-s.0.8.0
out.e-s.0.8.1
out.e-s.0.8.2
out.e-s.0.8.3
out.e-s.0.8.4
out.e-s.0.8.5
out.e-s.0.8.6
out.e-s.0.8.7
BIN_DIFF_PROG_ARGS -m
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag_diagcg.std
@@ -237,12 +254,44 @@ add_regression_test(compflow_euler_vorticalflow_diagcg_u0.9_migr
vortical_flow_diagcg_pe4_u0.9.std.exo.35
vortical_flow_diagcg_pe4_u0.9.std.exo.36
vortical_flow_diagcg_pe4_u0.9.std.exo.37
BIN_RESULT out.0 out.1 out.2 out.3 out.4 out.5 out.6 out.7
out.8 out.9 out.10 out.11 out.12 out.13 out.14
out.15 out.16 out.17 out.18 out.19 out.20 out.21
out.22 out.23 out.24 out.25 out.26 out.27 out.28
out.29 out.30 out.31 out.32 out.33 out.34 out.35
out.36 out.37
BIN_RESULT out.e-s.0.38.0
out.e-s.0.38.1
out.e-s.0.38.2
out.e-s.0.38.3
out.e-s.0.38.4
out.e-s.0.38.5
out.e-s.0.38.6
out.e-s.0.38.7
out.e-s.0.38.8
out.e-s.0.38.9
out.e-s.0.38.10
out.e-s.0.38.11
out.e-s.0.38.12
out.e-s.0.38.13
out.e-s.0.38.14
out.e-s.0.38.15
out.e-s.0.38.16
out.e-s.0.38.17
out.e-s.0.38.18
out.e-s.0.38.19
out.e-s.0.38.20
out.e-s.0.38.21
out.e-s.0.38.22
out.e-s.0.38.23
out.e-s.0.38.24
out.e-s.0.38.25
out.e-s.0.38.26
out.e-s.0.38.27
out.e-s.0.38.28
out.e-s.0.38.29
out.e-s.0.38.30
out.e-s.0.38.31
out.e-s.0.38.32
out.e-s.0.38.33
out.e-s.0.38.34
out.e-s.0.38.35
out.e-s.0.38.36
out.e-s.0.38.37
BIN_DIFF_PROG_ARGS -m -q
BIN_DIFF_PROG_CONF exodiff.cfg
TEXT_BASELINE diag_diagcg.std
Oops, something went wrong.

0 comments on commit bab36f5

Please sign in to comment.