Changeset 4228


Ignore:
Timestamp:
06/25/10 08:23:39 (15 years ago)
Author:
seroussi
Message:

step and time optional in InputToResult

Location:
issm/trunk/src/mex/InputToResult
Files:
2 edited

Legend:

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

    r4218 r4228  
    2424
    2525        /*checks on arguments on the matlab side: */
    26         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputToResultUsage);
     26        //CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ContourToMeshUsage); Cant' use it here, as we have variable inputs.
     27        if((nlhs!=NLHS) || (nrhs!=7 && nrhs!=9)){
     28                InputToResultUsage();
     29                ISSMERROR(" usage. See above");
     30        }
    2731
    2832        /*Input datasets: */
     
    3539       
    3640        FetchData(&enum_type,ENUMTYPE);
    37         FetchData(&step,STEP);
    38         FetchData(&time,TIME);
    3941
    40         /*!Call core code: */
    41         InputToResultx( elements, nodes, vertices, loads, materials,parameters,enum_type, step,time);
     42        if(nrhs==9){
     43                FetchData(&step,STEP);
     44                FetchData(&time,TIME);
     45
     46                /*!Call core code: */
     47                InputToResultx( elements, nodes, vertices, loads, materials,parameters,enum_type, step,time);
     48        }
     49        else{
     50
     51                /*!Call core code: */
     52                InputToResultx( elements, nodes, vertices, loads, materials,parameters,enum_type);
     53        }
    4254
    4355        /*write output : */
     
    6173        _printf_("\n");
    6274        _printf_("   usage: [elements] = %s(elements, nodes, vertices, loads, materials, parameters, enum_type,step,time);\n",__FUNCT__);
     75        _printf_("   usage: [elements] = %s(elements, nodes, vertices, loads, materials, parameters, enum_type);\n",__FUNCT__);
    6376        _printf_("\n");
    6477}
  • issm/trunk/src/mex/InputToResult/InputToResult.h

    r4138 r4228  
    3333#undef NLHS
    3434#define NLHS  1
    35 #undef NRHS
    36 #define NRHS  9
    3735
    3836#endif  /* _INPUTTORESULT_H */
Note: See TracChangeset for help on using the changeset viewer.