Changeset 4404


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

analysis and subanalysis not needed here

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

Legend:

Unmodified
Added
Removed

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

    r4218 r4404  
    1818        Parameters* parameters=NULL;
    1919        int      numberofnodes;
    20         int      analysis_type;
    21         int      sub_analysis_type;
    2220
    2321        /* output datasets: */
    … …  
    3735        FetchData((DataSet**)&materials,MATERIALS);
    3836        FetchParams(&parameters,PARAMETERS);
    39         FetchData(&analysis_type,ANALYSIS);
    40         FetchData(&sub_analysis_type,SUBANALYSIS);
    4137
    4238        /*!Generate internal degree of freedom numbers: */
    43         ComputeBasalStressx(&sigma_g, elements,nodes,vertices,loads,materials,parameters,analysis_type,sub_analysis_type);
     39        ComputeBasalStressx(&sigma_g, elements,nodes,vertices,loads,materials,parameters);
    4440
    4541        /*write output datasets: */

  • issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h

    r4236 r4404  
    2323#define MATERIALS (mxArray*)prhs[4]
    2424#define PARAMETERS (mxArray*)prhs[5]
    25 #define ANALYSIS (mxArray*)prhs[6]
    26 #define SUBANALYSIS (mxArray*)prhs[7]
    2725
    2826/* serial output macros: */
    … …  
    3331#define NLHS  1
    3432#undef NRHS
    35 #define NRHS  8
     33#define NRHS  6
    3634
    3735#endif  /* _COMPUTEPRESSURE_H */

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

    r4218 r4404  
    1818        Parameters* parameters=NULL;
    1919        int      numberofnodes;
    20         int      analysis_type;
    21         int      sub_analysis_type;
    2220
    2321        /* output datasets: */
    … …  
    3735        FetchData((DataSet**)&materials,MATERIALS);
    3836        FetchParams(&parameters,PARAMETERS);
    39         FetchData(&analysis_type,ANALYSIS);
    40         FetchData(&sub_analysis_type,SUBANALYSIS);
    4137
    4238        /*!Generate internal degree of freedom numbers: */
    43         ComputePressurex(&p_g, elements,nodes,vertices,loads,materials,parameters,analysis_type,sub_analysis_type);
     39        ComputePressurex(&p_g, elements,nodes,vertices,loads,materials,parameters);
    4440
    4541        /*write output datasets: */

  • issm/trunk/src/mex/ComputePressure/ComputePressure.h

    r4236 r4404  
    2323#define MATERIALS (mxArray*)prhs[4]
    2424#define PARAMETERS (mxArray*)prhs[5]
    25 #define ANALYSIS (mxArray*)prhs[6]
    26 #define SUBANALYSIS (mxArray*)prhs[7]
    2725
    2826/* serial output macros: */
    … …  
    3331#define NLHS  1
    3432#undef NRHS
    35 #define NRHS  8
     33#define NRHS  6
    3634
    3735#endif  /* _COMPUTEPRESSURE_H */
Note: See TracChangeset for help on using the changeset viewer.