Changeset 2312

Timestamp:

09/24/09 10:55:15 (15 years ago)

Author:

Eric.Larour

Message:

Added numoutput, and parameteroutput.

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• CreateParameters.cpp (modified) (2 diffs)
• IoModel.cpp (modified) (2 diffs)
• IoModel.h (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -23 +23 @@
         int      numberofdofspernode;
         int      dim;
-
+        char**   parameteroutput=NULL;
+        char*    descriptor=NULL;
+        char*    tag=NULL;
+        #ifdef _SERIAL_
+                mxArray* pfield=NULL;
+                mxArray* pfield2=NULL;
+        #endif
 
         /*Initialize dataset: */
@@ -218 +224 @@
         xfree((void**)&iomodel->riftinfo); 
         
+        
+        /*parameteroutput: */
+        count++;
+        param= new Param(count,"numoutput",INTEGER);
+        param->SetInteger(iomodel->numoutput);
+        parameters->AddObject(param);
+
+        if(iomodel->numoutput){
+                parameteroutput=(char**)xmalloc(iomodel->numoutput*sizeof(char*));
+
+                #ifdef _SERIAL_
+                pfield=mxGetField(iomodel_handle,0,"parameteroutput");
+                for(i=0;i<iomodel->numoutput;i++){
+                        pfield2=mxGetCell(pfield,i);
+                        FetchData((void**)&descriptor,NULL,NULL,pfield2,"String",NULL);
+                        parameteroutput[i]=descriptor;
+                }
+                #else
+                tag=(char*)xmalloc((strlen("parameteroutput_i")+1)*sizeof(char));
+                for(i=0;i<iomodel->numoutput;i++){
+                        sprintf(tag,"%s%i","parameteroutput_",i);
+                        IoModelFetchData((void**)&descriptor,NULL,NULL,iomodel_handle,tag,"String",NULL);
+                        parameteroutput[i]=descriptor;
+                }
+                #endif
+
+                /*Ok, we have all the parameter output  descriptors. Build a parameter with it: */
+                count++;
+                param= new Param(count,"parameteroutput",STRINGARRAY);
+                param->SetStringArray(parameteroutput,iomodel->numoutput);
+                parameters->AddObject(param);
+        }
+
         /*All our datasets are already ordered by ids. Set presort flag so that later on, when sorting is requested on these 
          * datasets, it will not be redone: */
         parameters->Presort();
 
+        /*Free data: */
+        xfree((void**)&tag);
+        for(i=0;i<iomodel->numoutput;i++){
+                char* descriptor=parameteroutput[i];
+                xfree((void**)&descriptor);
+        }
+        xfree((void**)&parameteroutput);
+
+
         /*Assign output pointer: */
         *pparameters=parameters;

issm/trunk/src/c/ModelProcessorx/IoModel.cpp

@@ -160 +160 @@
         /*!basal: */
         iomodel->accumulation=NULL;
+        
+        /*parameter output: */
+        iomodel->numoutput=0;
 
         /*elements type: */
@@ -368 +371 @@
                 IoModelFetchData((void**)&iomodel->qmu_npart,NULL,NULL,iomodel_handle,"npart","Integer",NULL);
         }
+        
+        /*parameter output : */
+        IoModelFetchData((void**)&iomodel->numoutput,NULL,NULL,iomodel_handle,"numoutput","Integer",NULL);
 
         /*Assign output pointers: */

issm/trunk/src/c/ModelProcessorx/IoModel.h

@@ -157 +157 @@
         double*  accumulation;
 
+        /*parameter output: */
+        int      numoutput;
 
         /*exterior data: */