-
Spencer Sherwin authored
Conflicts: library/Demos/LocalRegions/LocProject2D.cpp library/MultiRegions/ContField3D.cpp library/MultiRegions/GlobalLinSysIterativeStaticCond.cpp regressionTests/Solvers/ADRSolver/ADRSolverTests.cpp regressionTests/Solvers/IncNavierStokesSolver/IncNavierStokesSolverTests.cpp solvers/IncNavierStokesSolver/EquationSystems/IncNavierStokes.cpp solvers/IncNavierStokesSolver/EquationSystems/VelocityCorrectionScheme.cpp solvers/IncNavierStokesSolver/EquationSystems/VelocityCorrectionScheme.h utilities/PostProcessing/XmlToTecplotWireFrame.cpp Updated the conflicts and this version seems to have all regression tests running
04855af9