Changeset 5481

Timestamp:

08/23/10 00:32:52 (15 years ago)

Author:

Eric.Larour

Message:

Added node_partition so that AverageOntoPartition can work.
Also changed numresponses to numresponsesdescriptors. numresponses
now comes from the parameters.

File:

• issm/trunk/src/mex/DakotaResponses/DakotaResponses.cpp (modified) (5 diffs)

issm/trunk/src/mex/DakotaResponses/DakotaResponses.cpp

@@ -16 +16 @@
         Materials*  materials=NULL;
         Parameters* parameters=NULL;
+        Vec         node_partition=NULL;
         double*     responses=NULL;
         char**      responses_descriptors=NULL;
         char*       string=NULL;
         int         numresponses;
+        int         numresponsedescriptors;
         mxArray*    pfield=NULL;
         int         stringlength;
@@ -36 +38 @@
         FetchData((DataSet**)&materials,MATERIALSIN);
         FetchParams(&parameters,PARAMETERSIN);
+        FetchData(&node_partition,NODEPARTITION);
+
+        /*number of responses: */
+        parameters->FindParam(&numresponses,QmuNumberOfResponsesEnum);
         
         /*dakota input: */
-        numresponses=mxGetM(RESPONSESDESCRIPTORS);
-        responses_descriptors=(char**)xmalloc(numresponses*sizeof(char*));
-        for(i=0;i<numresponses;i++){
+        numresponsedescriptors=mxGetM(RESPONSESDESCRIPTORS);
+        responses_descriptors=(char**)xmalloc(numresponsedescriptors*sizeof(char*));
+        for(i=0;i<numresponsedescriptors;i++){
                 pfield=mxGetCell(RESPONSESDESCRIPTORS,i);
                 stringlength = (mxGetM(pfield) * mxGetN(pfield) * sizeof(mxChar)) + 1 ;
@@ -57 +63 @@
         
         /*!Generate internal degree of freedom numbers: */
-        DakotaResponsesx(responses,elements,nodes, vertices,loads,materials, parameters,responses_descriptors,numresponses);
+        DakotaResponsesx(responses,elements,nodes, vertices,loads,materials, parameters, node_partition,responses_descriptors,numresponsedescriptors,numresponses);
 
         /*write output datasets: */
@@ -70 +76 @@
         delete parameters;
         
-        for(i=0;i<numresponses;i++){
+        for(i=0;i<numresponsedescriptors;i++){
                 char* string=responses_descriptors[i]; xfree((void**)&string);
         }
@@ -84 +90 @@
 {
         _printf_("\n");
-        _printf_("   usage: [responses] = %s(elements,nodes,vertices,loads,materials,parameters,responses_descritpors,numresponses);\n",__FUNCT__);
+        _printf_("   usage: [responses] = %s(elements,nodes,vertices,loads,materials,parameters,responses_descritpors);\n",__FUNCT__);
         _printf_("\n");
 }