Commit 49806bdd authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fixing tnl-quickstart.

parent b8f31f4b
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -77,17 +77,17 @@ class tnlHeatEquationProblem : public tnlPDEProblem< Mesh,
                           const RealType& tau,
                           const MeshType& mesh,
                           DofVectorType& _u,
                           MeshDependentDataType& meshDependentData,
                           DofVectorType& _fu );
			   DofVectorType& _fu,
                           MeshDependentDataType& meshDependentData );

      template< typename Matrix >
      void assemblyLinearSystem( const RealType& time,
                                 const RealType& tau,
                                 const MeshType& mesh,
                                 DofVectorType& dofs,                                 
                                 MeshDependentDataType& meshDependentData,
                                 Matrix& matrix,
                                 DofVectorType& rightHandSide );
                                 DofVectorType& rightHandSide,
				 MeshDependentDataType& meshDependentData );


      protected:
+5 −5
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ getExplicitRHS( const RealType& time,
                const RealType& tau,
                const MeshType& mesh,
                DofVectorType& u,
                MeshDependentDataType& meshDependentData,
                DofVectorType& fu )
		DofVectorType& fu,
                MeshDependentDataType& meshDependentData )
{
   /****
    * If you use an explicit solver like tnlEulerSolver or tnlMersonSolver, you
@@ -221,9 +221,9 @@ assemblyLinearSystem( const RealType& time,
                      const RealType& tau,
                      const MeshType& mesh,
                      DofVectorType& u,                      
                      MeshDependentDataType& meshDependentData,
                      Matrix& matrix,
                      DofVectorType& b )
                      DofVectorType& b,
		      MeshDependentDataType& meshDependentData )
{
   tnlLinearSystemAssembler< Mesh,
                             DofVectorType,
+2 −2
Original line number Diff line number Diff line
@@ -161,9 +161,9 @@ solve( const RealType& time,
                                           currentTau,
                                           mesh,
                                           dofVector,
                                           meshDependentData,
                                           this->matrix,
                                           this->rightHandSide );
                                           this->rightHandSide,
                                           meshDependentData );
      this->linearSystemAssemblerTimer.stop();
      if( verbose )
         cout << "                                                                  Solving the linear system for time " << t << "             \r" << flush;
+9 −7
Original line number Diff line number Diff line
@@ -234,16 +234,17 @@ def generateProblem( problemName, problemBaseName ):
    file.write( "                           const RealType& tau,\n" )
    file.write( "                           const MeshType& mesh,\n" )
    file.write( "                           DofVectorType& _u,\n" )
    file.write( "                           DofVectorType& _fu );\n" )
    file.write( "                           DofVectorType& _fu,\n" )
    file.write( "                           MeshDependentDataType& meshDependentData );\n" )
    file.write( "\n" )
    file.write( "      template< typename Matrix >\n" )
    file.write( "      void assemblyLinearSystem( const RealType& time,\n" )
    file.write( "                                 const RealType& tau,\n" )
    file.write( "                                 const MeshType& mesh,\n" )
    file.write( "                                 DofVectorType& dofs,\n" )
    file.write( "                                 DofVectorType& auxDofs,\n" )
    file.write( "                                 Matrix& matrix,\n" )
    file.write( "                                 DofVectorType& rightHandSide );\n" )
    file.write( "                                 DofVectorType& rightHandSide,\n" )
    file.write( "                                 MeshDependentDataType& meshDependentData );\n" )
    file.write( "\n" )
    file.write( "   protected:\n" )
    file.write( "\n" )    
@@ -420,7 +421,8 @@ def generateProblem( problemName, problemBaseName ):
    file.write( "                const RealType& tau,\n" )
    file.write( "                const MeshType& mesh,\n" )
    file.write( "                DofVectorType& u,\n" )
    file.write( "                DofVectorType& fu )\n" )
    file.write( "                DofVectorType& fu,\n" )
    file.write( "                MeshDependentDataType& meshDependentData )\n" )
    file.write( "{\n" )
    file.write( "   /****\n" )
    file.write( "    * If you use an explicit solver like tnlEulerSolver or tnlMersonSolver, you\n" )
@@ -453,9 +455,9 @@ def generateProblem( problemName, problemBaseName ):
    file.write( "                      const RealType& tau,\n" )
    file.write( "                      const MeshType& mesh,\n" )
    file.write( "                      DofVectorType& u,\n" )
    file.write( "                      DofVectorType& auxDofs,\n" )
    file.write( "                      Matrix& matrix,\n" )
    file.write( "                      DofVectorType& b )\n" )
    file.write( "                      DofVectorType& b,\n" )
    file.write( "                      MeshDependentDataType& meshDependentData )\n" )
    file.write( "{\n" )
    file.write( "   tnlLinearSystemAssembler< Mesh,\n" )
    file.write( "                             DofVectorType,\n" )
@@ -743,7 +745,7 @@ def generateRunScript( problemBaseName ):
    file.write( "\n" ) 
    file.write( "tnl-init --test-function sin-wave \\\n" ) 
    file.write( "         --output-file init.tnl\n" ) 
    file.write( "./" + problemName + " --time-discretisation explicit \\\n" ) 
    file.write( "./" + problemBaseName + " --time-discretisation explicit \\\n" ) 
    file.write( "              --discrete-solver merson \\\n" ) 
    file.write( "              --snapshot-period 0.01 \\\n" ) 
    file.write( "              --final-time 1.0\n" )