Changeset 1649


Ignore:
Timestamp:
08/11/09 15:13:02 (16 years ago)
Author:
Mathieu Morlighem
Message:

Analysis_types are now always Enums not strings

Location:
issm/trunk/src/mex
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/mex/Du/Du.cpp

    r1185 r1649  
    1616        DataSet* materials=NULL;
    1717        ParameterInputs* inputs=NULL;
    18         char*             analysis_type_string=NULL;
    1918        int               analysis_type;
    20         char*             sub_analysis_type_string=NULL;
    2119        int               sub_analysis_type;
    2220
    … …  
    3634        FetchData((void**)&loads,NULL,NULL,LOADS,"DataSet",NULL);
    3735        FetchData((void**)&materials,NULL,NULL,MATERIALS,"DataSet",NULL);
    38         FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
    39         analysis_type=AnalysisTypeAsEnum(analysis_type_string);
    40         FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
    41         sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
     36        FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
     37        FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
    4238
    4339        /*Fetch inputs: */
    … …  
    5854        VecFree(&du_g);
    5955        delete inputs;
    60         xfree((void**)&analysis_type_string);
    61         xfree((void**)&sub_analysis_type_string);
    6256
    6357        /*end module: */

  • issm/trunk/src/mex/Gradj/Gradj.cpp

    r1188 r1649  
    1717        char*    control_type=NULL;
    1818        ParameterInputs* inputs=NULL;
    19         char*    analysis_type_string=NULL;
    2019        int      analysis_type;
    21         char*    sub_analysis_type_string=NULL;
    2220        int      sub_analysis_type;
    2321        int      numberofnodes;
    … …  
    4038        FetchData((void**)&numberofnodes,NULL,NULL,mxGetField(PARAMETERS,0,"numberofnodes"),"Integer",NULL);
    4139        FetchData((void**)&control_type,NULL,NULL,mxGetField(PARAMETERS,0,"control_type"),"String",NULL);
    42         FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
    43         analysis_type=AnalysisTypeAsEnum(analysis_type_string);
    44         FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
    45         sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
     40        FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
     41        FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
    4642
    4743        /*Fetch inputs: */
    … …  
    6359        delete inputs;
    6460        VecFree(&grad_g);
    65         xfree((void**)&analysis_type_string);
    66         xfree((void**)&sub_analysis_type_string);
    6761
    6862        /*end module: */

  • issm/trunk/src/mex/Misfit/Misfit.cpp

    r1185 r1649  
    1616        DataSet* materials=NULL;
    1717        ParameterInputs* inputs=NULL;
    18         char*             analysis_type_string=NULL;
    1918        int               analysis_type;
    20         char*             sub_analysis_type_string=NULL;
    2119        int               sub_analysis_type;
    2220
    … …  
    3533        FetchData((void**)&loads,NULL,NULL,LOADS,"DataSet",NULL);
    3634        FetchData((void**)&materials,NULL,NULL,MATERIALS,"DataSet",NULL);
    37         FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
    38         analysis_type=AnalysisTypeAsEnum(analysis_type_string);
    39         FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
    40         sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
     35        FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
     36        FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
    4137
    4238        /*Fetch inputs: */
    … …  
    5652        delete materials;
    5753        delete inputs;
    58         xfree((void**)&analysis_type_string);
    59         xfree((void**)&sub_analysis_type_string);
    6054
    6155        /*end module: */

  • issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp

    r503 r1649  
    1616        DataSet* materials=NULL;
    1717        ParameterInputs* inputs=NULL;
    18         char*             analysis_type_string=NULL;
    1918        int               analysis_type;
    20         char*             sub_analysis_type_string=NULL;
    2119        int               sub_analysis_type;
    2220
    … …  
    3836
    3937        /*parameters: */
    40         FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
    41         analysis_type=AnalysisTypeAsEnum(analysis_type_string);
    42 
    43         FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
    44         sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
     38        FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
     39        FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
    4540
    4641        /*Fetch inputs: */
    … …  
    6358        delete materials;
    6459        delete inputs;
    65         xfree((void**)&analysis_type_string);
    66         xfree((void**)&sub_analysis_type_string);
    6760
    6861        /*end module: */

  • issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp

    r503 r1649  
    2323        ParameterInputs* inputs=NULL;
    2424        int               analysis_type;
    25         char*             analysis_type_string=NULL;
    2625        int               sub_analysis_type;
    27         char*             sub_analysis_type_string=NULL;
    2826       
    2927        /*Boot module: */
    … …  
    4341        FetchData((void**)&kflag,NULL,NULL,mxGetField(PARAMETERS,0,"kflag"),"Integer",NULL);
    4442        FetchData((void**)&pflag,NULL,NULL,mxGetField(PARAMETERS,0,"pflag"),"Integer",NULL);
    45 
    46         FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
    47         analysis_type=AnalysisTypeAsEnum(analysis_type_string);
    48 
    49         FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
    50         sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
    51 
     43        FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
     44        FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
    5245
    5346        /*Fetch inputs: */
    … …  
    7164        MatFree(&Kgg);
    7265        VecFree(&pg);
    73         xfree((void**)&analysis_type_string);
    74         xfree((void**)&sub_analysis_type_string);
    7566
    7667        /*end module: */

  • issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp

    r465 r1649  
    1919        int         numberofdofspernode;
    2020        ParameterInputs* inputs=NULL;
    21         char*             analysis_type_string=NULL;
    2221        int               analysis_type;
    23         char*             sub_analysis_type_string=NULL;
    2422        int               sub_analysis_type;
    2523       
    … …  
    4442        FetchData((void**)&connectivity,NULL,NULL,mxGetField(PARAMETERS,0,"connectivity"),"Integer",NULL);
    4543        FetchData((void**)&numberofdofspernode,NULL,NULL,mxGetField(PARAMETERS,0,"numberofdofspernode"),"Integer",NULL);
    46 
    47         FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
    48         analysis_type=AnalysisTypeAsEnum(analysis_type_string);
    49 
    50         FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
    51         sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
     44        FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
     45        FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
    5246
    5347        /*Fetch inputs: */
    … …  
    6458       
    6559        /*Free ressources: */
    66         xfree((void**)&analysis_type_string);
    67         xfree((void**)&sub_analysis_type_string);
    6860        delete elements;
    6961        delete nodes;
Note: See TracChangeset for help on using the changeset viewer.