Changeset 3841
- Timestamp:
- 05/19/10 10:14:43 (15 years ago)
- Location:
- issm/trunk/src/mex
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h
r3712 r3841 1 2 1 /* 3 2 ComputeBasalStress.h 4 3 */ 5 6 4 7 5 #ifndef _COMPUTEBASALSTRESS_H … … 25 23 #define MATERIALS (mxArray*)prhs[4] 26 24 #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] 30 27 31 28 /* serial output macros: */ … … 36 33 #define NLHS 1 37 34 #undef NRHS 38 #define NRHS 9 39 35 #define NRHS 8 40 36 41 37 #endif /* _COMPUTEPRESSURE_H */ -
issm/trunk/src/mex/ComputePressure/ComputePressure.h
r3712 r3841 1 2 1 /* 3 2 ComputePressure.h 4 3 */ 5 6 4 7 5 #ifndef _COMPUTEPRESSURE_H … … 25 23 #define MATERIALS (mxArray*)prhs[4] 26 24 #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] 30 27 31 28 /* serial output macros: */ … … 36 33 #define NLHS 1 37 34 #undef NRHS 38 #define NRHS 9 39 35 #define NRHS 8 40 36 41 37 #endif /* _COMPUTEPRESSURE_H */ -
issm/trunk/src/mex/ControlOptimization/ControlOptimization.cpp
r2333 r3841 2 2 *\brief: control optimization (replaces fmincon from matlab) 3 3 */ 4 5 4 6 5 #include "./ControlOptimization.h" … … 51 50 optargs.models=MODELS; 52 51 optargs.param_g=PG; 53 optargs.inputs=INPUTS;54 52 optargs.grad_g=GRADIENT; 55 53 optargs.n=STEP; … … 80 78 { 81 79 _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__); 83 81 _printf_("\n"); 84 82 } -
issm/trunk/src/mex/ControlOptimization/ControlOptimization.h
r3712 r3841 1 2 1 /* 3 2 ControlOptimization.h 4 3 */ 5 6 4 7 5 #ifndef _CONTROLOPTIMIZATION_H … … 24 22 #define OPTIONS (mxArray*)prhs[3] 25 23 #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] 31 28 32 29 /* serial output macros: */ … … 38 35 #define NLHS 2 39 36 #undef NRHS 40 #define NRHS 10 41 37 #define NRHS 9 42 38 43 39 #endif /* _CONTROLOPTIMIZATION_H */ -
issm/trunk/src/mex/CostFunction/CostFunction.cpp
r3715 r3841 17 17 DataSet* materials=NULL; 18 18 Parameters* parameters=NULL; 19 int 20 int 19 int analysis_type; 20 int sub_analysis_type; 21 21 22 22 /* output datasets: */ -
issm/trunk/src/mex/CostFunction/CostFunction.h
r3712 r3841 1 2 1 /* 3 2 CostFunction.h 4 3 */ 5 6 4 7 5 #ifndef _COSTFUNCTION_H … … 25 23 #define MATERIALS (mxArray*)prhs[4] 26 24 #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] 30 27 31 28 /* serial output macros: */ … … 36 33 #define NLHS 1 37 34 #undef NRHS 38 #define NRHS 9 39 35 #define NRHS 8 40 36 41 37 #endif /* _MISFIT_H */ -
issm/trunk/src/mex/Du/Du.h
r3712 r3841 1 2 1 /* 3 2 Du.h 4 3 */ 5 6 4 7 5 #ifndef _DU_H … … 25 23 #define MATERIALS (mxArray*)prhs[4] 26 24 #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] 30 27 31 28 /* serial output macros: */ … … 36 33 #define NLHS 1 37 34 #undef NRHS 38 #define NRHS 9 39 35 #define NRHS 8 40 36 41 37 #endif /* _DU_H */ -
issm/trunk/src/mex/Gradj/Gradj.h
r3715 r3841 1 2 1 /* 3 2 Gradj.h 4 3 */ 5 6 4 7 5 #ifndef _GRADJ_H … … 26 24 #define MATERIALS (mxArray*)prhs[4] 27 25 #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] 31 28 32 29 /* serial output macros: */ … … 37 34 #define NLHS 1 38 35 #undef NRHS 39 #define NRHS 9 40 36 #define NRHS 8 41 37 42 38 #endif /* _GRADJ_H */ 43 44 45 -
issm/trunk/src/mex/Misfit/Misfit.cpp
r3715 r3841 17 17 DataSet* materials=NULL; 18 18 Parameters* parameters=NULL; 19 int 20 int 19 int analysis_type; 20 int sub_analysis_type; 21 21 22 22 /* output datasets: */ -
issm/trunk/src/mex/Misfit/Misfit.h
r3712 r3841 1 2 1 /* 3 2 Misfit.h 4 3 */ 5 6 4 7 5 #ifndef _MISFIT_H … … 25 23 #define MATERIALS (mxArray*)prhs[4] 26 24 #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] 30 27 31 28 /* serial output macros: */ … … 36 33 #define NLHS 1 37 34 #undef NRHS 38 #define NRHS 9 39 35 #define NRHS 8 40 36 41 37 #endif /* _MISFIT_H */ -
issm/trunk/src/mex/ParameterOutput/ParameterOutput.cpp
r2333 r3841 15 15 DataSet* loads=NULL; 16 16 DataSet* materials=NULL; 17 ParameterInputs* inputs=NULL;18 17 DataSet* results=NULL; 19 int 20 int 18 int analysis_type; 19 int sub_analysis_type; 21 20 22 21 /* output datasets: */ … … 41 40 FetchData(&sub_analysis_type,SUBANALYSIS); 42 41 43 /*Fetch inputs: */44 inputs=new ParameterInputs;45 inputs->Init(INPUTS);46 47 42 /*!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); 49 44 50 45 /*write output datasets: */ … … 57 52 delete materials; 58 53 delete results; 59 delete inputs;60 54 61 55 /*end module: */ … … 66 60 { 67 61 _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__); 69 63 _printf_("\n"); 70 64 } -
issm/trunk/src/mex/ParameterOutput/ParameterOutput.h
r3712 r3841 1 2 1 /* 3 2 ParameterOutput.h 4 3 */ 5 6 4 7 5 #ifndef _PARAMETEROUTPUT_H … … 24 22 #define MATERIALS (mxArray*)prhs[3] 25 23 #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] 30 27 31 28 /* serial output macros: */ … … 36 33 #define NLHS 1 37 34 #undef NRHS 38 #define NRHS 9 39 35 #define NRHS 8 40 36 41 37 #endif /* _PARAMETEROUTPUT_H */ -
issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp
r3715 r3841 17 17 DataSet* materials=NULL; 18 18 Parameters* parameters=NULL; 19 int 20 int 19 int analysis_type; 20 int sub_analysis_type; 21 21 22 22 /*output: */ -
issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h
r3712 r3841 1 2 1 /* 3 2 PenaltyConstraints.h 4 3 */ 5 6 4 7 5 #ifndef _PENALTYCONSTRAINTS_H … … 25 23 #define MATERIALS (mxArray*)prhs[4] 26 24 #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] 30 27 31 28 /* serial output macros: */ … … 38 35 #define NLHS 3 39 36 #undef NRHS 40 #define NRHS 937 #define NRHS 8 41 38 42 39 #endif /* _PENALTYCONSTRAINTS_H */ -
issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp
r3715 r3841 22 22 DataSet* materials=NULL; 23 23 Parameters* parameters=NULL; 24 int 25 int 26 int 24 int kflag,pflag; 25 int analysis_type; 26 int sub_analysis_type; 27 27 28 28 /*Boot module: */ -
issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h
r3715 r3841 1 2 1 /* 3 2 PenaltySystemMatrices.h 4 3 */ 5 6 4 7 5 #ifndef _PENALTYSYSTEMMATRICES_H … … 28 26 #define MATERIALS (mxArray*)prhs[6] 29 27 #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] 33 30 34 31 /* serial output macros: */ … … 41 38 #define NLHS 3 42 39 #undef NRHS 43 #define NRHS 11 44 40 #define NRHS 10 45 41 46 42 #endif /* _PENALTYSYSTEMMATRICES_H */ -
issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp
r3836 r3841 20 20 int connectivity; 21 21 int numberofdofspernode; 22 int 23 int 22 int analysis_type; 23 int sub_analysis_type; 24 24 25 25 /* output datasets: */ … … 42 42 43 43 /*parameters: */ 44 parameters->FindParam(&connectivity,ConnectivityEnum); 45 parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum); 44 46 parameters->FindParam(&kflag,KflagEnum); 45 47 parameters->FindParam(&pflag,PflagEnum); 46 parameters->FindParam(&connectivity,ConnectivityEnum);47 parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);48 48 49 49 FetchData(&analysis_type,ANALYSIS); … … 74 74 { 75 75 _printf_("\n"); 76 _printf_(" usage: [Kgg,pg] = %s(elements,nodes,vertices,loads,materials,param s,analysis_type);\n",__FUNCT__);76 _printf_(" usage: [Kgg,pg] = %s(elements,nodes,vertices,loads,materials,parameters,analysis_type,sub_analysis_type);\n",__FUNCT__); 77 77 _printf_("\n"); 78 78 } -
issm/trunk/src/mex/SystemMatrices/SystemMatrices.h
r3715 r3841 1 2 1 /* 3 2 SystemMatrices.h 4 3 */ 5 6 4 7 5 #ifndef _SYSTEMMATRICES_H … … 26 24 #define MATERIALS (mxArray*)prhs[4] 27 25 #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] 31 28 32 29 /* serial output macros: */ … … 38 35 #define NLHS 2 39 36 #undef NRHS 40 #define NRHS 9 41 37 #define NRHS 8 42 38 43 39 #endif /* _SYSTEMMATRICES_H */ -
issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.cpp
r3712 r3841 18 18 Parameters* parameters=NULL; 19 19 Vec solution=NULL; 20 int 21 int 20 int analysis_type; 21 int sub_analysis_type; 22 22 23 23 /*Boot module: */ -
issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.h
r3712 r3841 1 2 1 /* 3 2 UpdateInputsFromSolution.h 4 3 */ 5 6 4 7 5 #ifndef _UPDATEINPUTSFROMSOLUTION_H … … 38 36 #define NRHS 9 39 37 40 41 38 #endif /* _UPDATEINPUTSFROMSOLUTION_H */ 42 39
Note:
See TracChangeset
for help on using the changeset viewer.