Ignore:
Timestamp:
04/19/10 09:49:52 (15 years ago)
Author:
Mathieu Morlighem
Message:

all enums are now C Enums, no need to provide a number: the numbering is done automatically

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r3529 r3567  
    8181        //elements of type 3 are macayeal type penta. we collapse the formulation on their base.
    8282        if(iomodel->elements_type){
    83                 if (*(iomodel->elements_type+2*i+0)==MacAyealFormulationEnum()){
     83                if (*(iomodel->elements_type+2*i+0)==MacAyealFormulationEnum){
    8484                        this->properties.collapse=1;
    8585                }
    … …  
    196196
    197197        /*get enum type of Penta: */
    198         enum_type=PentaEnum();
     198        enum_type=PentaEnum;
    199199
    200200        /*marshall enum: */
    … …  
    387387
    388388        /*Check analysis_types*/
    389         if (analysis_type!=DiagnosticAnalysisEnum() || sub_analysis_type!=StokesAnalysisEnum()) ISSMERROR("Not supported yet!");
     389        if (analysis_type!=DiagnosticAnalysisEnum || sub_analysis_type!=StokesAnalysisEnum) ISSMERROR("Not supported yet!");
    390390
    391391        /*recover pointers: */
    … …  
    555555
    556556        /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */
    557         if (analysis_type==ControlAnalysisEnum()){
     557        if (analysis_type==ControlAnalysisEnum){
    558558
    559559                CreateKMatrixDiagnosticHoriz( Kgg,inputs,analysis_type,sub_analysis_type);
    560560
    561561        }
    562         else if (analysis_type==DiagnosticAnalysisEnum()){
    563 
    564                 if (sub_analysis_type==HorizAnalysisEnum()){
     562        else if (analysis_type==DiagnosticAnalysisEnum){
     563
     564                if (sub_analysis_type==HorizAnalysisEnum){
    565565
    566566                        CreateKMatrixDiagnosticHoriz( Kgg,inputs,analysis_type,sub_analysis_type);
    567567                }
    568                 else if (sub_analysis_type==VertAnalysisEnum()){
     568                else if (sub_analysis_type==VertAnalysisEnum){
    569569
    570570                        CreateKMatrixDiagnosticVert( Kgg,inputs,analysis_type,sub_analysis_type);
    571571                }
    572                 else if (sub_analysis_type==StokesAnalysisEnum()){
     572                else if (sub_analysis_type==StokesAnalysisEnum){
    573573
    574574                        CreateKMatrixDiagnosticStokes( Kgg,inputs,analysis_type,sub_analysis_type);
    … …  
    577577                else ISSMERROR(exprintf("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet"));
    578578        }
    579         else if (analysis_type==SlopecomputeAnalysisEnum()){
     579        else if (analysis_type==SlopecomputeAnalysisEnum){
    580580
    581581                CreateKMatrixSlopeCompute( Kgg,inputs,analysis_type,sub_analysis_type);
    582582        }
    583         else if (analysis_type==PrognosticAnalysisEnum()){
     583        else if (analysis_type==PrognosticAnalysisEnum){
    584584
    585585                CreateKMatrixPrognostic( Kgg,inputs,analysis_type,sub_analysis_type);
    586586        }
    587         else if (analysis_type==BalancedthicknessAnalysisEnum()){
     587        else if (analysis_type==BalancedthicknessAnalysisEnum){
    588588
    589589                CreateKMatrixBalancedthickness( Kgg,inputs,analysis_type,sub_analysis_type);
    590590        }
    591         else if (analysis_type==BalancedvelocitiesAnalysisEnum()){
     591        else if (analysis_type==BalancedvelocitiesAnalysisEnum){
    592592
    593593                CreateKMatrixBalancedvelocities( Kgg,inputs,analysis_type,sub_analysis_type);
    594594        }
    595         else if (analysis_type==ThermalAnalysisEnum()){
     595        else if (analysis_type==ThermalAnalysisEnum){
    596596
    597597                CreateKMatrixThermal( Kgg,inputs,analysis_type,sub_analysis_type);
    598598        }
    599         else if (analysis_type==MeltingAnalysisEnum()){
     599        else if (analysis_type==MeltingAnalysisEnum){
    600600
    601601                CreateKMatrixMelting( Kgg,inputs,analysis_type,sub_analysis_type);
    … …  
    16831683
    16841684        /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */
    1685         if (analysis_type==ControlAnalysisEnum()){
     1685        if (analysis_type==ControlAnalysisEnum){
    16861686
    16871687                CreatePVectorDiagnosticHoriz( pg,inputs,analysis_type,sub_analysis_type);
    16881688        }
    1689         else if (analysis_type==DiagnosticAnalysisEnum()){
    1690 
    1691                 if (sub_analysis_type==HorizAnalysisEnum()){
     1689        else if (analysis_type==DiagnosticAnalysisEnum){
     1690
     1691                if (sub_analysis_type==HorizAnalysisEnum){
    16921692
    16931693                        CreatePVectorDiagnosticHoriz( pg,inputs,analysis_type,sub_analysis_type);
    16941694                }
    1695                 else if (sub_analysis_type==VertAnalysisEnum()){
     1695                else if (sub_analysis_type==VertAnalysisEnum){
    16961696
    16971697                        CreatePVectorDiagnosticVert( pg,inputs,analysis_type,sub_analysis_type);
    16981698                }
    1699                 else if (sub_analysis_type==StokesAnalysisEnum()){
     1699                else if (sub_analysis_type==StokesAnalysisEnum){
    17001700
    17011701                        CreatePVectorDiagnosticStokes( pg,inputs,analysis_type,sub_analysis_type);
    … …  
    17031703                else ISSMERROR(exprintf("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet"));
    17041704        }
    1705         else if (analysis_type==SlopecomputeAnalysisEnum()){
     1705        else if (analysis_type==SlopecomputeAnalysisEnum){
    17061706
    17071707                CreatePVectorSlopeCompute( pg,inputs,analysis_type,sub_analysis_type);
    17081708        }
    1709         else if (analysis_type==PrognosticAnalysisEnum()){
     1709        else if (analysis_type==PrognosticAnalysisEnum){
    17101710
    17111711                CreatePVectorPrognostic( pg,inputs,analysis_type,sub_analysis_type);
    17121712        }
    1713         else if (analysis_type==BalancedthicknessAnalysisEnum()){
     1713        else if (analysis_type==BalancedthicknessAnalysisEnum){
    17141714
    17151715                CreatePVectorBalancedthickness( pg,inputs,analysis_type,sub_analysis_type);
    17161716        }
    1717         else if (analysis_type==BalancedvelocitiesAnalysisEnum()){
     1717        else if (analysis_type==BalancedvelocitiesAnalysisEnum){
    17181718
    17191719                CreatePVectorBalancedvelocities( pg,inputs,analysis_type,sub_analysis_type);
    17201720        }
    1721         else if (analysis_type==ThermalAnalysisEnum()){
     1721        else if (analysis_type==ThermalAnalysisEnum){
    17221722
    17231723                CreatePVectorThermal( pg,inputs,analysis_type,sub_analysis_type);
    17241724        }
    1725         else if (analysis_type==MeltingAnalysisEnum()){
     1725        else if (analysis_type==MeltingAnalysisEnum){
    17261726
    17271727                CreatePVectorMelting( pg,inputs,analysis_type,sub_analysis_type);
    … …  
    26202620int Penta::Enum(void){
    26212621
    2622         return PentaEnum();
     2622        return PentaEnum;
    26232623
    26242624}
    … …  
    40594059        if (!this->properties.onbed) return;
    40604060
    4061         if (sub_analysis_type==HorizAnalysisEnum()){
     4061        if (sub_analysis_type==HorizAnalysisEnum){
    40624062
    40634063                /*MacAyeal or Pattyn*/
    … …  
    40674067                return;
    40684068        }
    4069         else if (sub_analysis_type==StokesAnalysisEnum()){
     4069        else if (sub_analysis_type==StokesAnalysisEnum){
    40704070
    40714071                /*Stokes*/
Note: See TracChangeset for help on using the changeset viewer.