Changeset 4405


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

try to delete ALL subanalysis

Location:
issm/trunk/src/c
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.h

    r4236 r4405  
    1010
    1111/* local prototypes: */
    12 void    ComputeBasalStressx( Vec* pp_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,
    13                         int analysis_type,int sub_analysis_type);
     12void    ComputeBasalStressx( Vec* pp_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters);
    1413
    1514#endif  /* _COMPUTEBASALSTRESSX_H */

  • issm/trunk/src/c/modules/ComputePressurex/ComputePressurex.h

    r4236 r4405  
    1010
    1111/* local prototypes: */
    12 void    ComputePressurex( Vec* pp_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,
    13                         int analysis_type,int sub_analysis_type);
     12void    ComputePressurex( Vec* pp_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters);
    1413
    1514#endif  /* _COMPUTEPRESSUREX_H */

  • issm/trunk/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.h

    r4236 r4405  
    1010
    1111/* local prototypes: */
    12 void    ComputeStrainRatex(Vec* eps_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,
    13                         int analysis_type,int sub_analysis_type);
     12void    ComputeStrainRatex(Vec* eps_g,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters);
    1413
    1514#endif  /* _COMPUTESTRAINRATEX_H */

  • issm/trunk/src/c/objects/Elements/Beam.cpp

    r4250 r4405  
    196196        double xyz_list[numgrids][3];
    197197        double gauss[numgrids][numgrids]={{1,0},{0,1}};
    198         int analysis_type,sub_analysis_type;
     198        int    analysis_type;
    199199
    200200        /*retrive parameters: */
    201201        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    202         parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
    203202
    204203        /*Get dof list on which we will plug the pressure values: */
    … …  
    266265void  Beam::CreatePVector(Vec pg){
    267266
    268         int analysis_type,sub_analysis_type;
     267        int analysis_type;
    269268
    270269        /*retrive parameters: */
    271270        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    272         parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
    273271       
    274272        /*Just branch to the correct load generator, according to the type of analysis we are carrying out: */

  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r4402 r4405  
    432432        double stresstensor[6]={0.0};
    433433        double viscosity;
    434         int analysis_type,sub_analysis_type;
     434        int analysis_type;
    435435
    436436        int  dofv[3]={0,1,2};
    … …  
    464464        /*retrive parameters: */
    465465        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    466         parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
    467466
    468467        /*Check analysis_types*/
    469         if (analysis_type!=DiagnosticAnalysisEnum || sub_analysis_type!=StokesAnalysisEnum) ISSMERROR("Not supported yet!");
     468        if (analysis_type!=DiagnosticStokesAnalysisEnum) ISSMERROR("Not supported yet!");
    470469
    471470        /*recover some inputs: */
    … …  
    715714void  Penta::CreatePVector(Vec pg){
    716715
    717         int analysis_type,sub_analysis_type;
     716        int analysis_type;
    718717
    719718        /*retrive parameters: */
    720719        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    721         parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
    722720
    723721        /*if debugging mode, check that all pointers exist*/
    … …  
    860858void  Penta::GetSolutionFromInputs(Vec solution){
    861859
    862         int analysis_type,sub_analysis_type;
     860        int analysis_type;
    863861
    864862        /*retrive parameters: */
    865863        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    866         parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
    867 
    868864
    869865        /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */

  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r4402 r4405  
    35663566/*}}}*/
    35673567/*FUNCTION Tria::CreateKMatrixSlope {{{1*/
    3568 
    35693568void  Tria::CreateKMatrixSlope(Mat Kgg){
    35703569
    … …  
    44004399        double  pe_g_gaussian[numdof];
    44014400        double  slope[2];
    4402         int sub_analysis_type;
     4401        int     analysis_type;
    44034402
    44044403        /*retrive parameters: */
    4405         parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
     4404        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    44064405
    44074406        /* Get node coordinates and dof list: */
    … …  
    44224421                gauss_l1l2l3[2]=*(third_gauss_area_coord+ig);
    44234422
    4424                 if ( (sub_analysis_type==SurfaceSlopeXAnalysisEnum) || (sub_analysis_type==SurfaceSlopeYAnalysisEnum)){
     4423                if ( (analysis_type==SurfaceSlopeXAnalysisEnum) || (analysis_type==SurfaceSlopeYAnalysisEnum)){
    44254424                        inputs->GetParameterDerivativeValue(&slope[0],&xyz_list[0][0],&gauss_l1l2l3[0],SurfaceEnum);
    44264425                }
    4427                 if ( (sub_analysis_type==BedSlopeXAnalysisEnum) || (sub_analysis_type==BedSlopeYAnalysisEnum)){
     4426                if ( (analysis_type==BedSlopeXAnalysisEnum) || (analysis_type==BedSlopeYAnalysisEnum)){
    44284427                        inputs->GetParameterDerivativeValue(&slope[0],&xyz_list[0][0],&gauss_l1l2l3[0],BedEnum);
    44294428                }
    … …  
    44364435
    44374436                /*Build pe_g_gaussian vector: */
    4438                 if ( (sub_analysis_type==SurfaceSlopeXAnalysisEnum) || (sub_analysis_type==BedSlopeXAnalysisEnum)){
     4437                if ( (analysis_type==SurfaceSlopeXAnalysisEnum) || (analysis_type==BedSlopeXAnalysisEnum)){
    44394438                        for(i=0;i<numdof;i++) pe_g_gaussian[i]=Jdet*gauss_weight*slope[0]*l1l2l3[i];
    44404439                }
    4441                 if ( (sub_analysis_type==SurfaceSlopeYAnalysisEnum) || (sub_analysis_type==BedSlopeYAnalysisEnum)){
     4440                if ( (analysis_type==SurfaceSlopeYAnalysisEnum) || (analysis_type==BedSlopeYAnalysisEnum)){
    44424441                        for(i=0;i<numdof;i++) pe_g_gaussian[i]=Jdet*gauss_weight*slope[1]*l1l2l3[i];
    44434442                }

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

    r4396 r4405  
    356356        /* local declarations */
    357357        int             i,j;
    358         int analysis_type,sub_analysis_type;
     358        int analysis_type;
    359359
    360360        /* node data: */
    … …  
    395395        /*Retrieve parameters: */
    396396        this->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    397         this->parameters->FindParam(&sub_analysis_type,SubAnalysisTypeEnum);
    398397
    399398        /*recover objects from hooks: */
    … …  
    475474        /* local declarations */
    476475        int             i,j;
    477         int analysis_type,sub_analysis_type;
     476        int analysis_type;
    478477
    479478        /* node data: */
    … …  
    515514        /*Retrieve parameters: */
    516515        this->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    517         this->parameters->FindParam(&sub_analysis_type,SubAnalysisTypeEnum);
    518516
    519517        /*recover objects from hooks: */
    … …  
    605603        /* local declarations */
    606604        int             i,j;
    607         int analysis_type,sub_analysis_type;
     605        int analysis_type;
    608606
    609607        /* node data: */
    … …  
    649647        /*Retrieve parameters: */
    650648        this->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    651         this->parameters->FindParam(&sub_analysis_type,SubAnalysisTypeEnum);
    652649
    653650        /*recover parameters: */

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

    r4396 r4405  
    402402void  Pengrid::PenaltyConstrain(int* punstable){
    403403
    404         int analysis_type,sub_analysis_type;
     404        int analysis_type;
    405405
    406406        /*Retrieve parameters: */
    407407        this->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    408         this->parameters->FindParam(&sub_analysis_type,SubAnalysisTypeEnum);
    409 
    410         if ((analysis_type==DiagnosticAnalysisEnum) && ((sub_analysis_type==StokesAnalysisEnum))){
    411 
     408
     409        if (analysis_type==DiagnosticStokesAnalysisEnum){
    412410                /*No penalty to check*/
    413411                return;
    414 
    415412        }
    416413        else if (analysis_type==ThermalAnalysisEnum){
    417                
    418414                PenaltyConstrainThermal(punstable);
    419                
    420415        }
    421416        else if (analysis_type==MeltingAnalysisEnum){
    422                        
    423417                /*No penalty to check*/
    424418                return;
    425 
    426419        }
    427420        else{
    428                 ISSMERROR("%s%i%s%i%s","analysis: ",analysis_type," and sub_analysis_type: ",sub_analysis_type," not supported yet");
     421                ISSMERROR("analysis: %s not supported yet",EnumAsString(analysis_type));
    429422        }
    430423
Note: See TracChangeset for help on using the changeset viewer.