Merge branch 'master' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl

Conflicts:
	examples/navier-stokes/navierStokesBoundaryConditions_impl.h
	src/implementation/mesh/tnlGrid1D_impl.h
	src/implementation/solvers/cfd/navier-stokes/tnlNavierStokesSolver_impl.h
	src/mesh/tnlGrid.h

examples/navier-stokes/navierStokesBoundaryConditions_impl.h

@@ -121,7 +121,6 @@ void navierStokesBoundaryConditions< Mesh >::apply( const RealType& time,
          rho[ c3 ] = rho[ c4 ];
          energy[ c1 ] = energy[ c2 ];
          energy[ c3 ] = energy[ c4 ];
-
       }
       /*rho_u1[ c1 ] = rho[ c1 ] * this -> u1[ c1 ];
       rho_u2[ c1 ] = rho[ c1 ] * this -> u2[ c1 ];

src/implementation/solvers/cfd/navier-stokes/tnlNavierStokesSolver_impl.h

@@ -459,7 +459,7 @@ void tnlNavierStokesSolver< AdvectionScheme,
         /***
          * Add the viscosity term
          */
-        rho_u1_t[ c ] += this->mu*( u1Viscosity->getDiffusion( c, 4.0/3.0, 1.0, 0.0 ) +
+        /*rho_u1_t[ c ] += this->mu*( u1Viscosity->getDiffusion( c, 4.0/3.0, 1.0, 0.0 ) +
                                     u2Viscosity->getDiffusion( c, 0.0, 0.0, 1.0/3.0 ) );
         rho_u2_t[ c ] += this->mu*( u2Viscosity->getDiffusion( c, 1.0, 4.0/3.0, 0.0 ) +
                                     u1Viscosity->getDiffusion( c, 0.0, 0.0, 1.0/3.0 ) );
@@ -479,8 +479,8 @@ void tnlNavierStokesSolver< AdvectionScheme,
                                                           this->u2, this->u2, this->u1,
                                                           0.0, 0.0, 1.0 ) +
                                k * energyViscosity->getDiffusion( c, 1.0, 1.0, 0.0 ) );
-
-        /*rho_u1_t[ c ] += this->mu*( u1Viscosity->getDiffusion( c, 1.0, 1.0, 0.0 ) );
+        */
+        rho_u1_t[ c ] += this->mu*( u1Viscosity->getDiffusion( c, 1.0, 1.0, 0.0 ) );
         rho_u2_t[ c ] += this->mu*( u2Viscosity->getDiffusion( c, 1.0, 1.0, 0.0 ) );
 
 
@@ -575,8 +575,6 @@ bool tnlNavierStokesSolver< AdvectionScheme,
    /*FileNameBaseNumberEnding( "e-", step, 5, ".tnl", fileName );
    if( ! dofs_e. save( fileName ) )
       return false;*/
-
-
    return true;
 }