From a61b6666675c08227eb5d35810ae4c43f091816e Mon Sep 17 00:00:00 2001 From: Alexander Nikolas Breuer Date: Mon, 1 Feb 2021 21:02:38 +0100 Subject: [PATCH] Added missing reorder-only tests to plane waves 3d configs. --- .../wp/plane_waves_3d/configs/gen.tar.xz | 4 +- .../wp/plane_waves_3d/configs/gen_configs.js | 42 ++++++++++++------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/bench/seismic/wp/plane_waves_3d/configs/gen.tar.xz b/bench/seismic/wp/plane_waves_3d/configs/gen.tar.xz index 6a10887..1a9f6ac 100644 --- a/bench/seismic/wp/plane_waves_3d/configs/gen.tar.xz +++ b/bench/seismic/wp/plane_waves_3d/configs/gen.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68477691780f52f267286a5d0651bae2b6c432cf26d4decfe54b0bd122e4c187 -size 3380 +oid sha256:23d57b3f304f1272775bb8249f4d39562b00f86b36125a1b6dd8486a9d4b80b6 +size 3732 diff --git a/bench/seismic/wp/plane_waves_3d/configs/gen_configs.js b/bench/seismic/wp/plane_waves_3d/configs/gen_configs.js index 2813365..a649ee7 100755 --- a/bench/seismic/wp/plane_waves_3d/configs/gen_configs.js +++ b/bench/seismic/wp/plane_waves_3d/configs/gen_configs.js @@ -35,26 +35,36 @@ var l_parts = [1, 8]; for( var l_cl = 0; l_cl < l_cls.length; l_cl++ ) { for( var l_ty = 0; l_ty < l_base.length; l_ty++ ) { for( var l_pa = 0; l_pa < l_parts.length; l_pa++ ) { - console.log( 'generating config for char length / type / part:', l_cls[l_cl], '/', l_base[l_ty], '/', l_parts[l_pa] ); + for( var l_ro = 0; l_ro < 2; l_ro++ ) { + var l_id = l_base[l_ty] + '_cl_' + l_cls[l_cl] + '_pa_' + l_parts[l_pa]; + // create reorder-only mesh for parallel configs + if( l_base[l_ty] == 'gts' && l_parts[l_pa] != 1 && l_ro == 1 ) { + l_id = l_id + '_reorder_only'; + } + else if( l_ro == 1 ) { + continue; + } + console.log( 'generating config for char length / type / part / reorder only:', l_cls[l_cl], '/', l_base[l_ty], '/', l_parts[l_pa] ), '/', l_ro; - var l_meshBase = 'meshes/gen/edge_v/' + l_base[l_ty] + '_cl_' + l_cls[l_cl] + '_pa_' + l_parts[l_pa]; - var l_meshExt = '.msh'; - var l_config = 'gen/' + l_base[l_ty] + '_cl_' + l_cls[l_cl] + '_pa_' + l_parts[l_pa] + '.xml'; - l_fs.outputFile( - l_config, - nunjucks.render( - 'config.njk', { - i_meshBase: l_meshBase, - i_meshExt: l_meshExt, - i_errorXml: 'errors/' + l_base[l_ty] + '_cl_' + l_cls[l_cl] + '_pa_' + l_parts[l_pa] + '.xml' + var l_meshBase = 'meshes/gen/edge_v/' + l_id; + var l_meshExt = '.msh'; + var l_config = 'gen/' + l_id + '.xml'; + + l_fs.outputFile( + l_config, + nunjucks.render( + 'config.njk', { + i_meshBase: l_meshBase, + i_meshExt: l_meshExt, + i_errorXml: 'errors/' + l_id + '.xml' } + ), + function(l_err) { + if(l_err) return console.log( l_err ); } - ), - function(l_err) { - if(l_err) return console.log( l_err ); - } - ) + ) + } } } } -- GitLab