Merge pull request #206 from awslabs/sjg/waveport-example-fix

Revert changes to waveport mesh for cpw example
awslabs · Mar 7, 2024 · a56f43f · a56f43f
2 parents 4836f7d + 30b8c28
commit a56f43f
Show file tree

Hide file tree

Showing 24 changed files with 50,579 additions and 50,243 deletions.
diff --git a/docs/src/assets/examples/cpw-2.png b/docs/src/assets/examples/cpw-2.png
diff --git a/docs/src/assets/examples/cpw-4a.png b/docs/src/assets/examples/cpw-4a.png
diff --git a/docs/src/assets/examples/cpw-4b.png b/docs/src/assets/examples/cpw-4b.png
diff --git a/docs/src/assets/examples/cpw-4c.png b/docs/src/assets/examples/cpw-4c.png
diff --git a/docs/src/assets/examples/cpw-4d.png b/docs/src/assets/examples/cpw-4d.png
diff --git a/docs/src/assets/examples/cpw-5a.png b/docs/src/assets/examples/cpw-5a.png
diff --git a/docs/src/assets/examples/cpw-5b.png b/docs/src/assets/examples/cpw-5b.png
diff --git a/docs/src/assets/examples/cpw-5c.png b/docs/src/assets/examples/cpw-5c.png
diff --git a/docs/src/assets/examples/cpw-5d.png b/docs/src/assets/examples/cpw-5d.png
diff --git a/examples/cpw/mesh/cpw_wave.msh b/examples/cpw/mesh/cpw_wave.msh
diff --git a/examples/cpw/mesh/cpw_wave_0.msh b/examples/cpw/mesh/cpw_wave_0.msh
diff --git a/examples/cpw/mesh/mesh.jl b/examples/cpw/mesh/mesh.jl
@@ -137,8 +137,8 @@ function generate_cpw_wave_mesh(;
         0.5 * trace_width_μm
     dyp1 = 0.5 * (cy2 - cy1)
     dyp2 = dyp1
-    dzp1 = 2.0 * (trace_width_μm + 2.0 * gap_width_μm)
-    dzp2 = dzp1
+    dzp1 = 0.5 * (sep_dz + substrate_height_μm)
+    dzp2 = substrate_height_μm
     let pa, pb, l
         pa = kernel.addPoint(0.0, cy1 - dyp2, -dzp1)
         pb = kernel.addPoint(0.0, cy1 + dyp1, -dzp1)

diff --git a/test/examples/ref/cpw/wave_adaptive/domain-E.csv b/test/examples/ref/cpw/wave_adaptive/domain-E.csv
diff --git a/test/examples/ref/cpw/wave_adaptive/error-indicators.csv b/test/examples/ref/cpw/wave_adaptive/error-indicators.csv
@@ -1,2 +1,2 @@
                     Norm,                 Minimum,                 Maximum,                    Mean
-        +5.922801271e-01,        +5.225997978e-06,        +2.285591756e-02,        +2.396468699e-03
+        +5.926629670e-01,        +3.349169598e-06,        +2.367129427e-02,        +2.346406645e-03
diff --git a/test/examples/ref/cpw/wave_adaptive/port-S.csv b/test/examples/ref/cpw/wave_adaptive/port-S.csv
diff --git a/test/examples/ref/cpw/wave_adaptive/probe-B.csv b/test/examples/ref/cpw/wave_adaptive/probe-B.csv
diff --git a/test/examples/ref/cpw/wave_adaptive/probe-E.csv b/test/examples/ref/cpw/wave_adaptive/probe-E.csv
diff --git a/test/examples/ref/cpw/wave_adaptive/surface-Q.csv b/test/examples/ref/cpw/wave_adaptive/surface-Q.csv
diff --git a/test/examples/ref/cpw/wave_uniform/domain-E.csv b/test/examples/ref/cpw/wave_uniform/domain-E.csv
@@ -1,16 +1,16 @@
          f (GHz),              E_elec (J),               E_mag (J),               E_cap (J),               E_ind (J),           E_elec[1] (J),               p_elec[1],            E_mag[1] (J),                p_mag[1]
- 2.000000000e+00,        +1.888178409e-02,        +1.415887515e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.717912635e-02,        +9.098253780e-01,        +7.083558906e-03,        +5.002910774e-01
- 4.000000000e+00,        +1.789838139e-02,        +1.474414021e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.628453306e-02,        +9.098327222e-01,        +7.376657824e-03,        +5.003111553e-01
- 6.000000000e+00,        +1.676238582e-02,        +1.551117898e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.525121278e-02,        +9.098473780e-01,        +7.760836927e-03,        +5.003383004e-01
- 8.000000000e+00,        +1.591063607e-02,        +1.624797219e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.447659597e-02,        +9.098690907e-01,        +8.130085748e-03,        +5.003754101e-01
- 1.000000000e+01,        +1.559241434e-02,        +1.677619880e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.418742191e-02,        +9.098925673e-01,        +8.395352694e-03,        +5.004323562e-01
- 1.200000000e+01,        +1.580214228e-02,        +1.698657368e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.437849022e-02,        +9.099076545e-01,        +8.502091134e-03,        +5.005183089e-01
- 1.400000000e+01,        +1.630772460e-02,        +1.687398482e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.483823874e-02,        +9.098901968e-01,        +8.447229021e-03,        +5.006066505e-01
- 1.600000000e+01,        +1.685594709e-02,        +1.664029171e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.532871150e-02,        +9.093948512e-01,        +8.322287872e-03,        +5.001287246e-01
- 1.800000000e+01,        +1.685272904e-02,        +1.615857771e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.533298113e-02,        +9.098218511e-01,        +8.096042188e-03,        +5.010368073e-01
- 2.000000000e+01,        +1.663014825e-02,        +1.593574950e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.513101792e-02,        +9.098546622e-01,        +7.988048501e-03,        +5.012659431e-01
- 2.200000000e+01,        +1.626715919e-02,        +1.595617695e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.480108592e-02,        +9.098752736e-01,        +8.000540885e-03,        +5.014071296e-01
- 2.400000000e+01,        +1.600180192e-02,        +1.617754677e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.456038273e-02,        +9.099214454e-01,        +8.112732077e-03,        +5.014809842e-01
- 2.600000000e+01,        +1.598973874e-02,        +1.647548482e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.455068092e-02,        +9.100011674e-01,        +8.262608297e-03,        +5.015092659e-01
- 2.800000000e+01,        +1.622960484e-02,        +1.669610841e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.477065263e-02,        +9.101055005e-01,        +8.373522838e-03,        +5.015254232e-01
- 3.000000000e+01,        +1.657908743e-02,        +1.673615072e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.509024718e-02,        +9.101976961e-01,        +8.394213952e-03,        +5.015618042e-01
+ 2.000000000e+00,        +1.913387450e-02,        +1.376343027e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.740245224e-02,        +9.095101066e-01,        +6.884853555e-03,        +5.002280261e-01
+ 4.000000000e+00,        +1.805649262e-02,        +1.440892343e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.642227071e-02,        +9.094939454e-01,        +7.208471773e-03,        +5.002783037e-01
+ 6.000000000e+00,        +1.680479034e-02,        +1.524806376e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.528360155e-02,        +9.094788599e-01,        +7.629122923e-03,        +5.003338814e-01
+ 8.000000000e+00,        +1.584762417e-02,        +1.605218105e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.441312803e-02,        +9.094819440e-01,        +8.032058070e-03,        +5.003717591e-01
+ 1.000000000e+01,        +1.545538006e-02,        +1.663793338e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.405696497e-02,        +9.095192036e-01,        +8.325194091e-03,        +5.003742894e-01
+ 1.200000000e+01,        +1.563508315e-02,        +1.689469356e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.422154623e-02,        +9.095919791e-01,        +8.452957008e-03,        +5.003320704e-01
+ 1.400000000e+01,        +1.614982845e-02,        +1.680724963e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.469122625e-02,        +9.096831146e-01,        +8.408671080e-03,        +5.003002433e-01
+ 1.600000000e+01,        +1.662741476e-02,        +1.647641090e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.512730412e-02,        +9.097808855e-01,        +8.243189430e-03,        +5.003024919e-01
+ 1.800000000e+01,        +1.677663518e-02,        +1.609416449e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.526438410e-02,        +9.098596905e-01,        +8.052186054e-03,        +5.003171218e-01
+ 2.000000000e+01,        +1.654980034e-02,        +1.584617216e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.505869838e-02,        +9.099021180e-01,        +7.929508464e-03,        +5.004052957e-01
+ 2.200000000e+01,        +1.612969417e-02,        +1.582329632e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.467645865e-02,        +9.099030956e-01,        +7.920891735e-03,        +5.005841749e-01
+ 2.400000000e+01,        +1.577510503e-02,        +1.600132710e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.435330182e-02,        +9.098704443e-01,        +8.013898804e-03,        +5.008271347e-01
+ 2.600000000e+01,        +1.566974849e-02,        +1.627645237e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.425675994e-02,        +9.098269799e-01,        +8.155901373e-03,        +5.010859361e-01
+ 2.800000000e+01,        +1.584474789e-02,        +1.651552762e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.441560942e-02,        +9.098036470e-01,        +8.279465916e-03,        +5.013140426e-01
+ 3.000000000e+01,        +1.617319581e-02,        +1.660929639e-02,        +0.000000000e+00,        +0.000000000e+00,        +1.471475547e-02,        +9.098236142e-01,        +8.329298641e-03,        +5.014841356e-01
diff --git a/test/examples/ref/cpw/wave_uniform/error-indicators.csv b/test/examples/ref/cpw/wave_uniform/error-indicators.csv
@@ -1,2 +1,2 @@
                     Norm,                 Minimum,                 Maximum,                    Mean
-        +5.924293743e-01,        +4.882521395e-06,        +2.302202801e-02,        +2.392150995e-03
+        +5.925677898e-01,        +3.362763049e-06,        +2.379696782e-02,        +2.346066273e-03
diff --git a/test/examples/ref/cpw/wave_uniform/port-S.csv b/test/examples/ref/cpw/wave_uniform/port-S.csv
@@ -1,16 +1,16 @@
          f (GHz),          |S[1][1]| (dB),     arg(S[1][1]) (deg.),          |S[2][1]| (dB),     arg(S[2][1]) (deg.),          |S[3][1]| (dB),     arg(S[3][1]) (deg.),          |S[4][1]| (dB),     arg(S[4][1]) (deg.)
- 2.000000000e+00,        -2.375990811e+01,        -1.137961041e+02,        -2.695326505e-02,        -2.388126418e+01,        -4.963839836e+01,        +5.835582495e+01,        -5.834588635e+01,        -1.512148994e+02
- 4.000000000e+00,        -1.852242550e+01,        -1.380302286e+02,        -8.088230023e-02,        -4.754437004e+01,        -4.448686706e+01,        +3.871175158e+01,        -5.370005545e+01,        -1.792997262e+02
- 6.000000000e+00,        -1.633159362e+01,        -1.619889349e+02,        -1.320505135e-01,        -7.091435965e+01,        -4.234744667e+01,        +1.698476307e+01,        -5.173717425e+01,        +1.480148050e+02
- 8.000000000e+00,        -1.580133644e+01,        +1.739977239e+02,        -1.496031516e-01,        -9.409843126e+01,        -4.188090933e+01,        -4.785135987e+00,        -5.128207350e+01,        +1.167604997e+02
- 1.000000000e+01,        -1.670625461e+01,        +1.493990588e+02,        -1.235555151e-01,        -1.173140885e+02,        -4.286881970e+01,        -2.589941859e+01,        -5.189709493e+01,        +9.022645791e+01
- 1.200000000e+01,        -1.945131161e+01,        +1.230314227e+02,        -7.024310457e-02,        -1.407630882e+02,        -4.570591517e+01,        -4.505647523e+01,        -5.300358932e+01,        +7.314687785e+01
- 1.400000000e+01,        -2.605124212e+01,        +8.868800684e+01,        -2.384018022e-02,        -1.645149024e+02,        -5.244755554e+01,        -5.559214784e+01,        -5.305205517e+01,        +6.738199663e+01
- 1.600000000e+01,        -3.204169465e+01,        -6.014074030e+01,        -2.376421349e-02,        +1.715861070e+02,        -5.280168270e+01,        +5.470640552e+01,        -4.868422352e+01,        +6.382922102e+01
- 1.800000000e+01,        -2.151398529e+01,        -1.108432789e+02,        -5.061748975e-02,        +1.477416558e+02,        -4.613706368e+01,        +3.609380617e+01,        -4.727358449e+01,        +2.627319137e+01
- 2.000000000e+01,        -1.752088631e+01,        -1.390091515e+02,        -1.101453823e-01,        +1.241279181e+02,        -4.262840910e+01,        +1.975622899e+01,        -4.610016853e+01,        -2.086228187e+00
- 2.200000000e+01,        -1.588173169e+01,        -1.644807589e+02,        -1.586568868e-01,        +1.008071782e+02,        -4.093222792e+01,        -8.636802261e-01,        -4.543022647e+01,        -3.146307559e+01
- 2.400000000e+01,        -1.576737758e+01,        +1.706308070e+02,        -1.677526266e-01,        +7.763042430e+01,        -4.061246851e+01,        -2.292798093e+01,        -4.529346790e+01,        -5.974257468e+01
- 2.600000000e+01,        -1.714599255e+01,        +1.451592623e+02,        -1.332747606e-01,        +5.436436437e+01,        -4.163971107e+01,        -4.546254200e+01,        -4.553192984e+01,        -8.522862342e+01
- 2.800000000e+01,        -2.072235533e+01,        +1.168884463e+02,        -7.750083284e-02,        +3.082178687e+01,        -4.445532446e+01,        -6.760624789e+01,        -4.582354126e+01,        -1.065058896e+02
- 3.000000000e+01,        -2.992075679e+01,        +6.808105845e+01,        -3.818573583e-02,        +6.971005207e+00,        -5.136305556e+01,        -8.701161610e+01,        -4.550391382e+01,        -1.233809203e+02
+ 2.000000000e+00,        -2.275650555e+01,        -1.120392872e+02,        -5.698448759e-02,        -2.386510448e+01,        -4.755987469e+01,        +1.190160526e+01,        -4.867109944e+01,        +1.572988695e+02
+ 4.000000000e+00,        -1.751192703e+01,        -1.364965153e+02,        -1.157687885e-01,        -4.749630879e+01,        -4.566660035e+01,        +1.287177007e+01,        -4.873116255e+01,        +1.349583060e+02
+ 6.000000000e+00,        -1.529569738e+01,        -1.600346775e+02,        -1.726753019e-01,        -7.080865738e+01,        -4.429189083e+01,        +5.942086632e+00,        -4.876724674e+01,        +1.131671005e+02
+ 8.000000000e+00,        -1.471249403e+01,        +1.767933059e+02,        -1.941344793e-01,        -9.390974559e+01,        -4.375005879e+01,        -4.457997217e+00,        -4.871445662e+01,        +9.172939628e+01
+ 1.000000000e+01,        -1.552100386e+01,        +1.536623319e+02,        -1.679184119e-01,        -1.170289367e+02,        -4.409564200e+01,        -1.545275163e+01,        -4.856174994e+01,        +7.016298038e+01
+ 1.200000000e+01,        -1.809462391e+01,        +1.303011146e+02,        -1.096657264e-01,        -1.403870429e+02,        -4.539527943e+01,        -2.413477565e+01,        -4.835884576e+01,        +4.825621904e+01
+ 1.400000000e+01,        -2.438790246e+01,        +1.065844605e+02,        -5.416211562e-02,        -1.640702914e+02,        -4.743983400e+01,        -2.510220361e+01,        -4.807870426e+01,        +2.585556713e+01
+ 1.600000000e+01,        -3.631653395e+01,        -9.659745995e+01,        -3.702799889e-02,        +1.720198575e+02,        -4.904265313e+01,        -1.455558696e+01,        -4.791694608e+01,        +2.238835284e+00
+ 1.800000000e+01,        -2.093575261e+01,        -1.207221903e+02,        -7.235575959e-02,        +1.481381717e+02,        -4.838769239e+01,        +9.621694872e-01,        -4.796222045e+01,        -2.078899482e+01
+ 2.000000000e+01,        -1.642041193e+01,        -1.441572137e+02,        -1.411336366e-01,        +1.245227638e+02,        -4.622243012e+01,        +4.904387743e+00,        -4.806069863e+01,        -4.243039528e+01
+ 2.200000000e+01,        -1.441935335e+01,        -1.671282422e+02,        -2.052319754e-01,        +1.012487132e+02,        -4.447678046e+01,        -1.688746595e+00,        -4.803608224e+01,        -6.266274552e+01
+ 2.400000000e+01,        -1.386701923e+01,        +1.703066611e+02,        -2.303879214e-01,        +7.819725253e+01,        -4.364450227e+01,        -1.316905554e+01,        -4.774015415e+01,        -8.240450734e+01
+ 2.600000000e+01,        -1.454264615e+01,        +1.480779839e+02,        -2.042823340e-01,        +5.513267079e+01,        -4.379159399e+01,        -2.626110287e+01,        -4.718285987e+01,        -1.031206726e+02
+ 2.800000000e+01,        -1.667121918e+01,        +1.264464504e+02,        -1.420091412e-01,        +3.182955369e+01,        -4.501733894e+01,        -3.834421597e+01,        -4.653832255e+01,        -1.257219851e+02
+ 3.000000000e+01,        -2.129310291e+01,        +1.074482731e+02,        -7.801235764e-02,        +8.192646890e+00,        -4.748988454e+01,        -4.490761392e+01,        -4.601699790e+01,        -1.500312697e+02