Index: /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h =================================================================== --- /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h (revision 3840) +++ /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h (revision 3841) @@ -1,7 +1,5 @@ - /* ComputeBasalStress.h */ - #ifndef _COMPUTEBASALSTRESS_H @@ -25,7 +23,6 @@ #define MATERIALS (mxArray*)prhs[4] #define PARAMETERS (mxArray*)prhs[5] -#define INPUTS (mxArray*)prhs[6] -#define ANALYSIS (mxArray*)prhs[7] -#define SUBANALYSIS (mxArray*)prhs[8] +#define ANALYSIS (mxArray*)prhs[6] +#define SUBANALYSIS (mxArray*)prhs[7] /* serial output macros: */ @@ -36,6 +33,5 @@ #define NLHS 1 #undef NRHS -#define NRHS 9 - +#define NRHS 8 #endif /* _COMPUTEPRESSURE_H */ Index: /issm/trunk/src/mex/ComputePressure/ComputePressure.h =================================================================== --- /issm/trunk/src/mex/ComputePressure/ComputePressure.h (revision 3840) +++ /issm/trunk/src/mex/ComputePressure/ComputePressure.h (revision 3841) @@ -1,7 +1,5 @@ - /* ComputePressure.h */ - #ifndef _COMPUTEPRESSURE_H @@ -25,7 +23,6 @@ #define MATERIALS (mxArray*)prhs[4] #define PARAMETERS (mxArray*)prhs[5] -#define INPUTS (mxArray*)prhs[6] -#define ANALYSIS (mxArray*)prhs[7] -#define SUBANALYSIS (mxArray*)prhs[8] +#define ANALYSIS (mxArray*)prhs[6] +#define SUBANALYSIS (mxArray*)prhs[7] /* serial output macros: */ @@ -36,6 +33,5 @@ #define NLHS 1 #undef NRHS -#define NRHS 9 - +#define NRHS 8 #endif /* _COMPUTEPRESSURE_H */ Index: /issm/trunk/src/mex/ControlOptimization/ControlOptimization.cpp =================================================================== --- /issm/trunk/src/mex/ControlOptimization/ControlOptimization.cpp (revision 3840) +++ /issm/trunk/src/mex/ControlOptimization/ControlOptimization.cpp (revision 3841) @@ -2,5 +2,4 @@ *\brief: control optimization (replaces fmincon from matlab) */ - #include "./ControlOptimization.h" @@ -51,5 +50,4 @@ optargs.models=MODELS; optargs.param_g=PG; - optargs.inputs=INPUTS; optargs.grad_g=GRADIENT; optargs.n=STEP; @@ -80,5 +78,5 @@ { _printf_("\n"); - _printf_(" usage: [search_scalar J] = %s(function_name,xmin,xmax,options,m,inputs,p_g,grad_g,step,parameters)\n",__FUNCT__); + _printf_(" usage: [search_scalar J] = %s(function_name,xmin,xmax,options,m,p_g,grad_g,step,parameters)\n",__FUNCT__); _printf_("\n"); } Index: /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h =================================================================== --- /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h (revision 3840) +++ /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h (revision 3841) @@ -1,7 +1,5 @@ - /* ControlOptimization.h */ - #ifndef _CONTROLOPTIMIZATION_H @@ -24,9 +22,8 @@ #define OPTIONS (mxArray*)prhs[3] #define MODELS (mxArray*)prhs[4] -#define INPUTS (mxArray*)prhs[5] -#define PG (mxArray*)prhs[6] -#define GRADIENT (mxArray*)prhs[7] -#define STEP (mxArray*)prhs[8] -#define PARAMETERS (mxArray*)prhs[9] +#define PG (mxArray*)prhs[5] +#define GRADIENT (mxArray*)prhs[6] +#define STEP (mxArray*)prhs[7] +#define PARAMETERS (mxArray*)prhs[8] /* serial output macros: */ @@ -38,6 +35,5 @@ #define NLHS 2 #undef NRHS -#define NRHS 10 - +#define NRHS 9 #endif /* _CONTROLOPTIMIZATION_H */ Index: /issm/trunk/src/mex/CostFunction/CostFunction.cpp =================================================================== --- /issm/trunk/src/mex/CostFunction/CostFunction.cpp (revision 3840) +++ /issm/trunk/src/mex/CostFunction/CostFunction.cpp (revision 3841) @@ -17,6 +17,6 @@ DataSet* materials=NULL; Parameters* parameters=NULL; - int analysis_type; - int sub_analysis_type; + int analysis_type; + int sub_analysis_type; /* output datasets: */ Index: /issm/trunk/src/mex/CostFunction/CostFunction.h =================================================================== --- /issm/trunk/src/mex/CostFunction/CostFunction.h (revision 3840) +++ /issm/trunk/src/mex/CostFunction/CostFunction.h (revision 3841) @@ -1,7 +1,5 @@ - /* CostFunction.h */ - #ifndef _COSTFUNCTION_H @@ -25,7 +23,6 @@ #define MATERIALS (mxArray*)prhs[4] #define PARAMETERS (mxArray*)prhs[5] -#define INPUTS (mxArray*)prhs[6] -#define ANALYSIS (mxArray*)prhs[7] -#define SUBANALYSIS (mxArray*)prhs[8] +#define ANALYSIS (mxArray*)prhs[6] +#define SUBANALYSIS (mxArray*)prhs[7] /* serial output macros: */ @@ -36,6 +33,5 @@ #define NLHS 1 #undef NRHS -#define NRHS 9 - +#define NRHS 8 #endif /* _MISFIT_H */ Index: /issm/trunk/src/mex/Du/Du.h =================================================================== --- /issm/trunk/src/mex/Du/Du.h (revision 3840) +++ /issm/trunk/src/mex/Du/Du.h (revision 3841) @@ -1,7 +1,5 @@ - /* Du.h */ - #ifndef _DU_H @@ -25,7 +23,6 @@ #define MATERIALS (mxArray*)prhs[4] #define PARAMETERS (mxArray*)prhs[5] -#define INPUTS (mxArray*)prhs[6] -#define ANALYSIS (mxArray*)prhs[7] -#define SUBANALYSIS (mxArray*)prhs[8] +#define ANALYSIS (mxArray*)prhs[6] +#define SUBANALYSIS (mxArray*)prhs[7] /* serial output macros: */ @@ -36,6 +33,5 @@ #define NLHS 1 #undef NRHS -#define NRHS 9 - +#define NRHS 8 #endif /* _DU_H */ Index: /issm/trunk/src/mex/Gradj/Gradj.h =================================================================== --- /issm/trunk/src/mex/Gradj/Gradj.h (revision 3840) +++ /issm/trunk/src/mex/Gradj/Gradj.h (revision 3841) @@ -1,7 +1,5 @@ - /* Gradj.h */ - #ifndef _GRADJ_H @@ -26,7 +24,6 @@ #define MATERIALS (mxArray*)prhs[4] #define PARAMETERS (mxArray*)prhs[5] -#define INPUTS (mxArray*)prhs[6] -#define ANALYSIS (mxArray*)prhs[7] -#define SUBANALYSIS (mxArray*)prhs[8] +#define ANALYSIS (mxArray*)prhs[6] +#define SUBANALYSIS (mxArray*)prhs[7] /* serial output macros: */ @@ -37,9 +34,5 @@ #define NLHS 1 #undef NRHS -#define NRHS 9 - +#define NRHS 8 #endif /* _GRADJ_H */ - - - Index: /issm/trunk/src/mex/Misfit/Misfit.cpp =================================================================== --- /issm/trunk/src/mex/Misfit/Misfit.cpp (revision 3840) +++ /issm/trunk/src/mex/Misfit/Misfit.cpp (revision 3841) @@ -17,6 +17,6 @@ DataSet* materials=NULL; Parameters* parameters=NULL; - int analysis_type; - int sub_analysis_type; + int analysis_type; + int sub_analysis_type; /* output datasets: */ Index: /issm/trunk/src/mex/Misfit/Misfit.h =================================================================== --- /issm/trunk/src/mex/Misfit/Misfit.h (revision 3840) +++ /issm/trunk/src/mex/Misfit/Misfit.h (revision 3841) @@ -1,7 +1,5 @@ - /* Misfit.h */ - #ifndef _MISFIT_H @@ -25,7 +23,6 @@ #define MATERIALS (mxArray*)prhs[4] #define PARAMETERS (mxArray*)prhs[5] -#define INPUTS (mxArray*)prhs[6] -#define ANALYSIS (mxArray*)prhs[7] -#define SUBANALYSIS (mxArray*)prhs[8] +#define ANALYSIS (mxArray*)prhs[6] +#define SUBANALYSIS (mxArray*)prhs[7] /* serial output macros: */ @@ -36,6 +33,5 @@ #define NLHS 1 #undef NRHS -#define NRHS 9 - +#define NRHS 8 #endif /* _MISFIT_H */ Index: /issm/trunk/src/mex/ParameterOutput/ParameterOutput.cpp =================================================================== --- /issm/trunk/src/mex/ParameterOutput/ParameterOutput.cpp (revision 3840) +++ /issm/trunk/src/mex/ParameterOutput/ParameterOutput.cpp (revision 3841) @@ -15,8 +15,7 @@ DataSet* loads=NULL; DataSet* materials=NULL; - ParameterInputs* inputs=NULL; DataSet* results=NULL; - int analysis_type; - int sub_analysis_type; + int analysis_type; + int sub_analysis_type; /* output datasets: */ @@ -41,10 +40,6 @@ FetchData(&sub_analysis_type,SUBANALYSIS); - /*Fetch inputs: */ - inputs=new ParameterInputs; - inputs->Init(INPUTS); - /*!Generate internal degree of freedom numbers: */ - ParameterOutputx(results, elements,nodes,loads,materials,inputs,analysis_type,sub_analysis_type); + ParameterOutputx(results, elements,nodes,loads,materials,analysis_type,sub_analysis_type); /*write output datasets: */ @@ -57,5 +52,4 @@ delete materials; delete results; - delete inputs; /*end module: */ @@ -66,5 +60,5 @@ { _printf_("\n"); - _printf_(" usage: [Kgg,pg] = %s(eleemnts,nodes,loads,materials,params,inputs,analysis_type);\n",__FUNCT__); + _printf_(" usage: [Kgg,pg] = %s(eleemnts,nodes,loads,materials,params,analysis_type);\n",__FUNCT__); _printf_("\n"); } Index: /issm/trunk/src/mex/ParameterOutput/ParameterOutput.h =================================================================== --- /issm/trunk/src/mex/ParameterOutput/ParameterOutput.h (revision 3840) +++ /issm/trunk/src/mex/ParameterOutput/ParameterOutput.h (revision 3841) @@ -1,7 +1,5 @@ - /* ParameterOutput.h */ - #ifndef _PARAMETEROUTPUT_H @@ -24,8 +22,7 @@ #define MATERIALS (mxArray*)prhs[3] #define PARAMETERS (mxArray*)prhs[4] -#define INPUTS (mxArray*)prhs[5] -#define RESULTS (mxArray*)prhs[6] -#define ANALYSIS (mxArray*)prhs[7] -#define SUBANALYSIS (mxArray*)prhs[8] +#define RESULTS (mxArray*)prhs[5] +#define ANALYSIS (mxArray*)prhs[6] +#define SUBANALYSIS (mxArray*)prhs[7] /* serial output macros: */ @@ -36,6 +33,5 @@ #define NLHS 1 #undef NRHS -#define NRHS 9 - +#define NRHS 8 #endif /* _PARAMETEROUTPUT_H */ Index: /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp =================================================================== --- /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp (revision 3840) +++ /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp (revision 3841) @@ -17,6 +17,6 @@ DataSet* materials=NULL; Parameters* parameters=NULL; - int analysis_type; - int sub_analysis_type; + int analysis_type; + int sub_analysis_type; /*output: */ Index: /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h =================================================================== --- /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h (revision 3840) +++ /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h (revision 3841) @@ -1,7 +1,5 @@ - /* PenaltyConstraints.h */ - #ifndef _PENALTYCONSTRAINTS_H @@ -25,7 +23,6 @@ #define MATERIALS (mxArray*)prhs[4] #define PARAMETERS (mxArray*)prhs[5] -#define INPUTS (mxArray*)prhs[6] -#define ANALYSIS (mxArray*)prhs[7] -#define SUBANALYSIS (mxArray*)prhs[8] +#define ANALYSIS (mxArray*)prhs[6] +#define SUBANALYSIS (mxArray*)prhs[7] /* serial output macros: */ @@ -38,5 +35,5 @@ #define NLHS 3 #undef NRHS -#define NRHS 9 +#define NRHS 8 #endif /* _PENALTYCONSTRAINTS_H */ Index: /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp =================================================================== --- /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp (revision 3840) +++ /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp (revision 3841) @@ -22,7 +22,7 @@ DataSet* materials=NULL; Parameters* parameters=NULL; - int kflag,pflag; - int analysis_type; - int sub_analysis_type; + int kflag,pflag; + int analysis_type; + int sub_analysis_type; /*Boot module: */ Index: /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h =================================================================== --- /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h (revision 3840) +++ /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h (revision 3841) @@ -1,7 +1,5 @@ - /* PenaltySystemMatrices.h */ - #ifndef _PENALTYSYSTEMMATRICES_H @@ -28,7 +26,6 @@ #define MATERIALS (mxArray*)prhs[6] #define PARAMETERS (mxArray*)prhs[7] -#define INPUTS (mxArray*)prhs[8] -#define ANALYSIS (mxArray*)prhs[9] -#define SUBANALYSIS (mxArray*)prhs[10] +#define ANALYSIS (mxArray*)prhs[8] +#define SUBANALYSIS (mxArray*)prhs[9] /* serial output macros: */ @@ -41,6 +38,5 @@ #define NLHS 3 #undef NRHS -#define NRHS 11 - +#define NRHS 10 #endif /* _PENALTYSYSTEMMATRICES_H */ Index: /issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp =================================================================== --- /issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp (revision 3840) +++ /issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp (revision 3841) @@ -20,6 +20,6 @@ int connectivity; int numberofdofspernode; - int analysis_type; - int sub_analysis_type; + int analysis_type; + int sub_analysis_type; /* output datasets: */ @@ -42,8 +42,8 @@ /*parameters: */ + parameters->FindParam(&connectivity,ConnectivityEnum); + parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum); parameters->FindParam(&kflag,KflagEnum); parameters->FindParam(&pflag,PflagEnum); - parameters->FindParam(&connectivity,ConnectivityEnum); - parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum); FetchData(&analysis_type,ANALYSIS); @@ -74,5 +74,5 @@ { _printf_("\n"); - _printf_(" usage: [Kgg,pg] = %s(elements,nodes,vertices,loads,materials,params,analysis_type);\n",__FUNCT__); + _printf_(" usage: [Kgg,pg] = %s(elements,nodes,vertices,loads,materials,parameters,analysis_type,sub_analysis_type);\n",__FUNCT__); _printf_("\n"); } Index: /issm/trunk/src/mex/SystemMatrices/SystemMatrices.h =================================================================== --- /issm/trunk/src/mex/SystemMatrices/SystemMatrices.h (revision 3840) +++ /issm/trunk/src/mex/SystemMatrices/SystemMatrices.h (revision 3841) @@ -1,7 +1,5 @@ - /* SystemMatrices.h */ - #ifndef _SYSTEMMATRICES_H @@ -26,7 +24,6 @@ #define MATERIALS (mxArray*)prhs[4] #define PARAMETERS (mxArray*)prhs[5] -#define INPUTS (mxArray*)prhs[6] -#define ANALYSIS (mxArray*)prhs[7] -#define SUBANALYSIS (mxArray*)prhs[8] +#define ANALYSIS (mxArray*)prhs[6] +#define SUBANALYSIS (mxArray*)prhs[7] /* serial output macros: */ @@ -38,6 +35,5 @@ #define NLHS 2 #undef NRHS -#define NRHS 9 - +#define NRHS 8 #endif /* _SYSTEMMATRICES_H */ Index: /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.cpp =================================================================== --- /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.cpp (revision 3840) +++ /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.cpp (revision 3841) @@ -18,6 +18,6 @@ Parameters* parameters=NULL; Vec solution=NULL; -int analysis_type; -int sub_analysis_type; +int analysis_type; +int sub_analysis_type; /*Boot module: */ Index: /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.h =================================================================== --- /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.h (revision 3840) +++ /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.h (revision 3841) @@ -1,7 +1,5 @@ - /* UpdateInputsFromSolution.h */ - #ifndef _UPDATEINPUTSFROMSOLUTION_H @@ -38,5 +36,4 @@ #define NRHS 9 - #endif /* _UPDATEINPUTSFROMSOLUTION_H */