Changeset 4402


Ignore:
Timestamp:
07/06/10 09:08:11 (15 years ago)
Author:
Mathieu Morlighem
Message:

no more SlopeCompute

Location:
issm/trunk/src/c/objects
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r4396 r4402  
    691691        }
    692692        else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){
    693                 CreateKMatrixSlopeCompute( Kgg);
     693                CreateKMatrixSlope( Kgg);
    694694        }
    695695        else if (analysis_type==PrognosticAnalysisEnum){
     
    741741        }
    742742        else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){
    743                 CreatePVectorSlopeCompute( pg);
     743                CreatePVectorSlope( pg);
    744744        }
    745745        else if (analysis_type==PrognosticAnalysisEnum){
     
    32043204}
    32053205/*}}}*/
    3206 /*FUNCTION Penta::CreateKMatrixSlopeCompute {{{1*/
    3207 
    3208 void  Penta::CreateKMatrixSlopeCompute(Mat Kgg){
     3206/*FUNCTION Penta::CreateKMatrixSlope {{{1*/
     3207
     3208void  Penta::CreateKMatrixSlope(Mat Kgg){
    32093209
    32103210        /*Collapsed formulation: */
     
    41084108}
    41094109/*}}}*/
    4110 /*FUNCTION Penta::CreatePVectorSlopeCompute {{{1*/
    4111 
    4112 void Penta::CreatePVectorSlopeCompute( Vec pg){
     4110/*FUNCTION Penta::CreatePVectorSlope {{{1*/
     4111
     4112void Penta::CreatePVectorSlope( Vec pg){
    41134113
    41144114        /*Collapsed formulation: */
  • issm/trunk/src/c/objects/Elements/Penta.h

    r4396 r4402  
    120120                void      CreateKMatrixMelting(Mat Kggg);
    121121                void      CreateKMatrixPrognostic(Mat Kggg);
    122                 void      CreateKMatrixSlopeCompute(Mat Kggg);
     122                void      CreateKMatrixSlope(Mat Kggg);
    123123                void      CreateKMatrixThermal(Mat Kggg);
    124124                void      CreatePVectorBalancedthickness( Vec pg);
     
    130130                void      CreatePVectorMelting( Vec pg);
    131131                void      CreatePVectorPrognostic( Vec pg);
    132                 void      CreatePVectorSlopeCompute( Vec pg);
     132                void      CreatePVectorSlope( Vec pg);
    133133                void      CreatePVectorThermal( Vec pg);
    134134                double*   GaussFromNode(Node* node);
  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r4396 r4402  
    625625        }
    626626        else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){
    627                 CreateKMatrixSlopeCompute( Kgg);
     627                CreateKMatrixSlope( Kgg);
    628628        }
    629629        else if (analysis_type==PrognosticAnalysisEnum){
     
    672672        }
    673673        else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){
    674                 CreatePVectorSlopeCompute( pg);
     674                CreatePVectorSlope( pg);
    675675        }
    676676        else if (analysis_type==PrognosticAnalysisEnum){
     
    35653565}
    35663566/*}}}*/
    3567 /*FUNCTION Tria::CreateKMatrixSlopeCompute {{{1*/
    3568 
    3569 void  Tria::CreateKMatrixSlopeCompute(Mat Kgg){
     3567/*FUNCTION Tria::CreateKMatrixSlope {{{1*/
     3568
     3569void  Tria::CreateKMatrixSlope(Mat Kgg){
    35703570
    35713571        /* local declarations */
     
    43684368}
    43694369/*}}}*/
    4370 /*FUNCTION Tria::CreatePVectorSlopeCompute {{{1*/
    4371 
    4372 void Tria::CreatePVectorSlopeCompute( Vec pg){
     4370/*FUNCTION Tria::CreatePVectorSlope {{{1*/
     4371void Tria::CreatePVectorSlope( Vec pg){
    43734372
    43744373        int             i,j;
  • issm/trunk/src/c/objects/Elements/Tria.h

    r4394 r4402  
    119119                void      CreateKMatrixPrognostic(Mat Kgg);
    120120                void      CreateKMatrixPrognostic2(Mat Kgg);
    121                 void      CreateKMatrixSlopeCompute(Mat Kgg);
     121                void      CreateKMatrixSlope(Mat Kgg);
    122122                void      CreateKMatrixThermal(Mat Kgg);
    123123                void      CreatePVectorBalancedthickness(Vec pg);
     
    129129                void      CreatePVectorPrognostic(Vec pg);
    130130                void      CreatePVectorPrognostic2(Vec pg);
    131                 void      CreatePVectorSlopeCompute( Vec pg);
     131                void      CreatePVectorSlope( Vec pg);
    132132                void      CreatePVectorThermalSheet( Vec pg);
    133133                void      CreatePVectorThermalShelf( Vec pg);
  • issm/trunk/src/c/objects/FemModel.cpp

    r4356 r4402  
    149149         * analysis_type to drive the element numerics. This allows for use of 1 configuration_type for several
    150150         * analyses. For example: do a SurfaceSlopeX, SurfaceSlopeY, BedSlopeX and BedSlopeY analysis using the
    151          * SlopeCompute configuration.*/
     151         * Slope configuration.*/
    152152
    153153        int found=-1;
Note: See TracChangeset for help on using the changeset viewer.