Commit 6bcd183d authored by Douglas Serson's avatar Douglas Serson
Browse files

Change seed for CFS and adjust test results

parent 9cd1a0ab
...@@ -709,10 +709,12 @@ namespace Nektar ...@@ -709,10 +709,12 @@ namespace Nektar
if (Noise > 0.0) if (Noise > 0.0)
{ {
int seed = - m_comm->GetRank()*m_nConvectiveFields;
for (int i = 0; i < m_nConvectiveFields; i++) for (int i = 0; i < m_nConvectiveFields; i++)
{ {
Vmath::FillWhiteNoise(phystot, Noise, noise, 1, Vmath::FillWhiteNoise(phystot, Noise, noise, 1,
m_comm->GetColumnComm()->GetRank()+1); seed);
--seed;
Vmath::Vadd(phystot, m_fields[i]->GetPhys(), 1, Vmath::Vadd(phystot, m_fields[i]->GetPhys(), 1,
noise, 1, m_fields[i]->UpdatePhys(), 1); noise, 1, m_fields[i]->UpdatePhys(), 1);
m_fields[i]->FwdTrans_IterPerExp(m_fields[i]->GetPhys(), m_fields[i]->FwdTrans_IterPerExp(m_fields[i]->GetPhys(),
......
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
</files> </files>
<metrics> <metrics>
<metric type="L2" id="1"> <metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">0.000483502</value> <value variable="rho" tolerance="1e-12">0.000483148</value>
<value variable="rhou" tolerance="1e-12">48.1265</value> <value variable="rhou" tolerance="1e-12">48.1265</value>
<value variable="rhov" tolerance="1e-12">0.17737</value> <value variable="rhov" tolerance="1e-12">0.177369</value>
<value variable="rhow" tolerance="1e-12">7.15155e-06</value> <value variable="rhow" tolerance="1e-12">7.074e-06</value>
<value variable="E" tolerance="1e-12">17518.9</value> <value variable="E" tolerance="1e-12">17518.9</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.00208788</value> <value variable="rho" tolerance="1e-12">0.00207205</value>
<value variable="rhou" tolerance="1e-12">83.3318</value> <value variable="rhou" tolerance="1e-12">83.3318</value>
<value variable="rhov" tolerance="1e-12">0.752415</value> <value variable="rhov" tolerance="1e-12">0.7524</value>
<value variable="rhow" tolerance="1e-12">4.89968e-05</value> <value variable="rhow" tolerance="1e-12">3.34657e-05</value>
<value variable="E" tolerance="1e-12">18726.1</value> <value variable="E" tolerance="1e-12">18726.1</value>
</metric> </metric>
</metrics> </metrics>
......
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
</files> </files>
<metrics> <metrics>
<metric type="L2" id="1"> <metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">0.000483502</value> <value variable="rho" tolerance="1e-12">0.000483148</value>
<value variable="rhou" tolerance="1e-12">48.1265</value> <value variable="rhou" tolerance="1e-12">48.1265</value>
<value variable="rhov" tolerance="1e-12">0.17737</value> <value variable="rhov" tolerance="1e-12">0.177369</value>
<value variable="rhow" tolerance="1e-12"> 7.15155e-06</value> <value variable="rhow" tolerance="1e-12"> 7.074e-06</value>
<value variable="E" tolerance="1e-12">17518.9</value> <value variable="E" tolerance="1e-12">17518.9</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.00208788</value> <value variable="rho" tolerance="1e-12">0.00207205</value>
<value variable="rhou" tolerance="1e-12">83.3318</value> <value variable="rhou" tolerance="1e-12">83.3318</value>
<value variable="rhov" tolerance="1e-12">0.752415</value> <value variable="rhov" tolerance="1e-12">0.7524</value>
<value variable="rhow" tolerance="1e-12">4.89968e-05</value> <value variable="rhow" tolerance="1e-12">3.34657e-05</value>
<value variable="E" tolerance="1e-12">18726.1</value> <value variable="E" tolerance="1e-12">18726.1</value>
</metric> </metric>
</metrics> </metrics>
......
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
</files> </files>
<metrics> <metrics>
<metric type="L2" id="1"> <metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">0.000397706</value> <value variable="rho" tolerance="1e-12">0.000397131</value>
<value variable="rhou" tolerance="1e-12">48.1295</value> <value variable="rhou" tolerance="1e-12">48.1295</value>
<value variable="rhov" tolerance="1e-8">0.145836</value> <value variable="rhov" tolerance="1e-8">0.145835</value>
<value variable="rhow" tolerance="1e-8">8.79652e-06</value> <value variable="rhow" tolerance="1e-8">9.3349e-06</value>
<value variable="E" tolerance="1e-12">17519.9</value> <value variable="E" tolerance="1e-12">17519.9</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.00139611</value> <value variable="rho" tolerance="1e-12">0.00139966</value>
<value variable="rhou" tolerance="1e-12">83.3516</value> <value variable="rhou" tolerance="1e-12">83.3517</value>
<value variable="rhov" tolerance="1e-8">0.505196</value> <value variable="rhov" tolerance="1e-8">0.50519</value>
<value variable="rhow" tolerance="1e-8">3.177e-05</value> <value variable="rhow" tolerance="1e-8">3.11563e-05</value>
<value variable="E" tolerance="1e-12">18953</value> <value variable="E" tolerance="1e-12">18953</value>
</metric> </metric>
</metrics> </metrics>
......
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
</files> </files>
<metrics> <metrics>
<metric type="L2" id="1"> <metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">0.000397706</value> <value variable="rho" tolerance="1e-12">0.000397131</value>
<value variable="rhou" tolerance="1e-12">48.1295</value> <value variable="rhou" tolerance="1e-12">48.1295</value>
<value variable="rhov" tolerance="1e-8">0.145836</value> <value variable="rhov" tolerance="1e-8">0.145835</value>
<value variable="rhow" tolerance="1e-8">8.79652e-06</value> <value variable="rhow" tolerance="1e-8">9.3349e-06</value>
<value variable="E" tolerance="1e-12">17519.9</value> <value variable="E" tolerance="1e-12">17519.9</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.00139611</value> <value variable="rho" tolerance="1e-12">0.00139966</value>
<value variable="rhou" tolerance="1e-12">83.3516</value> <value variable="rhou" tolerance="1e-12">83.3517</value>
<value variable="rhov" tolerance="1e-8">0.505196</value> <value variable="rhov" tolerance="1e-8">0.50519</value>
<value variable="rhow" tolerance="1e-8">3.177e-05</value> <value variable="rhow" tolerance="1e-8">3.11563e-05</value>
<value variable="E" tolerance="1e-12">18953</value> <value variable="E" tolerance="1e-12">18953</value>
</metric> </metric>
</metrics> </metrics>
......
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
</files> </files>
<metrics> <metrics>
<metric type="L2" id="1"> <metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">0.000391612</value> <value variable="rho" tolerance="1e-12">0.000391074</value>
<value variable="rhou" tolerance="1e-12">48.1285</value> <value variable="rhou" tolerance="1e-12">48.1285</value>
<value variable="rhov" tolerance="1e-12">0.143446</value> <value variable="rhov" tolerance="1e-12">0.143445</value>
<value variable="rhow" tolerance="1e-12"> 6.98852e-06</value> <value variable="rhow" tolerance="1e-12"> 6.90409e-06</value>
<value variable="E" tolerance="1e-12">17519.5</value> <value variable="E" tolerance="1e-12">17519.5</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.00164134</value> <value variable="rho" tolerance="1e-12">0.00162551</value>
<value variable="rhou" tolerance="1e-12">83.3449</value> <value variable="rhou" tolerance="1e-12">83.3449</value>
<value variable="rhov" tolerance="1e-12">0.5882</value> <value variable="rhov" tolerance="1e-12">0.588196</value>
<value variable="rhow" tolerance="1e-12">4.62189e-05</value> <value variable="rhow" tolerance="1e-12">3.33264e-05</value>
<value variable="E" tolerance="1e-12">18878.3</value> <value variable="E" tolerance="1e-12">18878.3</value>
</metric> </metric>
</metrics> </metrics>
......
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
</files> </files>
<metrics> <metrics>
<metric type="L2" id="1"> <metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">0.000391612</value> <value variable="rho" tolerance="1e-12">0.000391074</value>
<value variable="rhou" tolerance="1e-12">48.1285</value> <value variable="rhou" tolerance="1e-12">48.1285</value>
<value variable="rhov" tolerance="1e-12">0.143446</value> <value variable="rhov" tolerance="1e-12">0.143445</value>
<value variable="rhow" tolerance="1e-12"> 6.98852e-06</value> <value variable="rhow" tolerance="1e-12"> 6.90409e-06</value>
<value variable="E" tolerance="1e-12">17519.5</value> <value variable="E" tolerance="1e-12">17519.5</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.00164134</value> <value variable="rho" tolerance="1e-12">0.00162551</value>
<value variable="rhou" tolerance="1e-12">83.3449</value> <value variable="rhou" tolerance="1e-12">83.3449</value>
<value variable="rhov" tolerance="1e-12">0.5882</value> <value variable="rhov" tolerance="1e-12">0.588196</value>
<value variable="rhow" tolerance="1e-12">4.62189e-05</value> <value variable="rhow" tolerance="1e-12">3.33264e-05</value>
<value variable="E" tolerance="1e-12">18878.3</value> <value variable="E" tolerance="1e-12">18878.3</value>
</metric> </metric>
</metrics> </metrics>
......
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
</files> </files>
<metrics> <metrics>
<metric type="L2" id="1"> <metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">0.000397706</value> <value variable="rho" tolerance="1e-12">0.000397131</value>
<value variable="rhou" tolerance="1e-12">48.1295</value> <value variable="rhou" tolerance="1e-12">48.1295</value>
<value variable="rhov" tolerance="1e-12">0.145836</value> <value variable="rhov" tolerance="1e-12">0.145835</value>
<value variable="rhow" tolerance="1e-8">8.79652e-06</value> <value variable="rhow" tolerance="1e-8">9.33488e-06</value>
<value variable="E" tolerance="1e-12">17519.9</value> <value variable="E" tolerance="1e-12">17519.9</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.00139611</value> <value variable="rho" tolerance="1e-12">0.00139966</value>
<value variable="rhou" tolerance="1e-12">83.3516</value> <value variable="rhou" tolerance="1e-12">83.3517</value>
<value variable="rhov" tolerance="1e-12">0.505196</value> <value variable="rhov" tolerance="1e-12">0.50519</value>
<value variable="rhow" tolerance="1e-8">3.177e-05</value> <value variable="rhow" tolerance="1e-8">3.11565e-05</value>
<value variable="E" tolerance="1e-12">18953</value> <value variable="E" tolerance="1e-12">18953</value>
</metric> </metric>
</metrics> </metrics>
......
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
</files> </files>
<metrics> <metrics>
<metric type="L2" id="1"> <metric type="L2" id="1">
<value variable="rho" tolerance="1e-12">0.000397706</value> <value variable="rho" tolerance="1e-12">0.000397131</value>
<value variable="rhou" tolerance="1e-12">48.1295</value> <value variable="rhou" tolerance="1e-12">48.1295</value>
<value variable="rhov" tolerance="1e-12">0.145836</value> <value variable="rhov" tolerance="1e-12">0.145835</value>
<value variable="rhow" tolerance="1e-12">8.79677e-06</value> <value variable="rhow" tolerance="1e-12">9.33488e-06</value>
<value variable="E" tolerance="1e-12">17519.9</value> <value variable="E" tolerance="1e-12">17519.9</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.00139611</value> <value variable="rho" tolerance="1e-12">0.00139966</value>
<value variable="rhou" tolerance="1e-12">83.3516</value> <value variable="rhou" tolerance="1e-12">83.3517</value>
<value variable="rhov" tolerance="1e-12">0.505196</value> <value variable="rhov" tolerance="1e-12">0.50519</value>
<value variable="rhow" tolerance="1e-12">3.17716e-05</value> <value variable="rhow" tolerance="1e-12">3.11565e-05</value>
<value variable="E" tolerance="1e-12">18953</value> <value variable="E" tolerance="1e-12">18953</value>
</metric> </metric>
</metrics> </metrics>
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
<value variable="E" tolerance="1e-12">4.43372e+06</value> <value variable="E" tolerance="1e-12">4.43372e+06</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.297684</value> <value variable="rho" tolerance="1e-12">0.297688</value>
<value variable="rhou" tolerance="1e-12">86.8671</value> <value variable="rhou" tolerance="1e-12">86.8671</value>
<value variable="rhov" tolerance="1e-12"> 15.3684</value> <value variable="rhov" tolerance="1e-12"> 15.3684</value>
<value variable="rhow" tolerance="1e-12">1.00005</value> <value variable="rhow" tolerance="1e-12">1.00004</value>
<value variable="E" tolerance="1e-12">277512</value> <value variable="E" tolerance="1e-12">277513</value>
</metric> </metric>
</metrics> </metrics>
</test> </test>
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
<value variable="E" tolerance="1e-12">4.43372e+06</value> <value variable="E" tolerance="1e-12">4.43372e+06</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.297684</value> <value variable="rho" tolerance="1e-12">0.297688</value>
<value variable="rhou" tolerance="1e-12">86.8671</value> <value variable="rhou" tolerance="1e-12">86.8671</value>
<value variable="rhov" tolerance="1e-12"> 15.3684</value> <value variable="rhov" tolerance="1e-12"> 15.3684</value>
<value variable="rhow" tolerance="1e-12">1.00005</value> <value variable="rhow" tolerance="1e-12">1.00004</value>
<value variable="E" tolerance="1e-12">277512</value> <value variable="E" tolerance="1e-12">277513</value>
</metric> </metric>
</metrics> </metrics>
</test> </test>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<value variable="E" tolerance="1e-12">4.43372e+06</value> <value variable="E" tolerance="1e-12">4.43372e+06</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12"> 0.275032</value> <value variable="rho" tolerance="1e-12"> 0.275036</value>
<value variable="rhou" tolerance="1e-12">82.5652</value> <value variable="rhou" tolerance="1e-12">82.5652</value>
<value variable="rhov" tolerance="1e-8">10.8489</value> <value variable="rhov" tolerance="1e-8">10.8489</value>
<value variable="rhow" tolerance="1e-12">1.00004</value> <value variable="rhow" tolerance="1e-12">1.00004</value>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<value variable="E" tolerance="1e-12">4.43372e+06</value> <value variable="E" tolerance="1e-12">4.43372e+06</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12"> 0.275032</value> <value variable="rho" tolerance="1e-12"> 0.275036</value>
<value variable="rhou" tolerance="1e-12">82.5652</value> <value variable="rhou" tolerance="1e-12">82.5652</value>
<value variable="rhov" tolerance="1e-8">10.8489</value> <value variable="rhov" tolerance="1e-8">10.8489</value>
<value variable="rhow" tolerance="1e-12">1.00004</value> <value variable="rhow" tolerance="1e-12">1.00004</value>
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<value variable="E" tolerance="1e-12">4.43372e+06</value> <value variable="E" tolerance="1e-12">4.43372e+06</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.281922</value> <value variable="rho" tolerance="1e-12">0.281925</value>
<value variable="rhou" tolerance="1e-12">85.4194</value> <value variable="rhou" tolerance="1e-12">85.4194</value>
<value variable="rhov" tolerance="1e-8">12.2322</value> <value variable="rhov" tolerance="1e-8">12.2322</value>
<value variable="rhow" tolerance="1e-12">1.00005</value> <value variable="rhow" tolerance="1e-12">1.00004</value>
<value variable="E" tolerance="1e-12">272860</value> <value variable="E" tolerance="1e-12">272860</value>
</metric> </metric>
</metrics> </metrics>
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<value variable="E" tolerance="1e-12">4.43372e+06</value> <value variable="E" tolerance="1e-12">4.43372e+06</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.281922</value> <value variable="rho" tolerance="1e-12">0.281925</value>
<value variable="rhou" tolerance="1e-12">85.4194</value> <value variable="rhou" tolerance="1e-12">85.4194</value>
<value variable="rhov" tolerance="1e-8">12.2322</value> <value variable="rhov" tolerance="1e-8">12.2322</value>
<value variable="rhow" tolerance="1e-12">1.00005</value> <value variable="rhow" tolerance="1e-12">1.00004</value>
<value variable="E" tolerance="1e-12">272860</value> <value variable="E" tolerance="1e-12">272860</value>
</metric> </metric>
</metrics> </metrics>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<value variable="E" tolerance="1e-12">4.43372e+06</value> <value variable="E" tolerance="1e-12">4.43372e+06</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.275031</value> <value variable="rho" tolerance="1e-12">0.27502</value>
<value variable="rhou" tolerance="1e-12">82.5652</value> <value variable="rhou" tolerance="1e-12">82.5652</value>
<value variable="rhov" tolerance="1e-12">10.8488</value> <value variable="rhov" tolerance="1e-12">10.8488</value>
<value variable="rhow" tolerance="1e-12">1.00003</value> <value variable="rhow" tolerance="1e-12">1.00003</value>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<value variable="E" tolerance="1e-12">4.43372e+06</value> <value variable="E" tolerance="1e-12">4.43372e+06</value>
</metric> </metric>
<metric type="Linf" id="2"> <metric type="Linf" id="2">
<value variable="rho" tolerance="1e-12">0.275031</value> <value variable="rho" tolerance="1e-12">0.27502</value>
<value variable="rhou" tolerance="1e-12">82.5652</value> <value variable="rhou" tolerance="1e-12">82.5652</value>
<value variable="rhov" tolerance="1e-12">10.8488</value> <value variable="rhov" tolerance="1e-12">10.8488</value>
<value variable="rhow" tolerance="1e-12">1.00003</value> <value variable="rhow" tolerance="1e-12">1.00003</value>
......
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