Fix problem with time accuracy of VCSMapping

(cherry picked from commit cd38f0e5)

solvers/IncNavierStokesSolver/EquationSystems/StandardExtrapolate.cpp

@@ -75,10 +75,9 @@ namespace Nektar
         const Array<OneD, const Array<OneD, NekDouble> >  &N,
         NekDouble kinvis)
     {
+        m_pressureCalls++;
         if(m_HBCdata.num_elements()>0)
         {
-            m_pressureCalls++;
-
             // Rotate HOPBCs storage
             RollOver(m_pressureHBCs);
             

solvers/IncNavierStokesSolver/EquationSystems/VCSMapping.cpp

@@ -221,7 +221,7 @@ namespace Nektar
         }
         
         // Add mapping terms
-        ApplyIncNSMappingForcing( outarray );
+        ApplyIncNSMappingForcing( inarray, outarray);
         
         // Calculate High-Order pressure boundary conditions
         m_extrapolation->EvaluatePressureBCs(inarray,outarray,m_kinvis);
@@ -739,6 +739,7 @@ namespace Nektar
      * Explicit terms of the mapping
      */
     void   VCSMapping::ApplyIncNSMappingForcing(
+        const Array<OneD, Array<OneD, NekDouble> >    &inarray,
         Array<OneD, Array<OneD, NekDouble> >          &outarray)
     {
         int physTot = m_fields[0]->GetTotPoints();
@@ -758,7 +759,7 @@ namespace Nektar
         {
             for (int i = 0; i < m_nConvectiveFields; ++i)
             {
-                vel[i] = m_fields[i]->GetPhys();
+                vel[i] = inarray[i];
                 m_fields[0]->HomogeneousBwdTrans(vel[i],velPhys[i]);
             }
         }
@@ -766,8 +767,8 @@ namespace Nektar
         {
             for (int i = 0; i < m_nConvectiveFields; ++i)
             {
-                vel[i] = m_fields[i]->GetPhys();
-                Vmath::Vcopy(physTot, m_fields[i]->GetPhys(), 1, velPhys[i], 1);
+                vel[i] = inarray[i];
+                Vmath::Vcopy(physTot, inarray[i], 1, velPhys[i], 1);
             }
         }
 

solvers/IncNavierStokesSolver/EquationSystems/VCSMapping.h

@@ -64,6 +64,7 @@ namespace Nektar
         
         // 
         void ApplyIncNSMappingForcing (
+                const Array<OneD, Array<OneD, NekDouble> >        &inarray,
                 Array<OneD, Array<OneD, NekDouble> >              &outarray);
 
         virtual ~VCSMapping();