Changeset 2334

Timestamp:

09/27/09 22:42:00 (15 years ago)

Author:

Eric.Larour

Message:

Fixed spawntria routine: missing configuration.
Added numpar=NULL after demarshall.

Location:

issm/trunk/src/c/objects

Files:

• Beam.cpp (modified) (1 diff)
• Penta.cpp (modified) (7 diffs)
• Sing.cpp (modified) (1 diff)
• Tria.cpp (modified) (1 diff)
• Tria.h (modified) (1 diff)

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

@@ -203 +203 @@
         matice=NULL;
         matpar=NULL;
+        numpar=NULL;
 
         /*return: */

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

@@ -71 +71 @@
         printf("   mid: %i\n",mid);
         printf("   mparid: %i\n",mparid);
+        printf("   numparid: %i\n",numparid);
 
         printf("   node_ids=[%i,%i,%i,%i,%i,%i]\n",node_ids[0],node_ids[1],node_ids[2],node_ids[3],node_ids[4],node_ids[5]);
@@ -103 +104 @@
         printf("   mid: %i\n",mid);
         printf("   mparid: %i\n",mparid);
+        printf("   numparid: %i\n",numparid);
 
         printf("   node_ids=[%i,%i,%i,%i,%i,%i]\n",node_ids[0],node_ids[1],node_ids[2],node_ids[3],node_ids[4],node_ids[5]);
@@ -261 +263 @@
         matice=NULL;
         matpar=NULL;
+        numpar=NULL;
 
         /*return: */
@@ -453 +456 @@
           bedrock, in which case we spawn a tria element using the 3 first grids, and use it to build 
           the stiffness matrix. */
+
 
         if ((collapse==1) && (onbed==0)){
@@ -600 +604 @@
 
         } 
-                
+
         cleanup_and_return: 
         xfree((void**)&first_gauss_area_coord);
@@ -612 +616 @@
         xfree((void**)&third_gauss_area_coord2d);
         xfree((void**)&gauss_weights2d);
+
 }
 
@@ -1388 +1393 @@
         tria->MaticeConfiguration(matice,matice_offset);
         tria->MatparConfiguration(matpar,matpar_offset);
+        tria->NumparConfiguration(numpar,numpar_offset);
 
         return tria;

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

@@ -187 +187 @@
         matice=NULL;
         matpar=NULL;
+        numpar=NULL;
 
         /*return: */

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

@@ -3046 +3046 @@
 }
 
+#undef __FUNCT__ 
+#define __FUNCT__ "Tria::NumparConfiguration"
+void  Tria::NumparConfiguration(Numpar* tria_numpar,int tria_numpar_offset){
+
+        numpar=tria_numpar;
+        numpar_offset=tria_numpar_offset;
+
+}
 
 #undef __FUNCT__ 

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

@@ -115 +115 @@
                 void  MaticeConfiguration(Matice* matice,int matice_offset);
                 void  MatparConfiguration(Matpar* matpar,int matpar_offset);
+                void  NumparConfiguration(Numpar* tria_numpar,int tria_numpar_offset);
                 void  ComputePressure(Vec p_g);
                 void  CreateKMatrixThermal(Mat Kgg,void* inputs,int analysis_type,int sub_analysis_type);