Commit 71731fe1 authored by Dave Moxey's avatar Dave Moxey

Merge branch 'fix/interpolation' into 'master'

Fix for bounding box used for interpolation

See merge request !1033
parents c15f96eb 2a753b52
Pipeline #824 passed with stage
in 0 seconds
......@@ -84,6 +84,7 @@ v5.0.0
- Fix to populate m_elmtToExpId map if not already set up in GetExpIndex (!1019)
- Added flag to skip periodic BCs while filling Dirichlet BCs in
ContField3D.cpp (!1018)
- Fix bounding box for interpolation (!1033)
**NekMesh**:
- Add feature to read basic 2D geo files as CAD (!731)
......
......@@ -112,7 +112,8 @@ void Interpolator::Interpolate(
// Obtain Element and LocalCoordinate to interpolate
int elmtid = m_expInField[0]->GetExpIndex(Scoords, Lcoords,
NekConstants::kGeomFactorsTol);
NekConstants::kGeomFactorsTol,
true);
// we use kGeomFactorsTol as tolerance, while StdPhysEvaluate has
// kNekZeroTol hardcoded, so we need to limit Lcoords to not produce
......
......@@ -352,55 +352,65 @@ void Geometry::GenBoundingBox()
//NekDouble minx, miny, minz, maxx, maxy, maxz;
Array<OneD, NekDouble> min(3), max(3);
if (GetGeomFactors()->GetGtype() == eRegular) {
PointGeomSharedPtr p = GetVertex(0);
Array<OneD, NekDouble> x(3, 0.0);
// Always get vertexes min/max
PointGeomSharedPtr p = GetVertex(0);
Array<OneD, NekDouble> x(3, 0.0);
p->GetCoords(x[0], x[1], x[2]);
for (int j = 0; j < 3; ++j)
{
min[j] = x[j];
max[j] = x[j];
}
for (int i = 1; i < GetNumVerts(); ++i)
{
p = GetVertex(i);
p->GetCoords(x[0], x[1], x[2]);
for (int j = 0; j < 3; ++j) {
min[j] = x[j] - NekConstants::kGeomFactorsTol;
max[j] = x[j] + NekConstants::kGeomFactorsTol;
}
for (int i = 1; i < GetNumVerts(); ++i)
for (int j = 0; j < 3; ++j)
{
p = GetVertex(i);
p->GetCoords(x[0], x[1], x[2]);
for (int j = 0; j < 3; ++j) {
min[j] = (x[j] < min[j] ? x[j] : min[j]);
max[j] = (x[j] > max[j] ? x[j] : max[j]);
}
min[j] = (x[j] < min[j] ? x[j] : min[j]);
max[j] = (x[j] > max[j] ? x[j] : max[j]);
}
}
else {
// If element is deformed loop over quadrature points
if (GetGeomFactors()->GetGtype() != eRegular)
{
const int nq = GetXmap()->GetTotPoints();
Array<OneD, Array<OneD, NekDouble>> x(3);
for (int j = 0; j < 3; ++j) {
for (int j = 0; j < 3; ++j)
{
x[j] = Array<OneD, NekDouble>(nq, 0.0);
}
for (int j = 0; j < GetCoordim(); ++j) {
for (int j = 0; j < GetCoordim(); ++j)
{
GetXmap()->BwdTrans(m_coeffs[j], x[j]);
}
for (int j = 0; j < 3; ++j) {
min[j] = x[j][0] - NekConstants::kGeomFactorsTol;
max[j] = x[j][0] + NekConstants::kGeomFactorsTol;
for (int i = 1; i < nq; ++i) {
for (int j = 0; j < 3; ++j)
{
for (int i = 0; i < nq; ++i)
{
min[j] = (x[j][i] < min[j] ? x[j][i] : min[j]);
max[j] = (x[j][i] > max[j] ? x[j][i] : max[j]);
}
// Add 10% margin to bounding box in case elements have
// convex boundaries.
const int len = max[j] - min[j];
const NekDouble len = max[j] - min[j];
max[j] += 0.1*len;
min[j] -= 0.1*len;
}
}
// Add geometric tolerance
for (int j = 0; j < 3; ++j)
{
const NekDouble len = max[j] - min[j];
min[j] -= NekConstants::kGeomFactorsTol*len;
max[j] += NekConstants::kGeomFactorsTol*len;
}
// Save bounding box
BgPoint pmin(min[0], min[1], min[2]);
BgPoint pmax(max[0], max[1], max[2]);
m_boundingBox = BgBox(pmin, pmax);
}
}
}
}
\ No newline at end of file
......@@ -28,6 +28,8 @@ ADD_NEKTAR_TEST(chan3D_equispacedoutput)
ADD_NEKTAR_TEST(chan3D_isocontour)
ADD_NEKTAR_TEST(interpfield)
ADD_NEKTAR_TEST(interpfieldline)
ADD_NEKTAR_TEST(interpfield_4tri_to_1tri)
ADD_NEKTAR_TEST(interpfield_4quad_to_6tri)
ADD_NEKTAR_TEST(naca0012_bnd_equispacedoutput)
ADD_NEKTAR_TEST(smallmesh_isocontour)
ADD_NEKTAR_TEST(kovas2)
......
This diff is collapsed.
<?xml version="1.0" encoding="utf-8" ?>
<NEKTAR>
<Metadata>
<Provenance>
<GitBranch>refs/heads/fix/interpolation</GitBranch>
<GitSHA1>4fb81c2b57dad61c139b439056740c87073831ff</GitSHA1>
<Hostname>gcastigl</Hostname>
<NektarVersion>5.0.0b</NektarVersion>
<Timestamp>18-Jun-2019 09:01:10</Timestamp>
</Provenance>
</Metadata>
<ELEMENTS FIELDS="rho" SHAPE="Quadrilateral" BASIS="Modified_A,Modified_A" NUMMODESPERDIR="UNIORDER:5,5" ID="1655-1658" COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJwlz/0zk3EAAPDvlV4uUV5SlEt0TFeZlmzJ98uUylsvXkqI6MVLnErpODzukIT0w5RDWFh2mZc21Y7vs9YPyUpNOJLDJr2cUnvU7Wqjx/wHn09Jp6An341Ce2WzQtU3DWrOtdFrPb3Rq+k/PMWdPaTGco5t0zaBQTSH5wMpVKWMKa7RaNCIgMr5XXkMSbpupnau2ENyxe1hyfAr9hC5TMSeG8M9b0t7pGIL0qhIdQ28HsLbgFzHftOHwcNGrHALwyeM4zPWKJqg9VrdxDCjEiaps4qbuXwYPBKxz8ojHHs1j6pHi9wxKOMMbKOWQBCTOU86cSEYF/YqfF0hsT8k5bjJeghklXpsCrA6f6/Bd/H3oo9LcrIXfKYbI64t+JqFSn0K7Ru3IlabH6QfY/5b5/9q0AvFc/QPn0KJDiJvwdhusiq4szbQ/yfereQdlZ2Wwpf2hdvlheakrz/s3X69DdawdkQxJe8xwWfHGP3NwSe61XO55kL4T1tydUpTBxuiBYfTauthqp7yq+9h4MRy4l3faTYGrR/HmYPGmFAis9HP9EPHMwsxd4DjzHRHuwRbCFZWPwlwApjqWPRpHAIMvuW8MIMv5ekZ7oLPpl/vHET7JBXy+OEjFFLKd+X+XEoh67YZJ77qDKqW1bqVb2CRZ10G34obKDy4yVY+ypmCRfyBwAsja8l74cRMyjIVrOVIp2fi6MeVUq+8ihJ87EGcnTi7CeorWyZ1vo1QNLWuLnmyASY4KXxWHQ2D8e013wulLAy+aKTZm+wxKLBErt30A/j2J2inu4iWC9bMNDsIiCB56MQSfPfDC4Ov6RLL4OuNvWXwzWRUG3wMFlsroX1ilerT7ZMUqr8ZaXPZhEId4EeSo8d5ZKF+xpU9ZpKWXjrHqPQ/+H6ZN1dFzEL7UO0WxTsTMshZFOt97xdsfcQ/IJpWYpBaJsmM5uHI2TrPuNKH0C0jzqp/VghjZBsFI5sbYR7Z3lJ6IwEeGgpOmmvYhQGjIN+PsRMD6FPut5R+eB0esOA4Y8L9QJZdH/0A8fbG5XNd/wFVZpJU</ELEMENTS>
</NEKTAR>
<?xml version="1.0" encoding="utf-8" ?>
<NEKTAR>
<GEOMETRY DIM="2" SPACE="2">
<VERTEX>
<V ID="1765">6.95153925e-02 -2.46192196e-01 0.00000000e+00</V>
<V ID="1766">5.99797633e-02 -2.46683971e-01 0.00000000e+00</V>
<V ID="1767">5.03954365e-02 -2.47165079e-01 0.00000000e+00</V>
<V ID="1768">4.07828972e-02 -2.47631563e-01 0.00000000e+00</V>
<V ID="1769">3.11041451e-02 -2.48086729e-01 0.00000000e+00</V>
<V ID="1914">1.36360966e-01 -2.18724932e-01 0.00000000e+00</V>
<V ID="1915">1.26932901e-01 -2.19346829e-01 0.00000000e+00</V>
<V ID="1916">1.17443254e-01 -2.19955237e-01 0.00000000e+00</V>
<V ID="1917">1.07917929e-01 -2.20545150e-01 0.00000000e+00</V>
<V ID="1918">9.83088715e-02 -2.21120752e-01 0.00000000e+00</V>
<V ID="1919">8.86739735e-02 -2.21673148e-01 0.00000000e+00</V>
</VERTEX>
<EDGE>
<E ID="3271">1765 1766</E>
<E ID="3273">1766 1767</E>
<E ID="3275">1767 1768</E>
<E ID="3277">1768 1769</E>
<E ID="3568">1914 1765</E>
<E ID="3569">1914 1915</E>
<E ID="3570">1915 1766</E>
<E ID="3571">1915 1916</E>
<E ID="3572">1916 1767</E>
<E ID="3573">1916 1917</E>
<E ID="3574">1917 1768</E>
<E ID="3575">1917 1918</E>
<E ID="3576">1918 1769</E>
<E ID="3577">1918 1919</E>
</EDGE>
<ELEMENT>
<Q ID="1655">3568 3569 3570 3271</Q>
<Q ID="1656">3570 3571 3572 3273</Q>
<Q ID="1657">3572 3573 3574 3275</Q>
<Q ID="1658">3574 3575 3576 3277</Q>
</ELEMENT>
<COMPOSITE>
<C ID="100"> Q[1655-1658] </C>
</COMPOSITE>
<DOMAIN> C[100] </DOMAIN>
</GEOMETRY>
<EXPANSIONS>
<E COMPOSITE="C[100]" NUMMODES="4" TYPE="MODIFIED" FIELDS="u" />
</EXPANSIONS>
</NEKTAR>
<?xml version="1.0" encoding="utf-8"?>
<test>
<description> Interpolate field from 4 quads to 6 triangles </description>
<executable>FieldConvert</executable>
<parameters> -f -e -m interpfield:fromxml=interpfield_4quad.xml:fromfld=interpfield_4quad.fld interpfield_6tri.xml interpfield_6tri.fld
</parameters>
<files>
<file description="Mesh File 4 ele">interpfield_4quad.xml</file>
<file description="Mesh File 1 ele">interpfield_6tri.xml</file>
<file description="Field File 4 ele">interpfield_4quad.fld</file>
</files>
<metrics>
<metric type="L2" id="1">
<value variable="x" tolerance="1e-6">0.000683002</value>
<value variable="y" tolerance="1e-6"> 0.00222435</value>
<value variable="rho" tolerance="1e-6">0.0112035</value>
</metric>
<metric type="Linf" id="2">
<value variable="x" tolerance="1e-6">0.0790222</value>
<value variable="y" tolerance="1e-6">-0.233356</value>
<value variable="rho" tolerance="1e-6">1.20061</value>
</metric>
</metrics>
</test>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<NEKTAR>
<Metadata>
<Provenance>
<GitBranch>refs/heads/fix/interpolation</GitBranch>
<GitSHA1>4fb81c2b57dad61c139b439056740c87073831ff</GitSHA1>
<Hostname>gcastigl</Hostname>
<NektarVersion>5.0.0b</NektarVersion>
<Timestamp>17-Jun-2019 13:44:10</Timestamp>
</Provenance>
</Metadata>
<ELEMENTS FIELDS="u" SHAPE="Triangle" BASIS="Modified_A,Modified_B" NUMMODESPERDIR="UNIORDER:4,4" ID="31,36,38-39,42" COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJwL/j3B+qDRB/u2ZytjjSw+2DMo+IhXnmHd77Ljw/aEFyn7Sw7Wrao0em+/QPb8tMTbbfZcJdfTT4UV7D/7zqCYky/Ynv/s45alc8vsGX5v5JNtKLMvu2kr32/3wZ7nEETfmSOz2O8YJ+y3/62SoG3bbD/zKcSeA7cg5jGsA5tnP2nxXj5BzpT9W9+dE2Db7rV/guHj71ey4uxNoO7y/AtxJ8MPF0mQ+35seg5yn704byoTi8Z7ewGh+WbX1VrtNcwe2QptDt7PFudy5OGL6P3fRNX2zt/dv5+Bz27e1v46+7U8EPV1jhHLpBiB/np0r//019T9cSbxRZ+Ol9rnQu0L8DlzQ6GvzP5N67FqnodV9n+q7MHmqecmHw9mTLV3KAebt38RVH001Lx+4XNgfU0Nx8H6VG5AwmPJfQE2z8vd9luWVv156hFhL3J2D9i/64qP9Cz+P9E+gfcCyL/7AVNev/QA</ELEMENTS>
</NEKTAR>
<?xml version="1.0" encoding="utf-8" ?>
<NEKTAR>
<EXPANSIONS>
<E COMPOSITE="C[100]" NUMMODES="4" TYPE="MODIFIED" FIELDS="u" />
</EXPANSIONS>
<GEOMETRY DIM="2" SPACE="2">
<VERTEX COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJxjYEAGEg4Q+oM9TIQRSrtulvj7/78whjwTmrwxGDyGyzOjmY8uzwKlO9IMf/3/z49hPiuaPLp+NhR5dgz97Gjy6Po5oDTv2aQv////t0fXz4kmj66fC0rrzzr64v//9xj6udHk0fXzMGADCP28aDLo+vmw698PY/FD6XdGc7kR5iLkBdDkoebD5QWx2w+XF4LSFTPPgaLKAd18YTR5dP0iKPIcGPpF0eTR9YtB6T0+z4FJUQBDvziaPLp+CSi9CywvgqFfEk0eXb8USujA8w9cXhpNHl2/DJSOXVYxU+Huc3vZW7ddnrZthsvLQmmuIxnFumu/2KumPdtSVLQNHv9yUDo9X9hwwrvb9lk/jN3CDh2Ay8tDaee5vAZftrE6vDtiy1r0YSvcfAUobcMWo7jTk8nhbMaJ6++/bYXrV4TSXrP2qwUX/7aXPfQ7o/AaQr8SlJ5WJHmS25PLQSBizvL8Dwj9ylB6/d3519228Tps0v0r8+kbQr8KlDZcMttYW1nQQT6WOzH/GkK/Ksz91uELtlwRcpAVelNcUrQNrl8NSieaG76OZhF1+PPw45fHbZvh+tWhNJti228xRzGHT9+mbAGGD1w/ANpu4rwA</VERTEX>
<EDGE COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJx1lcdWQlEMRbH3igVEpajYuyh27Ipd1P//FCfZA/dal8lZOy85SS5cXibz/9OW0PaEdiSUT6d84K4Ed4vp06N88nrF5PWJ8etP1A+IqR9M+A0pH99hMb4jYvxGlU+/MTH9xsX4ZdWffhNi+k2K6Tclxm9aPsyREzNHXkyfGeUzX0HMfLNi/OaUz9zzYuYuivErKZ99ymL2qYjxW1A+ey6K2XNJjF81lPNi/2Ux389KKOdB3ari1K2JOa91Mf4boZxfKXQzNKv4lvJ5vh1aVnxHcebfDeV7wm9P/ajbF7P3QSj3hf1qYu7RYSj7U3ekPM6vHsp9pv+x4sxzovl5fqo4/zNnoRXFz0OLil8oTt2l5meeRqh/x1divofrUH7X1N0oTt2tmHnu5Ev8PpT7wb14CK0q/qg4dU9i5myGcp/weQ4t6PmLfNjvNZT3Cvu9Kc5e76rn+YfivO8+Q9mLeb7EvG9bYuq+5cseP4qT/ysfzuMPlqMcWwAA</EDGE>
<ELEMENT>
<T COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJx109dOgkEQhmHjAYkJYsWKWBF7F3tHBXu//0vhgPc9+RI5ecKWmfl3dos93V8Zl7GO/TG+gqtYivVruI4DuIGbuIWDuI07OIlDsb6Cuzgc+42/hyO4H/WbZxQP8DDilmO+gX7fGPrdRxFnPPIf4wlO4GnMW7/nUIx1ZziF53iBlzgd+ezHFVbiv/Xb3xm0f8Y3fxVn8Rpv/hm/xTucwybex/55fMBHbOFCzLdjfBGfsIbPuIQvUV871lvfK76h7+I95v2+esx/YAG9j8brQ/tpHz7xC7/Re2f9P5HHe9qLv7Hfvnoef5HH9+Q+43v+vkvrsz+et+/S92p/vZ8d2ekcRQAA</T>
<Q COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJx10MkOgjAURuEiCAgyyyCDDOL7v6Kbcxf+id18SZPT3ta53+XhBX3ZD/CK4Z8uwhhv0tm5CaZ4l87uyzDHQjo7t8QKa+ls3gYf2GIn8/c44FM6m3PECWfp7P0LvnCVzv5jwx0P6ezdbzzxI90XTW4DrwAA</Q>
</ELEMENT>
<CURVED COMPRESSED="B64Z-LittleEndian" BITSIZE="64">
<E>eJx11S10zmEYx/FnPMO8bBg2L2MbNi/DxjYvY3vYCzZs2JxDIBAoiqIoiqIoiqKsKCuKsqIoiqIoysqKoiiU+xv2PX7/8jvP+X/Oee77uq77/lcqK5/6yv+fasm6kquC53dVrqr3POv1fnXJNcE3yZNrg98W/r8h+J3yrIN12u8N69gY/H75dSU3BX9InnVTB/tj8qx7c/An5TeU3Br8aXn22Rz8eXn2uT34i/KNJQeDn5CnLi3BT8lTF/puPyO/peSu4OfkqeOe4O/JU8e24B/IM9/7gn8kT93bg38iv6NkZ/BP5ak7c27/TL615MHgn8vTpzvBv5CnT93Bv5TfXZI5t38lT185p/av5enr4eDfyHO/nA3+rTxzMBL8O/n2kkeCfy/fUfJo8PPyzE1/8B/kmZuB4BfkD5TsCf6jPHPGPWn/Sb6r5LngF+WZs6HgP8szN8eD/yLP3PQF/1Wevl4I/ps8fT0R/Hd56t4b/A956s53x/6nPHU5FfySPOs+E/yyPOvmO2X/S566jwf/W5593gj+jzz7rAX/V55zxXfTvlq30nOuxoJvkOe7ez34RnnuzUvBN8vTp9HgW+W5B6eDb5Pn3M4E3ynPuZ0IvlueubkWfI885/Bq8H3ywyVngx+U596/EvyQfK3k7eBr8szZZPDj8szBcPCT8sxBV/DT8szxXPCz8pzbqeDvyjMHN4O/L39Zaf9Qnj7dCv6x/D9e5jjh</E>
<DATAPOINTS ID="0">
<INDEX>eJw11dViEAQAQFG6u0bnGL2x0V0bMWB0sw3YRoOk0kiHgkGjdIeSCgoGKI1BhxLSaVAKSjxwvC/nE26iRK9LzCRMymRMzhRMyVRMzTRMy3RMzwzMyEzMzCzMymzMzhwMYE7mYm7mYV7mY34WYEEWYmEWYSCLMojFWJwlWJKlWJplGMwQlmUow1iO5VmBFVmJlVmFVVmN1VmDNVmLtVmHdVmP4YxgfTZgQzZiJBuzCZsyis3YnC3Ykq3Ymm3Ylu3Ynh3YkZ3YmdGMYSy7sCu7MY7xTGB39mBP9mJv9mFf9mN/vsEBHMhBHMwhHMo3+RaHcThHcCRHcTTHcCzf5jiO5wRO5CRO5hRO5TRO5zt8lzM4k+/xfX7ADzmLszmHczmP87mAC/kRP+YiLuYSLuUyLucKruQqruYaruU6rucGbuQn/JSbuJlbuJXbuJ2f8XPu4E5+wS+5i7v5Fb/mN/yWe7iX3/F77uN+HuBBHuJhHuFR/sAf+RN/5jEe5wme5Cme5hme5Tme5y/8lRd4kZd4mb/xCq/yGq/zBm/yFm/zDu/yHu/zd/7BP/kXH/AhH/Exn/Bv/sOnfMZ/+R+f8wVf8v/xJ2YSJmUyJmcKpmQqpmYapmU6pmcGZmQmZmYWZmU2ZmcOBjAnczE38zAv8zE/C7AgC7EwizCQRRnEYizOEizJUizNMgxmCMsylGEsx/KswIqsxMqswqqsxuqswZqsxdqsw7qsx3BGsD4bsCEbMZKN2YRNGcVmbM4WbMlWbM02bMt2bM8O7MhO7MxoxjCWXdiV3RjHeCawO3uwJ3uxN/uwL18B7bGW7AAA</INDEX>
<POINTS>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</POINTS>
</DATAPOINTS>
</CURVED>
<COMPOSITE>
<C ID="100"> T[31,36,38,39,42] </C>
</COMPOSITE>
<DOMAIN> C[100] </DOMAIN>
</GEOMETRY>
</NEKTAR>
<?xml version="1.0" encoding="utf-8"?>
<test>
<description> Interpolate field from 4 triangles to 1 triangle </description>
<executable>FieldConvert</executable>
<parameters> -f -e -m interpfield:fromxml=interpfield_4tri.xml:fromfld=interpfield_4tri.fld interpfield_1tri.xml interpfield_1tri.fld
</parameters>
<files>
<file description="Mesh File 4 ele">interpfield_4tri.xml</file>
<file description="Mesh File 1 ele">interpfield_1tri.xml</file>
<file description="Field File 4 ele">interpfield_4tri.fld</file>
</files>
<metrics>
<metric type="L2" id="1">
<value variable="x" tolerance="1e-6">1.21973</value>
<value variable="y" tolerance="1e-6"> 0.0326321</value>
<value variable="u" tolerance="1e-6">0.28525</value>
</metric>
<metric type="Linf" id="2">
<value variable="x" tolerance="1e-6">4.48679</value>
<value variable="y" tolerance="1e-6">0.199915</value>
<value variable="u" tolerance="1e-6">1.01355</value>
</metric>
</metrics>
</test>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<NEKTAR>
<GEOMETRY DIM="2" SPACE="2">
<VERTEX>
<V ID="37397">7.90221863e-02 -2.37374048e-01 0.00000000e+00</V>
<V ID="63237">7.69747758e-02 -2.33355939e-01 0.00000000e+00</V>
<V ID="63238">7.30549759e-02 -2.37969134e-01 0.00000000e+00</V>
<V ID="69286">7.66792500e-02 -2.42408983e-01 0.00000000e+00</V>
<V ID="69287">7.11647850e-02 -2.42731002e-01 0.00000000e+00</V>
<V ID="67890">6.78630853e-02 -2.35182119e-01 0.00000000e+00</V>
<V ID="69287">7.11647850e-02 -2.42731002e-01 0.00000000e+00</V>
<V ID="74584">6.69591816e-02 -2.40239768e-01 0.00000000e+00</V>
<V ID="79199">7.25631359e-02 -2.33500769e-01 0.00000000e+00</V>
</VERTEX>
<EDGE>
<E ID="97789">63237 63238 </E>
<E ID="97790">63238 37397 </E>
<E ID="97791">37397 63237 </E>
<E ID="110633">69286 63238 </E>
<E ID="110634">63238 69287 </E>
<E ID="110635">69287 69286 </E>
<E ID="116087">69286 37397 </E>
<E ID="122154">74584 67890 </E>
<E ID="133085">63237 79199 </E>
<E ID="133086">79199 63238 </E>
<E ID="148403">74584 63238 </E>
<E ID="148404">63238 67890 </E>
<E ID="153023">74584 69287 </E>
<E ID="360535">67890 79199 </E>
</EDGE>
<ELEMENT>
<T ID="41438">97789 97790 97791 </T>
<T ID="47538">110633 110634 110635 </T>
<T ID="50138">116087 97790 110633 </T>
<T ID="58382">133085 133086 97789 </T>
<T ID="66022">148403 148404 122154 </T>
<T ID="68419">153023 110634 148403 </T>
<T ID="215076">133086 360535 148404 </T>
</ELEMENT>
<COMPOSITE>
<C ID="1"> T[41438,47538,50138,58382,66022,68419,215076] </C>
</COMPOSITE>
<DOMAIN> C[1] </DOMAIN>
</GEOMETRY>
<EXPANSIONS>
<E COMPOSITE="C[1]" NUMMODES="2" TYPE="MODIFIED" FIELDS="rho,rhou,rhov,E" />
</EXPANSIONS>
<CONDITIONS />
</NEKTAR>
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