Updated settings for 3d plane wave convergence tests.

parent 427616f3
...@@ -25,17 +25,19 @@ ...@@ -25,17 +25,19 @@
<edge_v> <edge_v>
<mesh> <mesh>
<periodic>106</periodic> <periodic>106</periodic>
<reorder_only>{{i_reorderOnly}}</reorder_only>
<n_partitions>{{i_nParts}}</n_partitions> <n_partitions>{{i_nParts}}</n_partitions>
<files> <files>
<in>{{i_meshIn}}</in> <in>{{i_meshIn}}</in>
<out> <out>
<base>{{i_meshOut}}</base> <base>{{i_meshOut}}</base>
<extension>.msh</extension></out> <extension>.msh</extension>
</out>
</files> </files>
</mesh> </mesh>
<time> <time>
<n_groups>8</n_groups> <n_groups>{{i_nTimeGroups}}</n_groups>
{%- if i_nParts == 1 %} {%- if i_nParts == 1 %}
<files> <files>
<out_time_steps>{{i_statsOut}}</out_time_steps> <out_time_steps>{{i_statsOut}}</out_time_steps>
......
...@@ -49,21 +49,43 @@ for( var l_cl = 0; l_cl < l_cls.length; l_cl++ ) { ...@@ -49,21 +49,43 @@ for( var l_cl = 0; l_cl < l_cls.length; l_cl++ ) {
) )
for( var l_pa = 0; l_pa < l_parts.length; l_pa++ ) { for( var l_pa = 0; l_pa < l_parts.length; l_pa++ ) {
console.log( 'generating EDGE-V config for char length / nParts:', l_cls[l_cl], '/', l_parts[l_pa] ) for( var l_ro = 0; l_ro < 2; l_ro++ ) {
l_fs.outputFile( var l_id = l_base[l_ty] + '_cl_' + l_cls[l_cl] + '_pa_' + l_parts[l_pa];
'gen/configs/edge_v/' + l_base[l_ty] + '_cl_' + l_cls[l_cl] + '_pa_' + l_parts[l_pa] + '.xml', // create reorder-only mesh for parallel configs
nunjucks.render( if( l_base[l_ty] == 'gts' && l_parts[l_pa] != 1 && l_ro == 1 ) {
'edge_v.njk', { l_id = l_id + '_reorder_only';
i_meshIn: 'gen/gmsh/' + l_base[l_ty] + '_' + l_cls[l_cl] + '.msh', }
i_nParts: l_parts[l_pa], else if( l_ro == 1 ) {
i_meshOut: 'gen/edge_v/' + l_base[l_ty] + '_cl_' + l_cls[l_cl] + '_pa_' + l_parts[l_pa], continue;
i_statsOut: 'gen/stats/edge_v_' + l_cls[l_cl] + '.csv', }
}
), console.log( 'generating EDGE-V config for char length / nParts:', l_cls[l_cl], '/', l_parts[l_pa] )
function(l_err) { var l_configOut = 'gen/configs/edge_v/' + l_id + '.xml';
if(l_err) return console.log( l_err ); var l_nTimeGroups = 1;
if( l_base[l_ty] == 'lts' ) {
l_nTimeGroups = 8;
} }
) var l_meshOut = 'gen/edge_v/' + l_id;
var l_statsOut = 'gen/stats/edge_v_' + l_id + '.csv';
l_fs.outputFile(
l_configOut,
nunjucks.render(
'edge_v.njk', {
i_meshIn: 'gen/gmsh/' + l_base[l_ty] + '_' + l_cls[l_cl] + '.msh',
i_nParts: l_parts[l_pa],
i_nTimeGroups: l_nTimeGroups,
i_reorderOnly: l_ro,
i_meshOut: l_meshOut,
i_statsOut: l_statsOut
}
),
function(l_err) {
if(l_err) return console.log( l_err );
}
)
}
} }
} }
} }
......
...@@ -31,17 +31,23 @@ mkdir -p gen/gmsh gen/edge_v gen/logs ...@@ -31,17 +31,23 @@ mkdir -p gen/gmsh gen/edge_v gen/logs
./gen_configs.js ./gen_configs.js
for l_cl in 25 20 15 10 9 8 7 6 5 4 3 2 1 for l_cl in 25 20 15 10 9 8 7 6 5 4 3 2
do do
for l_ty in gts lts for l_ty in gts lts
do do
echo "$(date) running gmsh char length ${l_cl} for type ${l_ty}" echo "$(date) running gmsh char length ${l_cl} for type ${l_ty}"
gmsh -3 -format msh2 gen/configs/gmsh/${l_ty}_${l_cl}.geo -o gen/gmsh/${l_ty}_${l_cl}.msh > gen/logs/gmsh_${l_ty}_${l_cl}.log 2>&1 gmsh -3 gen/configs/gmsh/${l_ty}_${l_cl}.geo -o gen/gmsh/${l_ty}_${l_cl}.msh > gen/logs/${l_ty}_${l_cl}_gmsh.log 2>&1
for l_pa in 1 8 for l_pa in 1 8
do do
echo "$(date) running EDGE-V for char length ${l_cl} for nParts ${l_pa}" echo "$(date) running EDGE-V for char length ${l_cl} for nParts ${l_pa}"
edge_v -x gen/configs/edge_v/${l_ty}_cl_${l_cl}_pa_${l_pa}.xml > gen/logs/edge_v_${l_ty}_cl_${l_cl}_pa_${l_pa}.log 2>&1 edge_v -x gen/configs/edge_v/${l_ty}_cl_${l_cl}_pa_${l_pa}.xml > gen/logs/${l_ty}_cl_${l_cl}_pa_${l_pa}_edge_v.log 2>&1
if [[ l_pa -gt 1 && ${l_ty} == 'gts' ]]
then
echo "$(date) running EDGE-V for char length ${l_cl} for nParts ${l_pa} (reorder only)"
edge_v -x gen/configs/edge_v/${l_ty}_cl_${l_cl}_pa_${l_pa}_reorder_only.xml > gen/logs/${l_ty}_cl_${l_cl}_pa_${l_pa}_reorder_only_edge_v.log 2>&1
fi
done done
done done
done done
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment