Ignore:
Timestamp:
05/16/11 08:19:00 (14 years ago)
Author:
Mathieu Morlighem
Message:

moving Balanced* to Balance* TBC

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/objects/Loads/Numericalflux.cpp

    r8224 r8287  
    339339                        Ke=CreateKMatrixPrognostic();
    340340                        break;
    341                 case BalancedthicknessAnalysisEnum:
    342                         Ke=CreateKMatrixBalancedthickness();
     341                case BalancethicknessAnalysisEnum:
     342                        Ke=CreateKMatrixBalancethickness();
    343343                        break;
    344                 case AdjointBalancedthicknessAnalysisEnum:
    345                         Ke=CreateKMatrixAdjointBalancedthickness();
     344                case AdjointBalancethicknessAnalysisEnum:
     345                        Ke=CreateKMatrixAdjointBalancethickness();
    346346                        break;
    347347                default:
    … …  
    369369                        pe=CreatePVectorPrognostic();
    370370                        break;
    371                 case BalancedthicknessAnalysisEnum:
    372                         pe=CreatePVectorBalancedthickness();
     371                case BalancethicknessAnalysisEnum:
     372                        pe=CreatePVectorBalancethickness();
    373373                        break;
    374                 case AdjointBalancedthicknessAnalysisEnum:
    375                         pe=CreatePVectorAdjointBalancedthickness();
     374                case AdjointBalancethicknessAnalysisEnum:
     375                        pe=CreatePVectorAdjointBalancethickness();
    376376                        break;
    377377                default:
    … …  
    564564}
    565565/*}}}*/
    566 /*FUNCTION Numericalflux::CreateKMatrixBalancedthickness{{{1*/
    567 ElementMatrix* Numericalflux::CreateKMatrixBalancedthickness(void){
     566/*FUNCTION Numericalflux::CreateKMatrixBalancethickness{{{1*/
     567ElementMatrix* Numericalflux::CreateKMatrixBalancethickness(void){
    568568
    569569        int type;
    … …  
    572572        switch(type){
    573573                case InternalEnum:
    574                         return CreateKMatrixBalancedthicknessInternal();
     574                        return CreateKMatrixBalancethicknessInternal();
    575575                case BoundaryEnum:
    576                         return CreateKMatrixBalancedthicknessBoundary();
     576                        return CreateKMatrixBalancethicknessBoundary();
    577577                default:
    578578                        _error_("type not supported yet");
    … …  
    580580}
    581581/*}}}*/
    582 /*FUNCTION Numericalflux::CreateKMatrixBalancedthicknessInternal {{{1*/
    583 ElementMatrix* Numericalflux::CreateKMatrixBalancedthicknessInternal(void){
     582/*FUNCTION Numericalflux::CreateKMatrixBalancethicknessInternal {{{1*/
     583ElementMatrix* Numericalflux::CreateKMatrixBalancethicknessInternal(void){
    584584
    585585        /* constants*/
    … …  
    644644}
    645645/*}}}*/
    646 /*FUNCTION Numericalflux::CreateKMatrixBalancedthicknessBoundary {{{1*/
    647 ElementMatrix* Numericalflux::CreateKMatrixBalancedthicknessBoundary(void){
     646/*FUNCTION Numericalflux::CreateKMatrixBalancethicknessBoundary {{{1*/
     647ElementMatrix* Numericalflux::CreateKMatrixBalancethicknessBoundary(void){
    648648
    649649        /* constants*/
    … …  
    715715}
    716716/*}}}*/
    717 /*FUNCTION Numericalflux::CreateKMatrixAdjointBalancedthickness{{{1*/
    718 ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancedthickness(void){
     717/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethickness{{{1*/
     718ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethickness(void){
    719719
    720720        int type;
    … …  
    723723        switch(type){
    724724                case InternalEnum:
    725                         return CreateKMatrixAdjointBalancedthicknessInternal();
     725                        return CreateKMatrixAdjointBalancethicknessInternal();
    726726                case BoundaryEnum:
    727                         return CreateKMatrixAdjointBalancedthicknessBoundary();
     727                        return CreateKMatrixAdjointBalancethicknessBoundary();
    728728                default:
    729729                        _error_("type not supported yet");
    … …  
    731731}
    732732/*}}}*/
    733 /*FUNCTION Numericalflux::CreateKMatrixAdjointBalancedthicknessInternal {{{1*/
    734 ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancedthicknessInternal(void){
    735 
    736         ElementMatrix* Ke=CreateKMatrixBalancedthicknessInternal();
     733/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethicknessInternal {{{1*/
     734ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethicknessInternal(void){
     735
     736        ElementMatrix* Ke=CreateKMatrixBalancethicknessInternal();
    737737        if (Ke) Ke->Transpose();
    738738        return Ke;
    739739}
    740740/*}}}*/
    741 /*FUNCTION Numericalflux::CreateKMatrixAdjointBalancedthicknessBoundary {{{1*/
    742 ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancedthicknessBoundary(void){
    743 
    744         ElementMatrix* Ke=CreateKMatrixBalancedthicknessBoundary();
     741/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethicknessBoundary {{{1*/
     742ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethicknessBoundary(void){
     743
     744        ElementMatrix* Ke=CreateKMatrixBalancethicknessBoundary();
    745745        if(Ke) Ke->Transpose();
    746746        return Ke;
    … …  
    839839}
    840840/*}}}*/
    841 /*FUNCTION Numericalflux::CreatePVectorBalancedthickness{{{1*/
    842 ElementVector* Numericalflux::CreatePVectorBalancedthickness(void){
     841/*FUNCTION Numericalflux::CreatePVectorBalancethickness{{{1*/
     842ElementVector* Numericalflux::CreatePVectorBalancethickness(void){
    843843
    844844        int type;
    … …  
    847847        switch(type){
    848848                case InternalEnum:
    849                         return CreatePVectorBalancedthicknessInternal();
     849                        return CreatePVectorBalancethicknessInternal();
    850850                case BoundaryEnum:
    851                         return CreatePVectorBalancedthicknessBoundary();
     851                        return CreatePVectorBalancethicknessBoundary();
    852852                default:
    853853                        _error_("type not supported yet");
    … …  
    855855}
    856856/*}}}*/
    857 /*FUNCTION Numericalflux::CreatePVectorBalancedthicknessInternal{{{1*/
    858 ElementVector* Numericalflux::CreatePVectorBalancedthicknessInternal(void){
     857/*FUNCTION Numericalflux::CreatePVectorBalancethicknessInternal{{{1*/
     858ElementVector* Numericalflux::CreatePVectorBalancethicknessInternal(void){
    859859
    860860        /*Nothing added to PVector*/
    … …  
    863863}
    864864/*}}}*/
    865 /*FUNCTION Numericalflux::CreatePVectorBalancedthicknessBoundary{{{1*/
    866 ElementVector* Numericalflux::CreatePVectorBalancedthicknessBoundary(void){
     865/*FUNCTION Numericalflux::CreatePVectorBalancethicknessBoundary{{{1*/
     866ElementVector* Numericalflux::CreatePVectorBalancethicknessBoundary(void){
    867867
    868868        /* constants*/
    … …  
    929929}
    930930/*}}}*/
    931 /*FUNCTION Numericalflux::CreatePVectorAdjointBalancedthickness{{{1*/
    932 ElementVector* Numericalflux::CreatePVectorAdjointBalancedthickness(void){
     931/*FUNCTION Numericalflux::CreatePVectorAdjointBalancethickness{{{1*/
     932ElementVector* Numericalflux::CreatePVectorAdjointBalancethickness(void){
    933933
    934934        /*No PVector for the Adjoint*/
Note: See TracChangeset for help on using the changeset viewer.