Commit 66d102c0 authored by Gianmarco Mengaldo's avatar Gianmarco Mengaldo
Browse files

Inserted new parameters. Fixed regression tests (due to evaluation IBC).

parent 0d2a16fe
......@@ -9,15 +9,15 @@
</files>
<metrics>
<metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">42.8519</value>
<value variable="rhou" tolerance="1e-12">4.28832</value>
<value variable="rhov" tolerance="1e-12">0.0808749</value>
<value variable="E" tolerance="1e-12">5.24313</value>
<value variable="rho" tolerance="1e-12">42.8503</value>
<value variable="rhou" tolerance="1e-12">4.28809</value>
<value variable="rhov" tolerance="1e-12">0.0812521</value>
<value variable="E" tolerance="1e-12">5.24289</value>
</metric>
<metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">1.32074</value>
<value variable="rhou" tolerance="1e-12">0.198898</value>
<value variable="rhov" tolerance="1e-12">0.114009</value>
<value variable="rhou" tolerance="1e-12">0.200515</value>
<value variable="rhov" tolerance="1e-12">0.358861</value>
<value variable="E" tolerance="1e-12">0.159723</value>
</metric>
</metrics>
......
......@@ -738,17 +738,17 @@
<CONDITIONS>
<PARAMETERS>
<P> TimeStep = 0 </P>
<P> FinTime = 0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 10000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> rho0 = 1.225 </P>
<P> rhou0 = 0.1225 </P>
<P> rhov0 = 0.0 </P>
<P> E0 = 0.149875 </P>
<P> CFL = 0.02 </P>
<P> TimeStep = 0 </P>
<P> FinTime = 0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 10000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> pInf = 101325 </P>
<P> rhoInf = 1.225 </P>
<P> uInf = 0.1 </P>
<P> vInf = 0.0 </P>
<P> CFL = 0.02 </P>
</PARAMETERS>
<SOLVERINFO>
......@@ -775,16 +775,22 @@
<BOUNDARYCONDITIONS>
<REGION REF="0">
<D VAR="rho" VALUE="rho0" />
<D VAR="rhou" VALUE="rhou0" />
<D VAR="rhov" VALUE="rhov0" />
<D VAR="E" VALUE="E0" />
<D VAR="rho" VALUE="rhoInf" />
<D VAR="rhou" VALUE="rhoInf * uInf" />
<D VAR="rhov" VALUE="rhoInf * vInf" />
<!-- Temporary value for E-->
<D VAR="E" VALUE="0.0149875" />
<!-- Proper equation to compute E -->
<!--D VAR="E" VALUE="pInf / (Gamma - 1) + 0.5 * rhoInf * (uInf * uInf + vInf * vInf)"/-->
</REGION>
<REGION REF="1">
<D VAR="rho" VALUE="rho0" />
<D VAR="rhou" VALUE="rhou0" />
<D VAR="rhov" VALUE="rhov0" />
<D VAR="E" VALUE="E0" />
<D VAR="rho" VALUE="rhoInf" />
<D VAR="rhou" VALUE="rhoInf * uInf" />
<D VAR="rhov" VALUE="rhoInf * vInf" />
<!-- Temporary value for E-->
<D VAR="E" VALUE="0.0149875" />
<!-- Proper equation to compute E -->
<!--D VAR="E" VALUE="pInf / (Gamma - 1) + 0.5 * rhoInf * (uInf * uInf + vInf * vInf)"/-->
</REGION>
<REGION REF="2">
<D VAR="rho" USERDEFINEDTYPE="Wall" VALUE="0"/>
......
......@@ -8,16 +8,16 @@
</files>
<metrics>
<metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">10.7729</value>
<value variable="rhou" tolerance="1e-12">1.07719</value>
<value variable="rhov" tolerance="1e-12">0.00234645</value>
<value variable="E" tolerance="1e-12">1.23115</value>
<value variable="rho" tolerance="1e-12">10.7745</value>
<value variable="rhou" tolerance="1e-12">1.07744</value>
<value variable="rhov" tolerance="1e-12">0.000452004</value>
<value variable="E" tolerance="1e-12">0.131822</value>
</metric>
<metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">1.28604</value>
<value variable="rhou" tolerance="1e-12">0.124984</value>
<value variable="rhov" tolerance="1e-12">0.0090395</value>
<value variable="E" tolerance="1e-12">0.149695</value>
<value variable="rho" tolerance="1e-12">1.28742</value>
<value variable="rhou" tolerance="1e-12">0.124093</value>
<value variable="rhov" tolerance="1e-12">0.00381254</value>
<value variable="E" tolerance="1e-12">0.0159379</value>
</metric>
</metrics>
</test>
......
......@@ -2830,16 +2830,16 @@
<CONDITIONS>
<PARAMETERS>
<P> TimeStep = 0.001 </P>
<P> FinTime = 0.0 </P>
<P> NumSteps = 5 </P>
<P> TimeStep = 0.001 </P>
<P> FinTime = 0.0 </P>
<P> NumSteps = 5 </P>
<P> IO_CheckSteps = 100 </P>
<P> IO_InfoSteps = 10 </P>
<P> Gamma = 1.4 </P>
<P> rho0 = 1.225 </P>
<P> rhou0 = 0.1225 </P>
<P> rhov0 = 0.0 </P>
<P> E0 = 0.14 </P>
<P> pInf = 101325 </P>
<P> rhoInf = 1.225 </P>
<P> uInf = 0.1 </P>
<P> vInf = 0.0 </P>
</PARAMETERS>
<SOLVERINFO>
......@@ -2866,30 +2866,39 @@
<BOUNDARYCONDITIONS>
<REGION REF="0">
<D VAR="rho" VALUE="1.225" />
<D VAR="rhou" VALUE="0.1225" />
<D VAR="rhov" VALUE="0.0" />
<D VAR="E" VALUE="0.0149875"/>
<D VAR="rho" VALUE="rhoInf" />
<D VAR="rhou" VALUE="rhoInf * uInf" />
<D VAR="rhov" VALUE="rhoInf * vInf" />
<!-- Temporary value for E-->
<D VAR="E" VALUE="0.0149875" />
<!-- Proper equation to compute E -->
<!--D VAR="E" VALUE="pInf / (Gamma - 1) + 0.5 * rhoInf * (uInf * uInf + vInf * vInf)"/-->
</REGION>
<REGION REF="1">
<D VAR="rho" VALUE="1.225" />
<D VAR="rhou" VALUE="0.1225" />
<D VAR="rhov" VALUE="0.0" />
<D VAR="E" VALUE="0.0149875"/>
<D VAR="rho" VALUE="rhoInf" />
<D VAR="rhou" VALUE="rhoInf * uInf" />
<D VAR="rhov" VALUE="rhoInf * vInf" />
<!-- Temporary value for E-->
<D VAR="E" VALUE="0.0149875" />
<!-- Proper equation to compute E -->
<!--D VAR="E" VALUE="pInf / (Gamma - 1) + 0.5 * rhoInf * (uInf * uInf + vInf * vInf)"/-->
</REGION>
<REGION REF="2">
<D VAR="rho" USERDEFINEDTYPE="Wall" VALUE="0" />
<D VAR="rhou" USERDEFINEDTYPE="Wall" VALUE="0" />
<D VAR="rhov" USERDEFINEDTYPE="Wall" VALUE="0" />
<D VAR="E" USERDEFINEDTYPE="Wall" VALUE="0" />
<D VAR="rho" USERDEFINEDTYPE="Wall" VALUE="0"/>
<D VAR="rhou" USERDEFINEDTYPE="Wall" VALUE="0"/>
<D VAR="rhov" USERDEFINEDTYPE="Wall" VALUE="0"/>
<D VAR="E" USERDEFINEDTYPE="Wall" VALUE="0"/>
</REGION>
</BOUNDARYCONDITIONS>
<FUNCTION NAME="InitialConditions">
<E VAR="rho" VALUE="rho0" />
<E VAR="rhou" VALUE="rhou0" />
<E VAR="rhov" VALUE="rhov0" />
<E VAR="E" VALUE="E0" />
<E VAR="rho" VALUE="rhoInf" />
<E VAR="rhou" VALUE="rhoInf * uInf" />
<E VAR="rhov" VALUE="rhoInf * vInf" />
<!-- Temporary value for E-->
<E VAR="E" VALUE="0.0149875" />
<!-- Proper equation to compute E -->
<!--E VAR="E" VALUE="pInf / (Gamma - 1) + 0.5 * rhoInf * (uInf * uInf + vInf * vInf)"/-->
</FUNCTION>
</CONDITIONS>
......
......@@ -9,10 +9,10 @@
</files>
<metrics>
<metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">42.8519</value>
<value variable="rhou" tolerance="1e-12">4.28824</value>
<value variable="rhov" tolerance="1e-12">0.0805562</value>
<value variable="E" tolerance="1e-12">5.24314</value>
<value variable="rho" tolerance="1e-12">42.8326</value>
<value variable="rhou" tolerance="1e-12">4.28538</value>
<value variable="rhov" tolerance="1e-12">0.081067</value>
<value variable="E" tolerance="1e-12">5.24021</value>
</metric>
<metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">1.32134</value>
......
......@@ -723,17 +723,17 @@
<CONDITIONS>
<PARAMETERS>
<P> TimeStep = 0 </P>
<P> FinTime = 0.0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 10000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> rho0 = 1.225 </P>
<P> rhou0 = 0.1225 </P>
<P> rhov0 = 0.0 </P>
<P> E0 = 0.149875 </P>
<P> CFL = 0.02 </P>
<P> TimeStep = 0 </P>
<P> FinTime = 0.0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 10000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> pInf = 101325 </P>
<P> rhoInf = 1.225 </P>
<P> uInf = 0.1 </P>
<P> vInf = 0.0 </P>
<P> CFL = 0.02 </P>
</PARAMETERS>
<SOLVERINFO>
......@@ -760,16 +760,22 @@
<BOUNDARYCONDITIONS>
<REGION REF="0">
<D VAR="rho" VALUE="rho0" />
<D VAR="rhou" VALUE="rhou0" />
<D VAR="rhov" VALUE="rhov0" />
<D VAR="E" VALUE="E0" />
<D VAR="rho" VALUE="rhoInf" />
<D VAR="rhou" VALUE="rhoInf * uInf" />
<D VAR="rhov" VALUE="rhoInf * vInf" />
<!-- Temporary value for E-->
<D VAR="E" VALUE="0.0149875" />
<!-- Proper equation to compute E -->
<!--D VAR="E" VALUE="pInf / (Gamma - 1) + 0.5 * rhoInf * (uInf * uInf + vInf * vInf)"/-->
</REGION>
<REGION REF="1">
<D VAR="rho" VALUE="rho0" />
<D VAR="rhou" VALUE="rhou0" />
<D VAR="rhov" VALUE="rhov0" />
<D VAR="E" VALUE="E0" />
<D VAR="rho" VALUE="rhoInf" />
<D VAR="rhou" VALUE="rhoInf * uInf" />
<D VAR="rhov" VALUE="rhoInf * vInf" />
<!-- Temporary value for E-->
<D VAR="E" VALUE="0.0149875" />
<!-- Proper equation to compute E -->
<!--D VAR="E" VALUE="pInf / (Gamma - 1) + 0.5 * rhoInf * (uInf * uInf + vInf * vInf)"/-->
</REGION>
<REGION REF="2">
<D VAR="rho" USERDEFINEDTYPE="Wall" VALUE="0"/>
......
......@@ -9,16 +9,16 @@
</files>
<metrics>
<metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">42.8519</value>
<value variable="rhou" tolerance="1e-12">4.28839</value>
<value variable="rhov" tolerance="1e-12">0.0809356</value>
<value variable="E" tolerance="1e-12">5.24313</value>
<value variable="rho" tolerance="1e-12">42.7796</value>
<value variable="rhou" tolerance="1e-12">4.27885</value>
<value variable="rhov" tolerance="1e-12">0.114976</value>
<value variable="E" tolerance="1e-12">5.23226</value>
</metric>
<metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">1.3205</value>
<value variable="rho" tolerance="1e-12">1.3692</value>
<value variable="rhou" tolerance="1e-12">0.198933</value>
<value variable="rhov" tolerance="1e-12">0.114663</value>
<value variable="E" tolerance="1e-12">0.159681</value>
<value variable="E" tolerance="1e-12">0.172389</value>
</metric>
</metrics>
</test>
......
......@@ -722,17 +722,17 @@
<CONDITIONS>
<PARAMETERS>
<P> TimeStep = 0 </P>
<P> FinTime = 0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 10000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> rho0 = 1.225 </P>
<P> rhou0 = 0.1225 </P>
<P> rhov0 = 0.0 </P>
<P> E0 = 0.149875 </P>
<P> CFL = 1.0 </P>
<P> TimeStep = 0 </P>
<P> FinTime = 0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 10000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> pInf = 101325 </P>
<P> rhoInf = 1.225 </P>
<P> uInf = 0.1 </P>
<P> vInf = 0.0 </P>
<P> CFL = 1.0 </P>
</PARAMETERS>
<SOLVERINFO>
......@@ -759,16 +759,22 @@
<BOUNDARYCONDITIONS>
<REGION REF="0">
<D VAR="rho" VALUE="rho0" />
<D VAR="rhou" VALUE="rhou0" />
<D VAR="rhov" VALUE="rhov0" />
<D VAR="E" VALUE="E0" />
<D VAR="rho" VALUE="rhoInf" />
<D VAR="rhou" VALUE="rhoInf * uInf" />
<D VAR="rhov" VALUE="rhoInf * vInf" />
<!-- Temporary value for E-->
<D VAR="E" VALUE="0.0149875" />
<!-- Proper equation to compute E -->
<!--D VAR="E" VALUE="pInf / (Gamma - 1) + 0.5 * rhoInf * (uInf * uInf + vInf * vInf)"/-->
</REGION>
<REGION REF="1">
<D VAR="rho" VALUE="rho0" />
<D VAR="rhou" VALUE="rhou0" />
<D VAR="rhov" VALUE="rhov0" />
<D VAR="E" VALUE="E0" />
<D VAR="rho" VALUE="rhoInf" />
<D VAR="rhou" VALUE="rhoInf * uInf" />
<D VAR="rhov" VALUE="rhoInf * vInf" />
<!-- Temporary value for E-->
<D VAR="E" VALUE="0.0149875" />
<!-- Proper equation to compute E -->
<!--D VAR="E" VALUE="pInf / (Gamma - 1) + 0.5 * rhoInf * (uInf * uInf + vInf * vInf)"/-->
</REGION>
<REGION REF="2">
<D VAR="rho" USERDEFINEDTYPE="Wall" VALUE="0"/>
......
......@@ -1119,17 +1119,17 @@
<CONDITIONS>
<PARAMETERS>
<P> FinTime = 0 </P>
<P> TimeStep = 0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 1000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> rho0 = 1.225 </P>
<P> rhou0 = 0.1225 </P>
<P> rhov0 = 0.0 </P>
<P> E0 = 0.149875 </P>
<P> CFL = 0.02 </P>
<P> FinTime = 0 </P>
<P> TimeStep = 0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 1000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> pInf = 101325 </P>
<P> rhoInf = 1.225 </P>
<P> uInf = 0.1 </P>
<P> vInf = 0.0 </P>
<P> CFL = 0.02 </P>
</PARAMETERS>
<SOLVERINFO>
......@@ -1161,12 +1161,14 @@
</REGION>
</BOUNDARYCONDITIONS>
<FUNCTION NAME="InitialConditions">
<!-- Initial conditions not necessary
since they are imposed analitically -->
<!--FUNCTION NAME="InitialConditions">
<E VAR="rho" VALUE="1"/>
<E VAR="rhou" VALUE="1"/>
<E VAR="rhov" VALUE="1"/>
<E VAR="E" VALUE="1"/>
</FUNCTION>
</FUNCTION-->
</CONDITIONS>
......
......@@ -1119,17 +1119,17 @@
<CONDITIONS>
<PARAMETERS>
<P> FinTime = 0 </P>
<P> TimeStep = 0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 1000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> rho0 = 1.225 </P>
<P> rhou0 = 0.1225 </P>
<P> rhov0 = 0.0 </P>
<P> E0 = 0.149875 </P>
<P> CFL = 0.02 </P>
<P> FinTime = 0 </P>
<P> TimeStep = 0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 1000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> pInf = 101325 </P>
<P> rhoInf = 1.225 </P>
<P> uInf = 0.1 </P>
<P> vInf = 0.0 </P>
<P> CFL = 0.02 </P>
</PARAMETERS>
<SOLVERINFO>
......@@ -1161,12 +1161,14 @@
</REGION>
</BOUNDARYCONDITIONS>
<FUNCTION NAME="InitialConditions">
<!-- Initial conditions not necessary
since they are imposed analitically -->
<!--FUNCTION NAME="InitialConditions">
<E VAR="rho" VALUE="1"/>
<E VAR="rhou" VALUE="1"/>
<E VAR="rhov" VALUE="1"/>
<E VAR="E" VALUE="1"/>
</FUNCTION>
</FUNCTION-->
</CONDITIONS>
......
......@@ -49,17 +49,17 @@
<CONDITIONS>
<PARAMETERS>
<P> FinTime = 0.6 </P>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 0 </P>
<P> IO_CheckSteps = 100 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> rho0 = 1.225 </P>
<P> rhou0 = 0.1225 </P>
<P> rhov0 = 0.0 </P>
<P> E0 = 0.14 </P>
<P> CFL = 0 </P>
<P> FinTime = 0.6 </P>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 0 </P>
<P> IO_CheckSteps = 100 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> pInf = 101325 </P>
<P> rhoInf = 1.225 </P>
<P> uInf = 0.1 </P>
<P> vInf = 0.0 </P>
<P> CFL = 0 </P>
</PARAMETERS>
<SOLVERINFO>
......
......@@ -49,17 +49,17 @@
<CONDITIONS>
<PARAMETERS>
<P> FinTime = 0.6 </P>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 0 </P>
<P> IO_CheckSteps = 100 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> rho0 = 1.225 </P>
<P> rhou0 = 0.1225 </P>
<P> rhov0 = 0.0 </P>
<P> E0 = 0.14 </P>
<P> CFL = 0 </P>
<P> FinTime = 0.6 </P>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 0 </P>
<P> IO_CheckSteps = 100 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> pInf = 101325 </P>
<P> rhoInf = 1.225 </P>
<P> uInf = 0.1 </P>
<P> vInf = 0.0 </P>
<P> CFL = 0 </P>
</PARAMETERS>
<SOLVERINFO>
......@@ -123,5 +123,6 @@
<E VAR="rhov" VALUE="1"/>
<E VAR="E" VALUE="1"/>
</FUNCTION-->
</CONDITIONS>
</NEKTAR>
......@@ -49,17 +49,17 @@
<CONDITIONS>
<PARAMETERS>
<P> FinTime = 0.6 </P>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 0 </P>
<P> IO_CheckSteps = 100 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> rho0 = 1.225 </P>
<P> rhou0 = 0.1225 </P>
<P> rhov0 = 0.0 </P>
<P> E0 = 0.14 </P>
<P> CFL = 0 </P>
<P> FinTime = 0.6 </P>
<P> TimeStep = 0.01 </P>
<P> NumSteps = 0 </P>
<P> IO_CheckSteps = 100 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> pInf = 101325 </P>
<P> rhoInf = 1.225 </P>
<P> uInf = 0.1 </P>
<P> vInf = 0.0 </P>
<P> CFL = 0 </P>
</PARAMETERS>
<SOLVERINFO>
......@@ -123,5 +123,6 @@
<E VAR="rhov" VALUE="1"/>
<E VAR="E" VALUE="1"/>
</FUNCTION-->
</CONDITIONS>
</NEKTAR>
......@@ -333,17 +333,17 @@
<CONDITIONS>
<PARAMETERS>
<P> TimeStep = 0 </P>
<P> FinTime = 0.0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 10000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> rho0 = 1.225 </P>
<P> rhou0 = 0.1225 </P>
<P> rhov0 = 0.0 </P>
<P> E0 = 0.149875 </P>
<P> CFL = 0.02 </P>
<P> TimeStep = 0 </P>
<P> FinTime = 0.0 </P>
<P> NumSteps = 10 </P>
<P> IO_CheckSteps = 10000 </P>
<P> IO_InfoSteps = 100 </P>
<P> Gamma = 1.4 </P>
<P> pInf = 101325 </P>
<P> rhoInf = 1.225 </P>
<P> uInf = 0.1 </P>
<P> vInf = 0.0 </P>
<P> CFL = 0.02 </P>
</PARAMETERS>
<SOLVERINFO>
......