Changeset 4095


Ignore:
Timestamp:
06/21/10 16:10:44 (15 years ago)
Author:
Eric.Larour
Message:

Moved DepthAverageInput to InputDepthAverage

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

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.cpp

    r4094 r4095  
    1 /*\file DepthAverageInput.c
     1/*\file InputDepthAverage.c
    22*\brief: update elements properties using an input  vector
    33*/
    44
    5 #include "./DepthAverageInput.h"
     5#include "./InputDepthAverage.h"
    66
    77void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){
    88
    99/*diverse: */
    10 int   noerr=1;
     10int         noerr             = 1;
    1111
    1212/*input datasets: */
    13 DataSet* elements=NULL;
    14 DataSet* nodes=NULL;
    15 DataSet* vertices=NULL;
    16 DataSet* loads=NULL;
    17 DataSet* materials=NULL;
    18 Parameters* parameters=NULL;
    19 int      NameEnum;
     13DataSet    *elements          = NULL;
     14DataSet    *nodes             = NULL;
     15DataSet    *vertices          = NULL;
     16DataSet    *loads             = NULL;
     17DataSet    *materials         = NULL;
     18Parameters *parameters        = NULL;
     19int         enum_type;
     20int         average_enum_type;
    2021
    2122/*Boot module: */
     
    2324
    2425/*checks on arguments on the matlab side: */
    25 CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&DepthAverageInputUsage);
     26CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputDepthAverageUsage);
    2627
    2728/*Input datasets: */
     
    3233FetchData(&materials,MATERIALSIN);
    3334FetchParams(&parameters,PARAMETERSIN);
    34 FetchData(&NameEnum,NAME);
     35FetchData(&enum_type,ENUMTYPE);
     36FetchData(&average_enum_type,AVERAGEENUMTYPE);
    3537
    36 /*!Generate internal degree of freedom numbers: */
    37 DepthAverageInputx(elements,nodes,vertices,loads, materials,parameters,NameEnum);
     38/*call "x" code layer*/
     39InputDepthAveragex(elements,nodes,vertices,loads, materials,parameters,enum_type,average_enum_type);
    3840
    3941/*write output datasets: */
     
    5759}
    5860
    59 void DepthAverageInputUsage(void)
     61void InputDepthAverageUsage(void)
    6062{
    6163        _printf_("\n");
  • issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.h

    r4094 r4095  
    11/*
    2         DepthAverageInput.h
     2        InputDepthAverage.h
    33*/
    44
     
    77
    88/* local prototypes: */
    9 void DepthAverageInputUsage(void);
     9void InputDepthAverageUsage(void);
    1010
    1111#include "../../c/modules/modules.h"
     
    1515
    1616#undef __FUNCT__
    17 #define __FUNCT__  "DepthAverageInput"
     17#define __FUNCT__  "InputDepthAverage"
    1818
    1919/* serial input macros: */
     
    2424#define MATERIALSIN (mxArray*)prhs[4]
    2525#define PARAMETERSIN (mxArray*)prhs[5]
    26 #define NAME (mxArray*)prhs[6]
     26#define ENUMTYPE(mxArray*)prhs[6]
     27#define AVERAGEENUMTYPE(mxArray*)prhs[7]
    2728
    2829/* serial output macros: */
     
    3839#define NLHS  6
    3940#undef NRHS
    40 #define NRHS  7
     41#define NRHS  8
    4142
    4243#endif  /* _DEPTHAVERAGEINPUT_H */
  • issm/trunk/src/mex/Makefile.am

    r4063 r4095  
    1717                                ControlConstrain \
    1818                                CostFunction \
    19                                 DepthAverageInput\
     19                                InputDepthAverage\
    2020                                NodesDof\
    2121                                VerticesDof\
     
    126126                                                CostFunction/CostFunction.h
    127127
    128 DepthAverageInput_SOURCES = DepthAverageInput/DepthAverageInput.cpp\
    129                           DepthAverageInput/DepthAverageInput.h
     128InputDepthAverage_SOURCES = InputDepthAverage/InputDepthAverage.cpp\
     129                          InputDepthAverage/InputDepthAverage.h
    130130
    131131NodesDof_SOURCES = NodesDof/NodesDof.cpp\
Note: See TracChangeset for help on using the changeset viewer.