Changeset 3841


Ignore:
Timestamp:
05/19/10 10:14:43 (15 years ago)
Author:
seroussi
Message:

no inputs in arguments

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

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h

    r3712 r3841  
    1 
    21/*
    32        ComputeBasalStress.h
    43*/
    5 
    64
    75#ifndef _COMPUTEBASALSTRESS_H
     
    2523#define MATERIALS (mxArray*)prhs[4]
    2624#define PARAMETERS (mxArray*)prhs[5]
    27 #define INPUTS (mxArray*)prhs[6]
    28 #define ANALYSIS (mxArray*)prhs[7]
    29 #define SUBANALYSIS (mxArray*)prhs[8]
     25#define ANALYSIS (mxArray*)prhs[6]
     26#define SUBANALYSIS (mxArray*)prhs[7]
    3027
    3128/* serial output macros: */
     
    3633#define NLHS  1
    3734#undef NRHS
    38 #define NRHS  9
    39 
     35#define NRHS  8
    4036
    4137#endif  /* _COMPUTEPRESSURE_H */
  • issm/trunk/src/mex/ComputePressure/ComputePressure.h

    r3712 r3841  
    1 
    21/*
    32        ComputePressure.h
    43*/
    5 
    64
    75#ifndef _COMPUTEPRESSURE_H
     
    2523#define MATERIALS (mxArray*)prhs[4]
    2624#define PARAMETERS (mxArray*)prhs[5]
    27 #define INPUTS (mxArray*)prhs[6]
    28 #define ANALYSIS (mxArray*)prhs[7]
    29 #define SUBANALYSIS (mxArray*)prhs[8]
     25#define ANALYSIS (mxArray*)prhs[6]
     26#define SUBANALYSIS (mxArray*)prhs[7]
    3027
    3128/* serial output macros: */
     
    3633#define NLHS  1
    3734#undef NRHS
    38 #define NRHS  9
    39 
     35#define NRHS  8
    4036
    4137#endif  /* _COMPUTEPRESSURE_H */
  • issm/trunk/src/mex/ControlOptimization/ControlOptimization.cpp

    r2333 r3841  
    22 *\brief: control optimization (replaces fmincon from matlab)
    33 */
    4  
    54
    65#include "./ControlOptimization.h"
     
    5150        optargs.models=MODELS;
    5251        optargs.param_g=PG;
    53         optargs.inputs=INPUTS;
    5452        optargs.grad_g=GRADIENT;
    5553        optargs.n=STEP;
     
    8078{
    8179        _printf_("\n");
    82         _printf_("   usage: [search_scalar J] = %s(function_name,xmin,xmax,options,m,inputs,p_g,grad_g,step,parameters)\n",__FUNCT__);
     80        _printf_("   usage: [search_scalar J] = %s(function_name,xmin,xmax,options,m,p_g,grad_g,step,parameters)\n",__FUNCT__);
    8381        _printf_("\n");
    8482}
  • issm/trunk/src/mex/ControlOptimization/ControlOptimization.h

    r3712 r3841  
    1 
    21/*
    32        ControlOptimization.h
    43*/
    5 
    64
    75#ifndef _CONTROLOPTIMIZATION_H
     
    2422#define OPTIONS (mxArray*)prhs[3]
    2523#define MODELS (mxArray*)prhs[4]
    26 #define INPUTS (mxArray*)prhs[5]
    27 #define PG (mxArray*)prhs[6]
    28 #define GRADIENT (mxArray*)prhs[7]
    29 #define STEP (mxArray*)prhs[8]
    30 #define PARAMETERS (mxArray*)prhs[9]
     24#define PG (mxArray*)prhs[5]
     25#define GRADIENT (mxArray*)prhs[6]
     26#define STEP (mxArray*)prhs[7]
     27#define PARAMETERS (mxArray*)prhs[8]
    3128
    3229/* serial output macros: */
     
    3835#define NLHS  2
    3936#undef NRHS
    40 #define NRHS  10
    41 
     37#define NRHS  9
    4238
    4339#endif  /* _CONTROLOPTIMIZATION_H */
  • issm/trunk/src/mex/CostFunction/CostFunction.cpp

    r3715 r3841  
    1717        DataSet* materials=NULL;
    1818        Parameters* parameters=NULL;
    19         int               analysis_type;
    20         int               sub_analysis_type;
     19        int      analysis_type;
     20        int      sub_analysis_type;
    2121
    2222        /* output datasets: */
  • issm/trunk/src/mex/CostFunction/CostFunction.h

    r3712 r3841  
    1 
    21/*
    32        CostFunction.h
    43*/
    5 
    64
    75#ifndef _COSTFUNCTION_H
     
    2523#define MATERIALS (mxArray*)prhs[4]
    2624#define PARAMETERS (mxArray*)prhs[5]
    27 #define INPUTS (mxArray*)prhs[6]
    28 #define ANALYSIS (mxArray*)prhs[7]
    29 #define SUBANALYSIS (mxArray*)prhs[8]
     25#define ANALYSIS (mxArray*)prhs[6]
     26#define SUBANALYSIS (mxArray*)prhs[7]
    3027
    3128/* serial output macros: */
     
    3633#define NLHS  1
    3734#undef NRHS
    38 #define NRHS  9
    39 
     35#define NRHS  8
    4036
    4137#endif  /* _MISFIT_H */
  • issm/trunk/src/mex/Du/Du.h

    r3712 r3841  
    1 
    21/*
    32        Du.h
    43*/
    5 
    64
    75#ifndef _DU_H
     
    2523#define MATERIALS (mxArray*)prhs[4]
    2624#define PARAMETERS (mxArray*)prhs[5]
    27 #define INPUTS (mxArray*)prhs[6]
    28 #define ANALYSIS (mxArray*)prhs[7]
    29 #define SUBANALYSIS (mxArray*)prhs[8]
     25#define ANALYSIS (mxArray*)prhs[6]
     26#define SUBANALYSIS (mxArray*)prhs[7]
    3027
    3128/* serial output macros: */
     
    3633#define NLHS  1
    3734#undef NRHS
    38 #define NRHS  9
    39 
     35#define NRHS  8
    4036
    4137#endif  /* _DU_H */
  • issm/trunk/src/mex/Gradj/Gradj.h

    r3715 r3841  
    1 
    21/*
    32        Gradj.h
    43*/
    5 
    64
    75#ifndef _GRADJ_H
     
    2624#define MATERIALS (mxArray*)prhs[4]
    2725#define PARAMETERS (mxArray*)prhs[5]
    28 #define INPUTS (mxArray*)prhs[6]
    29 #define ANALYSIS (mxArray*)prhs[7]
    30 #define SUBANALYSIS (mxArray*)prhs[8]
     26#define ANALYSIS (mxArray*)prhs[6]
     27#define SUBANALYSIS (mxArray*)prhs[7]
    3128
    3229/* serial output macros: */
     
    3734#define NLHS  1
    3835#undef NRHS
    39 #define NRHS  9
    40 
     36#define NRHS  8
    4137
    4238#endif  /* _GRADJ_H */
    43 
    44 
    45 
  • issm/trunk/src/mex/Misfit/Misfit.cpp

    r3715 r3841  
    1717        DataSet* materials=NULL;
    1818        Parameters* parameters=NULL;
    19         int               analysis_type;
    20         int               sub_analysis_type;
     19        int      analysis_type;
     20        int      sub_analysis_type;
    2121
    2222        /* output datasets: */
  • issm/trunk/src/mex/Misfit/Misfit.h

    r3712 r3841  
    1 
    21/*
    32        Misfit.h
    43*/
    5 
    64
    75#ifndef _MISFIT_H
     
    2523#define MATERIALS (mxArray*)prhs[4]
    2624#define PARAMETERS (mxArray*)prhs[5]
    27 #define INPUTS (mxArray*)prhs[6]
    28 #define ANALYSIS (mxArray*)prhs[7]
    29 #define SUBANALYSIS (mxArray*)prhs[8]
     25#define ANALYSIS (mxArray*)prhs[6]
     26#define SUBANALYSIS (mxArray*)prhs[7]
    3027
    3128/* serial output macros: */
     
    3633#define NLHS  1
    3734#undef NRHS
    38 #define NRHS  9
    39 
     35#define NRHS  8
    4036
    4137#endif  /* _MISFIT_H */
  • issm/trunk/src/mex/ParameterOutput/ParameterOutput.cpp

    r2333 r3841  
    1515        DataSet* loads=NULL;
    1616        DataSet* materials=NULL;
    17         ParameterInputs* inputs=NULL;
    1817        DataSet* results=NULL;
    19         int               analysis_type;
    20         int               sub_analysis_type;
     18        int      analysis_type;
     19        int      sub_analysis_type;
    2120       
    2221        /* output datasets: */
     
    4140        FetchData(&sub_analysis_type,SUBANALYSIS);
    4241
    43         /*Fetch inputs: */
    44         inputs=new ParameterInputs;
    45         inputs->Init(INPUTS);
    46 
    4742        /*!Generate internal degree of freedom numbers: */
    48         ParameterOutputx(results, elements,nodes,loads,materials,inputs,analysis_type,sub_analysis_type);
     43        ParameterOutputx(results, elements,nodes,loads,materials,analysis_type,sub_analysis_type);
    4944
    5045        /*write output datasets: */
     
    5752        delete materials;
    5853        delete results;
    59         delete inputs;
    6054
    6155        /*end module: */
     
    6660{
    6761        _printf_("\n");
    68         _printf_("   usage: [Kgg,pg] = %s(eleemnts,nodes,loads,materials,params,inputs,analysis_type);\n",__FUNCT__);
     62        _printf_("   usage: [Kgg,pg] = %s(eleemnts,nodes,loads,materials,params,analysis_type);\n",__FUNCT__);
    6963        _printf_("\n");
    7064}
  • issm/trunk/src/mex/ParameterOutput/ParameterOutput.h

    r3712 r3841  
    1 
    21/*
    32        ParameterOutput.h
    43*/
    5 
    64
    75#ifndef _PARAMETEROUTPUT_H
     
    2422#define MATERIALS (mxArray*)prhs[3]
    2523#define PARAMETERS (mxArray*)prhs[4]
    26 #define INPUTS (mxArray*)prhs[5]
    27 #define RESULTS (mxArray*)prhs[6]
    28 #define ANALYSIS (mxArray*)prhs[7]
    29 #define SUBANALYSIS (mxArray*)prhs[8]
     24#define RESULTS (mxArray*)prhs[5]
     25#define ANALYSIS (mxArray*)prhs[6]
     26#define SUBANALYSIS (mxArray*)prhs[7]
    3027
    3128/* serial output macros: */
     
    3633#define NLHS  1
    3734#undef NRHS
    38 #define NRHS  9
    39 
     35#define NRHS  8
    4036
    4137#endif  /* _PARAMETEROUTPUT_H */
  • issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp

    r3715 r3841  
    1717        DataSet* materials=NULL;
    1818        Parameters* parameters=NULL;
    19         int               analysis_type;
    20         int               sub_analysis_type;
     19        int      analysis_type;
     20        int      sub_analysis_type;
    2121
    2222        /*output: */
  • issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h

    r3712 r3841  
    1 
    21/*
    32        PenaltyConstraints.h
    43*/
    5 
    64
    75#ifndef _PENALTYCONSTRAINTS_H
     
    2523#define MATERIALS (mxArray*)prhs[4]
    2624#define PARAMETERS (mxArray*)prhs[5]
    27 #define INPUTS (mxArray*)prhs[6]
    28 #define ANALYSIS (mxArray*)prhs[7]
    29 #define SUBANALYSIS (mxArray*)prhs[8]
     25#define ANALYSIS (mxArray*)prhs[6]
     26#define SUBANALYSIS (mxArray*)prhs[7]
    3027
    3128/* serial output macros: */
     
    3835#define NLHS  3
    3936#undef NRHS
    40 #define NRHS  9
     37#define NRHS  8
    4138
    4239#endif  /* _PENALTYCONSTRAINTS_H */
  • issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp

    r3715 r3841  
    2222        DataSet* materials=NULL;
    2323        Parameters* parameters=NULL;
    24         int         kflag,pflag;
    25         int               analysis_type;
    26         int               sub_analysis_type;
     24        int      kflag,pflag;
     25        int      analysis_type;
     26        int      sub_analysis_type;
    2727       
    2828        /*Boot module: */
  • issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h

    r3715 r3841  
    1 
    21/*
    32        PenaltySystemMatrices.h
    43*/
    5 
    64
    75#ifndef _PENALTYSYSTEMMATRICES_H
     
    2826#define MATERIALS (mxArray*)prhs[6]
    2927#define PARAMETERS (mxArray*)prhs[7]
    30 #define INPUTS (mxArray*)prhs[8]
    31 #define ANALYSIS (mxArray*)prhs[9]
    32 #define SUBANALYSIS (mxArray*)prhs[10]
     28#define ANALYSIS (mxArray*)prhs[8]
     29#define SUBANALYSIS (mxArray*)prhs[9]
    3330
    3431/* serial output macros: */
     
    4138#define NLHS  3
    4239#undef NRHS
    43 #define NRHS  11
    44 
     40#define NRHS  10
    4541
    4642#endif  /* _PENALTYSYSTEMMATRICES_H */
  • issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp

    r3836 r3841  
    2020        int         connectivity;
    2121        int         numberofdofspernode;
    22         int               analysis_type;
    23         int               sub_analysis_type;
     22        int         analysis_type;
     23        int         sub_analysis_type;
    2424       
    2525        /* output datasets: */
     
    4242
    4343        /*parameters: */
     44        parameters->FindParam(&connectivity,ConnectivityEnum);
     45        parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);
    4446        parameters->FindParam(&kflag,KflagEnum);
    4547        parameters->FindParam(&pflag,PflagEnum);
    46         parameters->FindParam(&connectivity,ConnectivityEnum);
    47         parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);
    4848
    4949        FetchData(&analysis_type,ANALYSIS);
     
    7474{
    7575        _printf_("\n");
    76         _printf_("   usage: [Kgg,pg] = %s(elements,nodes,vertices,loads,materials,params,analysis_type);\n",__FUNCT__);
     76        _printf_("   usage: [Kgg,pg] = %s(elements,nodes,vertices,loads,materials,parameters,analysis_type,sub_analysis_type);\n",__FUNCT__);
    7777        _printf_("\n");
    7878}
  • issm/trunk/src/mex/SystemMatrices/SystemMatrices.h

    r3715 r3841  
    1 
    21/*
    32        SystemMatrices.h
    43*/
    5 
    64
    75#ifndef _SYSTEMMATRICES_H
     
    2624#define MATERIALS (mxArray*)prhs[4]
    2725#define PARAMETERS (mxArray*)prhs[5]
    28 #define INPUTS (mxArray*)prhs[6]
    29 #define ANALYSIS (mxArray*)prhs[7]
    30 #define SUBANALYSIS (mxArray*)prhs[8]
     26#define ANALYSIS (mxArray*)prhs[6]
     27#define SUBANALYSIS (mxArray*)prhs[7]
    3128
    3229/* serial output macros: */
     
    3835#define NLHS  2
    3936#undef NRHS
    40 #define NRHS  9
    41 
     37#define NRHS  8
    4238
    4339#endif  /* _SYSTEMMATRICES_H */
  • issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.cpp

    r3712 r3841  
    1818Parameters* parameters=NULL;
    1919Vec      solution=NULL;
    20 int               analysis_type;
    21 int               sub_analysis_type;
     20int      analysis_type;
     21int      sub_analysis_type;
    2222
    2323/*Boot module: */
  • issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.h

    r3712 r3841  
    1 
    21/*
    32        UpdateInputsFromSolution.h
    43*/
    5 
    64
    75#ifndef _UPDATEINPUTSFROMSOLUTION_H
     
    3836#define NRHS  9
    3937
    40 
    4138#endif  /* _UPDATEINPUTSFROMSOLUTION_H */
    4239
Note: See TracChangeset for help on using the changeset viewer.