diff --git a/solvers/IncNavierStokesSolver/EquationSystems/StandardExtrapolate.cpp b/solvers/IncNavierStokesSolver/EquationSystems/StandardExtrapolate.cpp index 945d5ded2d43e0f772d9738402087953933520ab..a254c83360ae4abd13a7dfc977f6b2af77d259df 100644 --- a/solvers/IncNavierStokesSolver/EquationSystems/StandardExtrapolate.cpp +++ b/solvers/IncNavierStokesSolver/EquationSystems/StandardExtrapolate.cpp @@ -75,10 +75,9 @@ namespace Nektar const Array > &N, NekDouble kinvis) { + m_pressureCalls++; if(m_HBCdata.num_elements()>0) { - m_pressureCalls++; - // Rotate HOPBCs storage RollOver(m_pressureHBCs); diff --git a/solvers/IncNavierStokesSolver/EquationSystems/VCSMapping.cpp b/solvers/IncNavierStokesSolver/EquationSystems/VCSMapping.cpp index 2cb60f7bbfa8a515ddceec3247a167b9f3f5db7a..4b6724df0661fc46305f596770464cc6a15ecb64 100644 --- a/solvers/IncNavierStokesSolver/EquationSystems/VCSMapping.cpp +++ b/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 > &inarray, Array > &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); } } diff --git a/solvers/IncNavierStokesSolver/EquationSystems/VCSMapping.h b/solvers/IncNavierStokesSolver/EquationSystems/VCSMapping.h index 44ecac536282ac99fd409fbdf2074916dfc4f12a..e5cc870b13b5c8c8e8617c23d7ee1f25e1d68546 100644 --- a/solvers/IncNavierStokesSolver/EquationSystems/VCSMapping.h +++ b/solvers/IncNavierStokesSolver/EquationSystems/VCSMapping.h @@ -64,6 +64,7 @@ namespace Nektar // void ApplyIncNSMappingForcing ( + const Array > &inarray, Array > &outarray); virtual ~VCSMapping();