From e3883a3d198e6b6593d73d751c3006cf76c74bee Mon Sep 17 00:00:00 2001
From: Alexander Nikolas Breuer <breuer@mytum.de>
Date: Mon, 1 Feb 2021 17:27:03 +0100
Subject: [PATCH] Updated settings for 3d plane wave convergence tests.

---
 .../wp/plane_waves_3d/configs/gen.tar.xz      |  4 +-
 .../wp/plane_waves_3d/meshes/edge_v.njk       |  6 ++-
 .../wp/plane_waves_3d/meshes/gen.tar.xz       |  3 ++
 .../wp/plane_waves_3d/meshes/gen_configs.js   | 50 +++++++++++++------
 .../wp/plane_waves_3d/meshes/generate.sh      | 12 +++--
 5 files changed, 54 insertions(+), 21 deletions(-)
 create mode 100644 bench/seismic/wp/plane_waves_3d/meshes/gen.tar.xz

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 6d738da..6a10887 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:46aabd337d615bba2333d1498f27a51f68f8245ce63a9cc063c2e36fefeada89
-size 3388
+oid sha256:68477691780f52f267286a5d0651bae2b6c432cf26d4decfe54b0bd122e4c187
+size 3380
diff --git a/bench/seismic/wp/plane_waves_3d/meshes/edge_v.njk b/bench/seismic/wp/plane_waves_3d/meshes/edge_v.njk
index b1d48bb..bec1510 100644
--- a/bench/seismic/wp/plane_waves_3d/meshes/edge_v.njk
+++ b/bench/seismic/wp/plane_waves_3d/meshes/edge_v.njk
@@ -25,17 +25,19 @@
 <edge_v>
   <mesh>
     <periodic>106</periodic>
+    <reorder_only>{{i_reorderOnly}}</reorder_only>
     <n_partitions>{{i_nParts}}</n_partitions>
     <files>
       <in>{{i_meshIn}}</in>
       <out>
         <base>{{i_meshOut}}</base>
-        <extension>.msh</extension></out>
+        <extension>.msh</extension>
+      </out>
     </files>
   </mesh>
 
   <time>
-    <n_groups>8</n_groups>
+    <n_groups>{{i_nTimeGroups}}</n_groups>
 {%- if i_nParts == 1 %}
     <files>
       <out_time_steps>{{i_statsOut}}</out_time_steps>
diff --git a/bench/seismic/wp/plane_waves_3d/meshes/gen.tar.xz b/bench/seismic/wp/plane_waves_3d/meshes/gen.tar.xz
new file mode 100644
index 0000000..b0f08af
--- /dev/null
+++ b/bench/seismic/wp/plane_waves_3d/meshes/gen.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f92a7f1a1eb88988f6879d6049fb146bf52cc4fc96560c8203deb49cf0744794
+size 46867732
diff --git a/bench/seismic/wp/plane_waves_3d/meshes/gen_configs.js b/bench/seismic/wp/plane_waves_3d/meshes/gen_configs.js
index a9c53b2..e8369e8 100755
--- a/bench/seismic/wp/plane_waves_3d/meshes/gen_configs.js
+++ b/bench/seismic/wp/plane_waves_3d/meshes/gen_configs.js
@@ -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++ ) {
-      console.log( 'generating EDGE-V config for char length / nParts:', l_cls[l_cl], '/', l_parts[l_pa] )
-      l_fs.outputFile(
-        'gen/configs/edge_v/' + l_base[l_ty] + '_cl_' + l_cls[l_cl] + '_pa_' + l_parts[l_pa] + '.xml',
-        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_meshOut: 'gen/edge_v/' + l_base[l_ty] + '_cl_'  + l_cls[l_cl] + '_pa_' + l_parts[l_pa],
-            i_statsOut: 'gen/stats/edge_v_'  + l_cls[l_cl] + '.csv',
-          }
-        ),
-        function(l_err) {
-          if(l_err) return console.log( l_err );
+      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 EDGE-V config for char length / nParts:', l_cls[l_cl], '/', l_parts[l_pa] )
+        var l_configOut = 'gen/configs/edge_v/' + l_id + '.xml';
+        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 );
+          }
+        )
+      }
     }
   }
 }
diff --git a/bench/seismic/wp/plane_waves_3d/meshes/generate.sh b/bench/seismic/wp/plane_waves_3d/meshes/generate.sh
index 0ca9118..0a7fb2a 100755
--- a/bench/seismic/wp/plane_waves_3d/meshes/generate.sh
+++ b/bench/seismic/wp/plane_waves_3d/meshes/generate.sh
@@ -31,17 +31,23 @@ mkdir -p gen/gmsh gen/edge_v gen/logs
 
 ./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
   for l_ty in gts lts
   do
     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
     do
       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
-- 
GitLab