Changeset 9111

Timestamp:

07/25/11 13:20:15 (14 years ago)

Author:

Eric.Larour

Message:

Fixed problem with 0 sizes requested outputs + model consistency checks.

Location:

issm/trunk/src

Files:

• c/objects/Params/IntVecParam.cpp (modified) (7 diffs)
• m/model/ismodelselfconsistent.m (modified) (1 diff)

issm/trunk/src/c/objects/Params/IntVecParam.cpp

@@ -32 +32 @@
         M=in_M;
 
-        values=(int*)xmalloc(M*sizeof(int));
-        memcpy(values,in_values,M*sizeof(int));
+        if(M){
+                values=(int*)xmalloc(M*sizeof(int));
+                memcpy(values,in_values,M*sizeof(int));
+        }
+        else values=NULL;
 }
 /*}}}*/
@@ -42 +45 @@
         M=in_M;
 
-        values=(int*)xmalloc(M*sizeof(int));
-        for(int i=0;i<in_M;i++) values[i]=(int)in_values[i];
+        if(M){
+                values=(int*)xmalloc(M*sizeof(int));
+                for(int i=0;i<in_M;i++) values[i]=(int)in_values[i];
+        }
+        else values=NULL;
 }
 /*}}}*/
@@ -103 +109 @@
         memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type);
         memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M);
-        memcpy(marshalled_dataset,values,M*sizeof(int));marshalled_dataset+=M*sizeof(int);
+        if(M)memcpy(marshalled_dataset,values,M*sizeof(int));marshalled_dataset+=M*sizeof(int);
 
         *pmarshalled_dataset=marshalled_dataset;
@@ -132 +138 @@
         /*data: */
         memcpy(&M,marshalled_dataset,sizeof(M));marshalled_dataset+=sizeof(M);
-        values=(int*)xmalloc(M*sizeof(int));
-        memcpy(values,marshalled_dataset,M*sizeof(int));marshalled_dataset+=M*sizeof(int);
+        if(M) {
+                values=(int*)xmalloc(M*sizeof(int));
+                memcpy(values,marshalled_dataset,M*sizeof(int));marshalled_dataset+=M*sizeof(int);
+        }
 
         /*return: */
@@ -160 +168 @@
         int* output=NULL;
 
-        output=(int*)xmalloc(M*sizeof(int));
-        memcpy(output,values,M*sizeof(int));
+        if(M){
+                output=(int*)xmalloc(M*sizeof(int));
+                memcpy(output,values,M*sizeof(int));
+        }
 
         /*Assign output pointers:*/
@@ -186 +196 @@
 
         /*cast intvec into doublevec for Matlab*/
-        doublevec=(double*)xmalloc(M*sizeof(double));
-        for(int i=0;i<M;i++)doublevec[i]=(double)intvec[i];
+        if(M){
+                doublevec=(double*)xmalloc(M*sizeof(double));
+                for(int i=0;i<M;i++)doublevec[i]=(double)intvec[i];
+        }
+        else doublevec=NULL;
         xfree((void**)&intvec);
                                 
@@ -205 +218 @@
         xfree((void**)&this->values);
 
-        this->values=(int*)xmalloc(in_M*sizeof(int));
-        memcpy(this->values,intarray,in_M*sizeof(int));
+        if(in_M){
+                this->values=(int*)xmalloc(in_M*sizeof(int));
+                memcpy(this->values,intarray,in_M*sizeof(int));
+        }
+        else this->values=NULL;
 
         this->M=in_M;

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -101 +101 @@
 fields={'diagnostic_ref'};
 checksize(md,fields,[md.numberofnodes 6]);
-if(size(md.requested_outputs,2)~=1),
-        message(['model ' md.name ' requested outputs should be a column vector']);
+if ~isempty(md.requested_outputs),
+        if(size(md.requested_outputs,2)~=1),
+                message(['model ' md.name ' requested outputs should be a column vector']);
+        end
 end
 %}}}