Changeset 3399

Timestamp:

04/05/10 14:44:05 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor bug fix for now

Location:

issm/trunk/src/c/objects

Files:

• Hook.cpp (modified) (2 diffs)
• Tria.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/Hook.cpp

@@ -311 +311 @@
         /*go pickup the correct objects, ids and offsets :*/
         subnum=numindices;
+        if(subnum<1) ISSMERROR("Trying to spawn an empty ElementProperties!");
 
         subobjects=(Object**)xmalloc(subnum*sizeof(Object*));
@@ -316 +317 @@
         suboffsets=(int*)xmalloc(subnum*sizeof(int));
 
-        if(subnum){
-                for(i=0;i<subnum;i++){
-                        subobjects[i]=this->objects[indices[i]];
-                        subids[i]=this->ids[indices[i]];
-                        suboffsets[i]=this->offsets[indices[i]];
-                }
-        }
-        else ISSMERROR("Trying to spawn an empty ElementProperties!");
+        for(i=0;i<subnum;i++){
+                subobjects[i]=this->objects[indices[i]];
+                subids[i]=this->ids[indices[i]];
+                suboffsets[i]=this->offsets[indices[i]];
+        }
 
         return new Hook(subobjects,subids,suboffsets,subnum);

issm/trunk/src/c/objects/Tria.cpp

@@ -233 +233 @@
         //if (id==1) printf("WARNING if QMU: no hydrostatic equilibrium is applied here (conflict with prognostic, which does not have matpar)\n");
         //For now
-        inputs->Recover("thickness",&this->properties.h[0],1,dofs,3,(void**)nodes);
+        if(this->properties.h) inputs->Recover("thickness",&this->properties.h[0],1,dofs,3,(void**)nodes);
         //Later
         /*
@@ -249 +249 @@
         }
         */
-        inputs->Recover("surface",&this->properties.s[0],1,dofs,3,(void**)nodes);
-        inputs->Recover("bed",&this->properties.b[0],1,dofs,3,(void**)nodes);
-        inputs->Recover("drag",&this->properties.k[0],1,dofs,3,(void**)nodes);
-        inputs->Recover("melting",&this->properties.melting[0],1,dofs,3,(void**)nodes);
-        inputs->Recover("accumulation",&this->properties.accumulation[0],1,dofs,3,(void**)nodes);
-        inputs->Recover("geothermalflux",&this->properties.geothermalflux[0],1,dofs,3,(void**)nodes);
+        if (this->properties.s)              inputs->Recover("surface",&this->properties.s[0],1,dofs,3,(void**)nodes);
+        if (this->properties.b)              inputs->Recover("bed",&this->properties.b[0],1,dofs,3,(void**)nodes);
+        if (this->properties.k)              inputs->Recover("drag",&this->properties.k[0],1,dofs,3,(void**)nodes);
+        if (this->properties.melting)        inputs->Recover("melting",&this->properties.melting[0],1,dofs,3,(void**)nodes);
+        if (this->properties.accumulation)   inputs->Recover("accumulation",&this->properties.accumulation[0],1,dofs,3,(void**)nodes);
+        if (this->properties.geothermalflux) inputs->Recover("geothermalflux",&this->properties.geothermalflux[0],1,dofs,3,(void**)nodes);
         
         //Update material if necessary