Merge branch 'fix/SFDparameters' of localhost:nektar

library/SolverUtils/DriverSteadyState.cpp

@@ -106,6 +106,16 @@ namespace Nektar
             m_cst4=m_cst2*m_cst3;
             m_cst5=1.0/(1.0 + m_cst3*(1.0-m_cst1*m_cst2));
             
+            //----- Convergence History Parameters ------
+            m_Growing=false;
+            m_Shrinking=false;
+            
+            m_MinNormDiff_q_qBar = 9999;
+            m_MaxNormDiff_q_qBar = 0;
+            m_First_MinNormDiff_q_qBar = 0;
+            m_Oscillation = 0;
+            //-------------------------------------------
+            
             cout << "------------------ SFD Parameters ------------------" << endl;
             cout << "\tDelta = " << m_Delta << endl;
             cout << "\tX = " << m_X << endl;
@@ -198,14 +208,6 @@ namespace Nektar
             //This routine evaluates |q-qBar|L2 and save the value in "ConvergenceHistory.txt"
             //Moreover, a procedure to change the parameters Delta and X after 25 oscillations of |q-qBar| is implemented
             
-            m_Growing=false;
-            m_Shrinking=false;
-            
-            m_MinNormDiff_q_qBar = 9999;
-            m_MaxNormDiff_q_qBar = 0;
-            m_First_MinNormDiff_q_qBar = 0;
-            m_Oscillation = 0;
-            
             for(int i = 0; i < 1; ++i)
             {
                 Diff_q_qBar[i] = Array<OneD, NekDouble> (m_equ[0]->GetTotPoints(),0.0);
@@ -260,7 +262,7 @@ namespace Nektar
                 m_MinNormDiff_q_qBar=1000;
                 m_Oscillation=m_Oscillation+1;
             }
-			
+            
             if (m_Oscillation==25)
             {					
                 m_Delta = m_Delta + 0.25;