Commit 600ebebc authored by Giacomo Castiglioni's avatar Giacomo Castiglioni

adjusted nozzle regression test, added 2D shocktube regression test

parent 81dbc5cc
......@@ -108,6 +108,7 @@ IF( NEKTAR_SOLVER_COMPRESSIBLE_FLOW )
ADD_NEKTAR_TEST(hump3D_GLL)
ADD_NEKTAR_TEST(hump3D_SEM)
ADD_NEKTAR_TEST(Rarefaction_vanderWaals LENGTHY)
ADD_NEKTAR_TEST(ShockTube_2D_mixedMesh_Lap)
IF (NEKTAR_USE_MPI)
#ADD_NEKTAR_TEST(Perturbation_M05_square_CBC_par LENGTHY)
......
......@@ -8,16 +8,14 @@
</files>
<metrics>
<metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">3.86343</value>
<value variable="rhou" tolerance="1e-12">27.0141</value>
<value variable="E" tolerance="1e-12">787959</value>
<value variable="rho" tolerance="1e-12">3.86521</value>
<value variable="rhou" tolerance="1e-12">24.6372</value>
<value variable="E" tolerance="1e-12">787766</value>
</metric>
<metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">1.26257</value>
<value variable="rhou" tolerance="1e-12">50.4078</value>
<value variable="E" tolerance="1e-12">260694</value>
<value variable="rho" tolerance="1e-12">1.2538</value>
<value variable="rhou" tolerance="1e-12">45.0691</value>
<value variable="E" tolerance="1e-12">260066</value>
</metric>
</metrics>
</test>
</test>
\ No newline at end of file
......@@ -117,9 +117,9 @@
<P> uInf = 1 </P>
<!-- Parameters for artificial diffusion -->
<P> Skappa = -4.5 </P>
<P> Kappa = 1.5 </P>
<P> mu0 = 2 </P>
<P> Skappa = -1.5 </P>
<P> Kappa = 0.25 </P>
<P> mu0 = 1 </P>
<P> SensorOffset = 2 </P>
<!-- Parameters for explicit filter -->
......
<?xml version="1.0" encoding="utf-8" ?>
<NEKTAR>
<GEOMETRY DIM="2" SPACE="2">
<VERTEX COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJxt1mlQlXUUx/FrSkkqeXPLjJRMMipLuAZpcdVKAbOENg3yIrFlGm22SIktauUSYUGAlOYrx7YZsxlrBmSwxRkIM6NExmmTxAVv5QvphcTznN89wznneV4+n/mf732ee1h8PnnVVDvXnobPdpVVnS/z+Qbg/rlcF4LaL1Dn5+0c7vf7t7EPxP1jdDAYu1v6IHX+kxK/48GIR+H+T4fofHuB9Au9Pz/7Rbi/N6am/+dnHwxPL3Du7zDPFw3/uo68u15+/ovhs9vIh+TIzzdE9HeY/lB4XnRS37XL9IfBtwTI934n+zHw9hB5SpbsXwIfuV7MZx8OT82m+7rvh4+uIq84KPuXwrsOkhelyf4I+Lfu8+8x/ZHwcR/39l0Npj8KvqmHPK9D9kdHvviJ7lsOVqbK/hjw9HRy3b8MXtqb2Pd+mkx/LDxqSpLryZ2yfzl8Qw75voDsjxPvv8n0r4AXTy7su74x/Vj4zBB5VFj2r4SPqiT/N0H2x8NPNIv57BPgCzOd+/tNPw5eVk5+pEf2r4LXtZLHxsn+RPg+9/vfb/pXw+esbHYu058E/6KRfOdAv+jHwxOiW1yfP0b2r4HXLGjpP599Mrxnu7NfraZ/LfzsP+Slw2Q/AX7OfZEHIs7zr4OvSCPX/evhv5Q4938w/RvgYyvI8XzsU+A5n5Pj/fD8G+Fb28R89psi+xPj7OePpj8V/mUC+fg42U+EL55Ljv3g+UnwQfliPnsAnvmR8/UcMv1p8EVN5Nhv9pvhee3kg8Oynwxf+reYz54CL89wfj7aTP8W+H/Z5I0B2Z8OL1pOntIp+zPgB1aJ+ey3wluOO/v1s+nfBq89S47fb+yp8GLaomB+h+wH4dOGkuv+THj0Ouf+YdOfBZ+xkRy/39lnR97vZnL8feD5t8Np7mHTvwOeNsnZjyOmfye8HZ6cJftz4MviyfH3kefPhZ+PF/PZ0+Br3P3qMP10+FeN5Pj7zp4BDzeQh+tlfx48vl7MZ78L3rTE2Y+jpj8ffjSXHP//sN8d2c8Q+YTdsn8PfERIzGdf4Ot//Wr6mcrx/xl7lnL8/8fz7/Wez34fxP3t3Gz79yv/VPUfUK77D8Kb5Xz2hXC6/5vpL1Kun/8h5bqf7T2fPQde6F6/m/7DynV/sXLdD3nPZ8+FJ7nXH6a/BD4Vrt9/njqv+494z2fPF/vxp+kXKNf9QuW6X+Q9n71Y7I/tPyr2x/aXqvO6/5g6r/vLxH4cM/3l8Fq47j+uzut+ifd89ifEfnSa/pPKdf8p5br/tPd89mfEfvxl+ivgAbje/2fV+QzVf857PvvzYj+Om/4LkAFw/fwr1Xn9/KXe89lfFPtj+y/Bv4fr518Fb4Xr5y/zns++WuxHl+m/LPavyzz/K+q8fv5Xveezvyb244Tpr1Gu+2vhRXDdX+c9n/11sV8nTf8N5br/pnLdXy/276TpbxD7ccr0N0J63cv2N6nzuv+W93z2crEftv+22L9Tpl+hXPc3e89nf0fsx2nTf1fs32mz/5XwarjuV3nPZ39P7Ee36VeL/eo2/Rrlul/rPZ99i9ifM6ZfB0+E6/f/vjqv+x+I/Ttj+lvFfoRNf5ty/fwfKtf97d7z2f8HMbBilAAA</VERTEX>
<EDGE COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJx1mFW0VWUURll0d+elu7sv3R0WKrZY2C1iE3aALXZ3Y4PdgV3Y3S2IvJz5sOYYh5cz5je+y53/PefsvdYuUyb/iyKvZYu88q+c+nB5MT9XoUivoph+JfX5+cpifq6Kcv7fqkV+TzX1+X3VxfxcjcIr58WjphjfWsrxqy2mX6fIOeoq5zz1xPTrK+ccDZRz/oZi+o3kz9+lsRivJsr5ezUV02+mHK/myvn7thDTb6mcc7RSzvtRIqbfWv68T23EeLVVzvvXTky/vXK8Oijn/e4opt9JOeforJzPRxcx/a7y53PTTYxXd+V8nnqI6fdUjlcv5Xz+eovp91HOOfoq5/PaT0y/v/z5HA8Q4zVQOZ/vQWL6g5XjNUQ534ehYvrDlHOO4cr5/owQ0x8pf75XpWK8Rinn+zZaTH+McrzGKuf7OU5Mf7xyzjFBOd/niWL6k+RfUnidLMZrinK+/1PF9Kcpx2u6cq4XM8T0ZyrnHLOUc32ZLaY/R/5cd+aK8ZqnnOvRfDH9bZTjta1yrl/bielvr5xz7KCc690CMf0d5c91cCcxXjsr5/q4UEx/F+V47aqc6+luYvq7K+cceyjn+runmP5e8ue6vLcYr0XKuV7vI6a/r3K89lPO9X1/Mf0DlHOOxcq5Hxwopn+Q/LlPHCzG6xDl3D8OFdM/TDlehyvnfnOEmP6RyjnHUcq5Px0tpn+M/LlvHSvG6zjl3M+WiOkfrxyvpcq5/50gpn+ics5xknLulyeL6Z8if+6jp4rxOk0599dlYvrLleO1Qjn345Vi+qcr5xxnKOf+faaY/lny575+thivc5Rzvz9XTP885Xidr5z54AIx/VXKOcdq5cwTF4rpXyT/0sLrxWK8LlHO/HGpmP5lyvG6XDnzyhVi+muUc44rlTPfXCWmf7X8mXuuEeN1rXLmoevE9K9XjtcNypmfbhTTv0k557hZOfPWLWL6t8qfOew2MV63K2c+u0NM/07leN2lnHnubjH9e5RzjnuVM//dJ6Z/v/yZCx8Q4/WgcubFtWL6DynH62HlzJePiOk/qpxzPKacefRxMf0n5M+cuk6M13rlzK9Piuk/pRyvp5Uz7z4jpv+scs7xnHLm4+fF9F+QP3Pzi2Lm5pfE+L6snHn6FTFerypnzn5NjO/r8mH+fkPM/L1BjNebypnL3xLj9bZy5vV3xPi+Kx/m+PfEzPHvi/H6QDnz/YdivD5Sztz/sRjfjfJZWHj9RMw+8KkYr8+Usyd8LsbrC+XsD1+K8f1KPuwVX4vZK74R4/WtcvaN78R4fa+cPeQHMb4/yof95Ccx+8nPYrx+Uc7e8qsYr9+Us8/8Lsb3D/mw5/wpZs/5S4zX38rZf/4R4/WvcvaiTWJ8N8uHfek/MfvSFjFe/ytnj+IBNoxXKGe/KhuZ8S0X2Ye9q3xkZu+qEJnxqqicfaxSZMarsnL2tCqRGd+q8mF/qxaZ2d+qR2a8aihnr6sZmfGqpZx9r3ZkxreOfNgD60Zm9sB6kRmv+srZDxtEZrwaKmdvbBSZ8W0sn6WF1yaRmX2yaWTGq5ly9szmkRmvFsrZP1tGZnxbyYe9tCQys5e2jsx4tVHOvto2MuPVTjl7bPvIjG8H+bDfdozM7LedIjNenZWz93aJzHh1Vc4+3C0y49tdPuzJPSIze3LPyIxXL+Xsz70jM159lLNX943M+PaTD/t2/8jMvj0gMuM1UDl7+KDIjNdg5eznQyIzvkPlw94+LDKztw+PzHiNUM4+PzIy41WqnD1/VGTGd7R82P/HRGb2/7GRGa9xynkuMD4y4zVBOc8LJkZmfCfJh+cIkyMzzxGmRGa8pirn+cK0yIzXdOU8d5gRmfGdKZ81hddZkZnnEbMjM15zlPOcYm5kxmuecp5fzI/M+G4FBTtWIAAA</EDGE>
<ELEMENT>
<T COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJxd1FVXVVEARWFMbFRAxUJFCVtsUQELBREFQbEbFLFAsbu7u7u7u+tX+TL3g5OXb6w17hlnXc49OyLi/79qWF05WANr6nMh18La+nzoI7GOrgu5LtbTdaGvjw10n4bYSPeNVB+FjXXfkJvourrqm2K0doYco5311cdiM32P5thCOxuqj8OW2Ei5lXZGqW+NbbCxclvtbKI+HtvpPu2xg3ZGq0/Ajhij3Ek7Y9UnYhI2U07WzubqU7Azhv9rF+yqnXHqu2F3bKncQztbqe+JvbC1cqp2tlHfG/tgeC59sZ92xqvvjwOwnfJA7WyvfhCmYQflwdqZoH4IDsXw3NMxQzs7qc/EYZioPFw7k9SPwJGYrDxKO1PUZ+FoDL+jMZitnV3U5+BY7Kqcq53d1I/DPOyuPF47e6ifgPkYnnMBTtTOXuoLsQhTlSdpZ2/1k7EY+yhP0c6+6qfiNAy/6+k4Qzv7q5+Js3CA8mztHKh+Ds7FQcrztDNN/XxcgOG9KMFS7RyifiEuwqHKZdqZrn4xlmOG8hLtzFS/FJdheO+W4wrtHK6+AitxhPJK7RypfhVW4Sjl1dqZpX4NrsXwHq/D9do5Rv0G3IjZypu0M0f9ZtyCY5W3ameu+m24HcN7tgN3amee+l24G8cr79HOCer34j7MV96vnQXqD+BBDOfKITysnYXqj+BRLFI+pp2T1B/HEzhZ+aR2Fqs/hacxnEtn8Kx2TlV/Ds/jNOUL2jld/UW8hDOUL2vnTPVX8CrOwmt4XTtnq7+BN3GO8i3tnKv+Nt7Becp3tXO++nt4H8M5+gAfameJ+kf4GEuVn2jnQvVP8RkuUn6unWXqX+BLDOfcK3ytneXq3+BbXKL8TjuXqn+PH3CZ8kftXK7+E37GcK5/wa/aWaH+G37HSuUf2rlS/U/8hauUf2tnlfo/+Bf/AaMsqa4A</T>
<Q COMPRESSED="B64Z-LittleEndian" BITSIZE="64">eJxdzudXyGEYh/H7JyNbWSkrI0X2HsnKykz8LRQyouxkK3tVVvEnOMc5jhmS7BkRITvSC9eb+/u8+Zzne+4X11L7/67iNbyOl3CZ7DfwJl7GNNlvYSlewXS8jXfwrnQsl70M70nHCtnL8b50rMQKfIAPpSND9kf4WDpWyf4En0rHanyGz/GFdKyR/SW+ko61sr/GSunIxDf4FqukY53s7/C9dKyXvRo/SEcWfsQa/CQd2bJ/xi/SsUH2WvwqHRvxG37HH9KxSfaf+Es6Nsv+G+ukYwv+wb9YLx1bZf+HFviObbIH2CjwHTkYwt4YmwS+Y7v5vSk2C3xHrvk9FJtLxw7uWvBvia2kY6f5vTW2kY5d5ve22E46dnMXxj8c20vHHvN7B+woHXvN752ws3Ts4y6CfxeMlI795vco7Codeeb3bthdOvK568G/J0ZLxwHzey/sLR0Hze99sK90HOIuhn8/jJWOw+b3OOwvHUfM7wMwXjqOcjeQ/yAcLB3HzO9DcKh0HDe/D8Ph0nGCuxH8R+Io6Thpfh+NY6TjlPl9LI6TjgLuxvOfgAnSUWh+n4iJ0lFkfp+Ek6XjNHdT+E/FadJxxvyehNOl46z5fQbOlI5z3M3iPxuTpeO8+X0OzpWOYvP7PJwvHSXcLeC/EFOk44L5fRGmSsdF8/tiXCIdDf4Tj24A</Q>
</ELEMENT>
<COMPOSITE>
<C ID="1"> T[0-119] </C>
<C ID="2"> Q[120-179] </C>
<C ID="100"> E[0,13,23,33,43,53,63,73,83,93,103,113,123,133,143,153,163,173,183,193,203,210,217,224,231,238,245,252,259,266,273,280,287,294,301,308,315,322,329,336] </C>
<C ID="200"> E[12,22,32,42,52,62,72,82,92,102,112,122,132,142,152,162,172,182,192,202,209,216,223,230,237,244,251,258,265,272,279,286,293,300,307,314,321,328,335,342] </C>
<C ID="300"> E[10,6,2] </C>
<C ID="400"> E[337,339,341] </C>
</COMPOSITE>
<DOMAIN> C[1-2] </DOMAIN>
</GEOMETRY>
<EXPANSIONS>
<E COMPOSITE="C[1]" NUMMODES="2" TYPE="MODIFIED" FIELDS="u" />
<E COMPOSITE="C[2]" NUMMODES="2" TYPE="MODIFIED" FIELDS="u" />
</EXPANSIONS>
</NEKTAR>
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>Euler 2D shocktube with mixed mesh and Laplacian AV</description>
<executable>CompressibleFlowSolver</executable>
<parameters>ShockTube_2D_mixedMesh.xml ShockTube_2D_mixedMesh_Lap.xml</parameters>
<files>
<file description="Mesh File">ShockTube_2D_mixedMesh.xml</file>
<file description="Session File">ShockTube_2D_mixedMesh_Lap.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">0.000367418</value>
<value variable="rhou" tolerance="1e-10">0.110602</value>
<value variable="rhov" tolerance="1e-12">0.00309297</value>
<value variable="E" tolerance="1e-6">999.27</value>
</metric>
<metric type="Linf" id="2">
<value variable="rho" tolerance="1e-11">0.0113659</value>
<value variable="rhou" tolerance="1e-9">2.70304</value>
<value variable="rhov" tolerance="1e-10">0.406501</value>
<value variable="E" tolerance="1e-6">30654.9</value>
</metric>
</metrics>
</test>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<NEKTAR>
<EXPANSIONS>
<E
COMPOSITE="C[1]"
BASISTYPE="Modified_A,Modified_B" NUMMODES="4,4"
POINTSTYPE="GaussLobattoLegendre,GaussRadauMAlpha1Beta0" NUMPOINTS="5,4"
FIELDS="rho,rhou,rhov,E"
/>
<E
COMPOSITE="C[2]"
BASISTYPE="Modified_A,Modified_A" NUMMODES="4,4"
POINTSTYPE="GaussLobattoLegendre,GaussLobattoLegendre" NUMPOINTS="5,5"
FIELDS="rho,rhou,rhov,E"
/>
</EXPANSIONS>
<CONDITIONS>
<PARAMETERS>
<P> TimeStep = 1.0e-8 </P>
<P> NumSteps = 1 </P>
<P> IO_CheckSteps = 100 </P>
<P> IO_InfoSteps = 1 </P>
<!-- Stationary shock -->
<P> GasConstant = 287.058 </P>
<P> Gamma = 1.4 </P>
<P> Gp1 = Gamma + 1.0 </P>
<P> Gm1 = Gamma - 1.0 </P>
<P> G2 = 2.0 * Gamma </P>
<P> x0 = 0.50 </P>
<P> st = 0.01 </P>
<!-- Left State -->
<P> Ml = 8.0 </P>
<P> Tl = 298 </P>
<P> cl = sqrt(Gamma * GasConstant * Tl) </P>
<P> rhol = 1.2 </P>
<P> ul = cl * Ml </P>
<P> vl = 0.0 </P>
<P> pl = GasConstant * rhol * Tl </P>
<P> El = pl / Gm1 + 0.5 * rhol * (ul*ul + vl*vl) </P>
<!-- Right State -->
<P> rhor_rhol = Gp1 * Ml^2 /( 2.0 + Gm1* Ml^2) </P>
<P> rhor = rhol * rhor_rhol </P>
<P> pr_pl = 1 + G2/Gp1*(Ml^2-1) </P>
<P> pr = pl * pr_pl </P>
<P> ur = ul / rhor_rhol </P>
<P> vr = 0.0 </P>
<P> Er = pr / Gm1 + 0.5 * rhor * (ur*ur + vr*vr) </P>
<P> Pr = 0.72 </P>
<P> Cp = (Gamma / Gm1 )*GasConstant </P>
</PARAMETERS>
<SOLVERINFO>
<I PROPERTY="EQType" VALUE="EulerCFE" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
<I PROPERTY="UpwindType" VALUE="Roe" />
<I PROPERTY="ProblemType" VALUE="General" />
<I PROPERTY="ShockCaptureType" VALUE="NonSmooth" />
</SOLVERINFO>
<VARIABLES>
<V ID="0"> rho </V>
<V ID="1"> rhou </V>
<V ID="2"> rhov </V>
<V ID="3"> E </V>
</VARIABLES>
<BOUNDARYREGIONS>
<!-- Inflow -->
<B ID="0"> C[300] </B>
<!-- Slip -->
<B ID="1"> C[100] </B>
<!-- Outflow -->
<B ID="2"> C[400] </B>
<!-- Slip -->
<B ID="3"> C[200] </B>
</BOUNDARYREGIONS>
<BOUNDARYCONDITIONS>
<!-- Periodic -->
<REGION REF="1">
<P VAR="rho" VALUE="[3]" />
<P VAR="rhou" VALUE="[3]" />
<P VAR="rhov" VALUE="[3]" />
<P VAR="E" VALUE="[3]" />
</REGION>
<REGION REF="3">
<P VAR="rho" VALUE="[1]" />
<P VAR="rhou" VALUE="[1]" />
<P VAR="rhov" VALUE="[1]" />
<P VAR="E" VALUE="[1]" />
</REGION>
<!-- Inflow -->
<REGION REF="0">
<D VAR="rho" VALUE="rhol" />
<D VAR="rhou" VALUE="rhol * ul" />
<D VAR="rhov" VALUE="rhol * vl" />
<D VAR="E" VALUE="El" />
</REGION>
<!-- Outflow -->
<REGION REF="2">
<D VAR="rho" VALUE="rhor" />
<D VAR="rhou" VALUE="rhor * ur" />
<D VAR="rhov" VALUE="rhor * vr" />
<D VAR="E" VALUE="Er" />
</REGION>
</BOUNDARYCONDITIONS>
<FUNCTION NAME="InitialConditions">
<E VAR="rho" VALUE="rhol + 0.5*(1+tanh((x-x0)/st))*(rhor-rhol)" />
<E VAR="rhou" VALUE="rhol * ul + 0.5*(1+tanh((x-x0)/st))*(rhor*ur-rhol*ul)" />
<E VAR="rhov" VALUE="0" />
<E VAR="E" VALUE="El + 0.5*(1+tanh((x-x0)/st))*(Er-El)" />
</FUNCTION>
<FUNCTION NAME="ExactSolution">
<E VAR="rho" VALUE="rhol + 0.5*(1+tanh((x-x0)/st))*(rhor-rhol)" />
<E VAR="rhou" VALUE="rhol * ul + 0.5*(1+tanh((x-x0)/st))*(rhor*ur-rhol*ul)" />
<E VAR="rhov" VALUE="0" />
<E VAR="E" VALUE="El + 0.5*(1+tanh((x-x0)/st))*(Er-El)" />
</FUNCTION>
</CONDITIONS>
</NEKTAR>
\ No newline at end of file
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