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

Adding the Lax-Fridrichs scheme.

parent 3b647682

examples/navier-stokes/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ dist: $(DIST) 
install: $(TARGET)

	cp $(TARGET) $(INSTALL_DIR)/bin

	cp $(CONFIG_FILE) $(INSTALL_DIR)/share

	mkdir $(INSTALL_DIR)/share/$(TARGET)

	cp -rv share/* $(INSTALL_DIR)/share/$(TARGET)

	cp make-png-from-gnuplot $(INSTALL_DIR)/bin

	cp merge-figures $(INSTALL_DIR)/bin

examples/navier-stokes/navierStokesSolver_impl.h

+0 −2
Original line number Diff line number Diff line
@@ -416,8 +416,6 @@ void navierStokesSolver< Mesh > :: GetExplicitRHS( const RealType& time, 
                                                              rho,

                                                              rho_u1,

                                                              rho_u2,

                                                              u1,

                                                              u2,

                                                              rho_t,

                                                              rho_u1_t,

                                                              rho_u2_t,

examples/navier-stokes/share/examples/cavity

+3 −11
Original line number Diff line number Diff line
@@ -38,24 +38,16 @@ do 
                    --verbose 2 \

                    --device host



      tnl-view --mesh mesh.tnl --input-files u*tnl eps*tnl

      tnl-view --mesh mesh.tnl --input-files u*tnl



      make-png-from-gnuplot u-g 1 1 1.5

      make-png-from-gnuplot u-s 1 1 1.5

      make-png-from-gnuplot eps-s 1 1 1

      make-png-from-gnuplot u 1 1 1.5

      

      rm *.gplt



      mencoder "mf://u-g*.png" -mf fps=25 -o u-g.avi -ovc lavc -lavcopts vcodec=mpeg4

      mencoder "mf://u-s*.png" -mf fps=25 -o u-s.avi -ovc lavc -lavcopts vcodec=mpeg4

      mencoder "mf://eps-s*.png" -mf fps=25 -o eps-s.avi -ovc lavc -lavcopts vcodec=mpeg4

      mencoder "mf://u-*.png" -mf fps=25 -o u.avi -ovc lavc -lavcopts vcodec=mpeg4

      

      rm *.png

      

      cp u-g.avi ../../../u-g-v-${max_inflow_velocity}-mu-g-${mu_g}-eps-s-${eps_s}.avi

      cp u-s.avi ../../../u-s-v-${max_inflow_velocity}-mu-g-${mu_g}-eps-s-${eps_s}.avi

      cp eps-s.avi ../../../eps-s-v-${max_inflow_velocity}-mu-g-${mu_g}-eps-s-${eps_s}.avi

      

      cd ..



   done

src/CMakeLists.txt

+1 −2
Original line number Diff line number Diff line 
INCLUDE_DIRECTORIES( config core debug diff matrix mesh solver )



ADD_SUBDIRECTORY( config )

ADD_SUBDIRECTORY( core )

ADD_SUBDIRECTORY( debug )

ADD_SUBDIRECTORY( diff )

ADD_SUBDIRECTORY( matrix )

ADD_SUBDIRECTORY( mesh )

ADD_SUBDIRECTORY( schemes )

ADD_SUBDIRECTORY( solvers )

ADD_SUBDIRECTORY( legacy )

ADD_SUBDIRECTORY( implementation )

src/config/parse.cc

+77 −35
Original line number Diff line number Diff line 
// Generated by Bisonc++ V2.4.8 on Fri, 11 Jun 2010 10:00:34 +0200

// Generated by Bisonc++ V4.01.00 on Wed, 24 Apr 2013 15:13:41 +0200



// $insert class.ih

#include "tnlConfigDescriptionParser.ih"
@@ -119,7 +119,7 @@ PI__ const s_productionInfo[] = 
     {270, 2}, // 2: config_entries ->  config_entry config_entries

     {271, 1}, // 3: config_entry ->  keyword

     {271, 1}, // 4: config_entry ->  group

     {273, 8}, // 5: group ->  GROUP group_identifier '{' keywords '}' ',' group_comment ';'

     {273, 8}, // 5: group (GROUP) ->  GROUP group_identifier '{' keywords '}' ',' group_comment ';'

     {275, 1}, // 6: keywords ->  keyword

     {275, 2}, // 7: keywords ->  keyword keywords

     {272, 1}, // 8: keyword ->  string_keyword
@@ -130,39 +130,39 @@ PI__ const s_productionInfo[] = 
     {272, 2}, // 13: keyword ->  list_of_keyword integer_keyword

     {272, 2}, // 14: keyword ->  list_of_keyword real_keyword

     {272, 2}, // 15: keyword ->  list_of_keyword boolean_keyword

     {277, 3}, // 16: string_keyword ->  STRING_KEYWORD keyword_identifier ';'

     {277, 6}, // 17: string_keyword ->  STRING_KEYWORD keyword_identifier '(' '!' ')' ';'

     {277, 6}, // 18: string_keyword ->  STRING_KEYWORD keyword_identifier '(' string_value ')' ';'

     {277, 4}, // 19: string_keyword ->  STRING_KEYWORD keyword_identifier keyword_comment ';'

     {277, 7}, // 20: string_keyword ->  STRING_KEYWORD keyword_identifier '(' '!' ')' keyword_comment ';'

     {277, 7}, // 21: string_keyword ->  STRING_KEYWORD keyword_identifier '(' string_value ')' keyword_comment ';'

     {278, 3}, // 22: integer_keyword ->  INTEGER_KEYWORD keyword_identifier ';'

     {278, 6}, // 23: integer_keyword ->  INTEGER_KEYWORD keyword_identifier '(' '!' ')' ';'

     {278, 6}, // 24: integer_keyword ->  INTEGER_KEYWORD keyword_identifier '(' integer_value ')' ';'

     {278, 4}, // 25: integer_keyword ->  INTEGER_KEYWORD keyword_identifier keyword_comment ';'

     {278, 7}, // 26: integer_keyword ->  INTEGER_KEYWORD keyword_identifier '(' '!' ')' keyword_comment ';'

     {278, 7}, // 27: integer_keyword ->  INTEGER_KEYWORD keyword_identifier '(' integer_value ')' keyword_comment ';'

     {279, 3}, // 28: real_keyword ->  REAL_KEYWORD keyword_identifier ';'

     {279, 6}, // 29: real_keyword ->  REAL_KEYWORD keyword_identifier '(' '!' ')' ';'

     {279, 6}, // 30: real_keyword ->  REAL_KEYWORD keyword_identifier '(' real_value ')' ';'

     {279, 4}, // 31: real_keyword ->  REAL_KEYWORD keyword_identifier keyword_comment ';'

     {279, 7}, // 32: real_keyword ->  REAL_KEYWORD keyword_identifier '(' '!' ')' keyword_comment ';'

     {279, 7}, // 33: real_keyword ->  REAL_KEYWORD keyword_identifier '(' real_value ')' keyword_comment ';'

     {280, 3}, // 34: boolean_keyword ->  BOOLEAN_KEYWORD keyword_identifier ';'

     {280, 6}, // 35: boolean_keyword ->  BOOLEAN_KEYWORD keyword_identifier '(' '!' ')' ';'

     {280, 6}, // 36: boolean_keyword ->  BOOLEAN_KEYWORD keyword_identifier '(' boolean_value ')' ';'

     {280, 4}, // 37: boolean_keyword ->  BOOLEAN_KEYWORD keyword_identifier keyword_comment ';'

     {280, 7}, // 38: boolean_keyword ->  BOOLEAN_KEYWORD keyword_identifier '(' '!' ')' keyword_comment ';'

     {280, 7}, // 39: boolean_keyword ->  BOOLEAN_KEYWORD keyword_identifier '(' boolean_value ')' keyword_comment ';'

     {281, 1}, // 40: list_of_keyword ->  LIST_OF_KEYWORD

     {274, 1}, // 41: group_identifier ->  IDENTIFIER

     {276, 1}, // 42: group_comment ->  COMMENT

     {287, 1}, // 43: keyword_identifier ->  IDENTIFIER

     {283, 1}, // 44: keyword_comment ->  COMMENT

     {282, 1}, // 45: string_value ->  STRING

     {285, 1}, // 46: real_value ->  REAL

     {284, 1}, // 47: integer_value ->  INTEGER

     {286, 1}, // 48: boolean_value ->  BOOLEAN

     {277, 3}, // 16: string_keyword (STRING_KEYWORD) ->  STRING_KEYWORD keyword_identifier ';'

     {277, 6}, // 17: string_keyword (STRING_KEYWORD) ->  STRING_KEYWORD keyword_identifier '(' '!' ')' ';'

     {277, 6}, // 18: string_keyword (STRING_KEYWORD) ->  STRING_KEYWORD keyword_identifier '(' string_value ')' ';'

     {277, 4}, // 19: string_keyword (STRING_KEYWORD) ->  STRING_KEYWORD keyword_identifier keyword_comment ';'

     {277, 7}, // 20: string_keyword (STRING_KEYWORD) ->  STRING_KEYWORD keyword_identifier '(' '!' ')' keyword_comment ';'

     {277, 7}, // 21: string_keyword (STRING_KEYWORD) ->  STRING_KEYWORD keyword_identifier '(' string_value ')' keyword_comment ';'

     {278, 3}, // 22: integer_keyword (INTEGER_KEYWORD) ->  INTEGER_KEYWORD keyword_identifier ';'

     {278, 6}, // 23: integer_keyword (INTEGER_KEYWORD) ->  INTEGER_KEYWORD keyword_identifier '(' '!' ')' ';'

     {278, 6}, // 24: integer_keyword (INTEGER_KEYWORD) ->  INTEGER_KEYWORD keyword_identifier '(' integer_value ')' ';'

     {278, 4}, // 25: integer_keyword (INTEGER_KEYWORD) ->  INTEGER_KEYWORD keyword_identifier keyword_comment ';'

     {278, 7}, // 26: integer_keyword (INTEGER_KEYWORD) ->  INTEGER_KEYWORD keyword_identifier '(' '!' ')' keyword_comment ';'

     {278, 7}, // 27: integer_keyword (INTEGER_KEYWORD) ->  INTEGER_KEYWORD keyword_identifier '(' integer_value ')' keyword_comment ';'

     {279, 3}, // 28: real_keyword (REAL_KEYWORD) ->  REAL_KEYWORD keyword_identifier ';'

     {279, 6}, // 29: real_keyword (REAL_KEYWORD) ->  REAL_KEYWORD keyword_identifier '(' '!' ')' ';'

     {279, 6}, // 30: real_keyword (REAL_KEYWORD) ->  REAL_KEYWORD keyword_identifier '(' real_value ')' ';'

     {279, 4}, // 31: real_keyword (REAL_KEYWORD) ->  REAL_KEYWORD keyword_identifier keyword_comment ';'

     {279, 7}, // 32: real_keyword (REAL_KEYWORD) ->  REAL_KEYWORD keyword_identifier '(' '!' ')' keyword_comment ';'

     {279, 7}, // 33: real_keyword (REAL_KEYWORD) ->  REAL_KEYWORD keyword_identifier '(' real_value ')' keyword_comment ';'

     {280, 3}, // 34: boolean_keyword (BOOLEAN_KEYWORD) ->  BOOLEAN_KEYWORD keyword_identifier ';'

     {280, 6}, // 35: boolean_keyword (BOOLEAN_KEYWORD) ->  BOOLEAN_KEYWORD keyword_identifier '(' '!' ')' ';'

     {280, 6}, // 36: boolean_keyword (BOOLEAN_KEYWORD) ->  BOOLEAN_KEYWORD keyword_identifier '(' boolean_value ')' ';'

     {280, 4}, // 37: boolean_keyword (BOOLEAN_KEYWORD) ->  BOOLEAN_KEYWORD keyword_identifier keyword_comment ';'

     {280, 7}, // 38: boolean_keyword (BOOLEAN_KEYWORD) ->  BOOLEAN_KEYWORD keyword_identifier '(' '!' ')' keyword_comment ';'

     {280, 7}, // 39: boolean_keyword (BOOLEAN_KEYWORD) ->  BOOLEAN_KEYWORD keyword_identifier '(' boolean_value ')' keyword_comment ';'

     {281, 1}, // 40: list_of_keyword (LIST_OF_KEYWORD) ->  LIST_OF_KEYWORD

     {274, 1}, // 41: group_identifier (IDENTIFIER) ->  IDENTIFIER

     {276, 1}, // 42: group_comment (COMMENT) ->  COMMENT

     {287, 1}, // 43: keyword_identifier (IDENTIFIER) ->  IDENTIFIER

     {283, 1}, // 44: keyword_comment (COMMENT) ->  COMMENT

     {282, 1}, // 45: string_value (STRING) ->  STRING

     {285, 1}, // 46: real_value (REAL) ->  REAL

     {284, 1}, // 47: integer_value (INTEGER) ->  INTEGER

     {286, 1}, // 48: boolean_value (BOOLEAN) ->  BOOLEAN

     {288, 1}, // 49: config_entries_$ ->  config_entries

};
@@ -948,6 +948,11 @@ tnlConfigDescriptionParserBase::tnlConfigDescriptionParserBase() 
{}





void tnlConfigDescriptionParser::print__()

{

// $insert print

}



void tnlConfigDescriptionParserBase::clearin()

{

    d_token__ = d_nextToken__ = _UNDETERMINED_;
@@ -1014,186 +1019,220 @@ void tnlConfigDescriptionParser::executeAction(int production) 
        // $insert actioncases

        

        case 5:

#line 35 "tnlConfigDescriptionParser.y"

        { AddCurrentGroup(); }

        break;



        case 16:

#line 49 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "string" );

         AddCurrentEntry( false );}

        break;



        case 17:

#line 52 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "string" );

         AddCurrentEntry( true );}

        break;



        case 18:

#line 55 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "string" );

         AddCurrentEntryWithDefaultValue();}

        break;



        case 19:

#line 58 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "string" );

         AddCurrentEntry( false );}

        break;



        case 20:

#line 61 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "string" );

         AddCurrentEntry( true );}

        break;



        case 21:

#line 64 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "string" );

         AddCurrentEntryWithDefaultValue();}

        break;



        case 22:

#line 68 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "integer" );

         AddCurrentEntry( false );}

        break;



        case 23:

#line 71 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "integer" );

         AddCurrentEntry( true );}

        break;



        case 24:

#line 74 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "integer" );

         AddCurrentEntryWithDefaultValue();}

        break;



        case 25:

#line 77 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "integer" );

         AddCurrentEntry( false );}

        break;



        case 26:

#line 80 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "integer" );

         AddCurrentEntry( true );}

        break;



        case 27:

#line 83 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "integer" );

         AddCurrentEntryWithDefaultValue();}

        break;



        case 28:

#line 87 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "real" );

         AddCurrentEntry( false );}

        break;



        case 29:

#line 90 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "real" );

         AddCurrentEntry( true );}

        break;



        case 30:

#line 93 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "real" );

         AddCurrentEntryWithDefaultValue();}

        break;



        case 31:

#line 96 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "real" );

         AddCurrentEntry( false );}

        break;



        case 32:

#line 99 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "real" );

         AddCurrentEntry( true );}

        break;



        case 33:

#line 102 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "real" );

         AddCurrentEntryWithDefaultValue();}

        break;



        case 34:

#line 106 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "bool" );

         AddCurrentEntry( false );}

        break;



        case 35:

#line 109 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "bool" );

         AddCurrentEntry( true );}

        break;



        case 36:

#line 112 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "bool" );

         AddCurrentEntryWithDefaultValue();}

        break;



        case 37:

#line 115 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "bool" );

         AddCurrentEntry( false );}

        break;



        case 38:

#line 118 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "bool" );

         AddCurrentEntry( true );}

        break;



        case 39:

#line 121 "tnlConfigDescriptionParser.y"

        {

         SetCurrentEntryTypeName( "bool" );

         AddCurrentEntryWithDefaultValue();}

        break;



        case 40:

#line 125 "tnlConfigDescriptionParser.y"

        { SetCurrentEntryTypeIsList( true ); }

        break;



        case 41:

#line 127 "tnlConfigDescriptionParser.y"

        { SetCurrentGroupId( d_vsp__[0].s_val ); }

        break;



        case 42:

#line 129 "tnlConfigDescriptionParser.y"

        { SetCurrentGroupComment( d_vsp__[0].s_val ); }

        break;



        case 43:

#line 131 "tnlConfigDescriptionParser.y"

        { SetCurrentEntryId( d_vsp__[0].s_val ); }

        break;



        case 44:

#line 133 "tnlConfigDescriptionParser.y"

        { SetCurrentEntryComment( d_vsp__[0].s_val ); }

        break;



        case 45:

#line 135 "tnlConfigDescriptionParser.y"

        { string_default_value. setString( d_vsp__[0].s_val, 1, 1 );}

        break;



        case 46:

#line 137 "tnlConfigDescriptionParser.y"

        { real_default_value = d_vsp__[0].d_val; }

        break;



        case 47:

#line 139 "tnlConfigDescriptionParser.y"

        { integer_default_value = d_vsp__[0].i_val; }

        break;



        case 48:

#line 141 "tnlConfigDescriptionParser.y"

        { bool_default_value = d_vsp__[0].b_val; }

        break;
@@ -1431,3 +1470,6 @@ catch (Return__ retValue) 
    return retValue;

}