Changeset 5452

Timestamp:

08/20/10 12:27:58 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed Echo and vertex position in element

Location:

issm/trunk/src/c/objects

Files:

• Hook.cpp (modified) (3 diffs)
• Loads/Numericalflux.cpp (modified) (5 diffs)

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

@@ -79 +79 @@
                 printf("      num=%i\n",this->num);
                 printf("      ids: ");
-                for (i=0;i<this->num;i++){
-                        printf("%i ",this->ids[i]);
-                }
+                for (i=0;i<this->num;i++) printf("%i ",this->ids[i]);
                 printf("\n");
                 printf("      offsets: ");
-                for (i=0;i<this->num;i++){
-                        printf("%i ",this->offsets[i]);
-                }
+                for (i=0;i<this->num;i++) printf("%i ",this->offsets[i]);
                 printf("\n");
         }
@@ -102 +98 @@
                 printf("      num=%i\n",this->num);
                 printf("      ids: ");
-                for (i=0;i<this->num;i++){
-                        printf("%i ",this->ids[i]);
-                }
+                for (i=0;i<this->num;i++) printf("%i ",this->ids[i]);
                 printf("\n");
                 printf("      offsets: ");
-                for (i=0;i<this->num;i++){
-                        printf("%i ",this->offsets[i]);
-                }
+                for (i=0;i<this->num;i++) printf("%i ",this->offsets[i]);
                 printf("\n");
                 if (!objects) printf("      warning: object not hooked yet\n");
@@ -116 +108 @@
                         for (i=0;i<this->num;i++){
                                 printf("         object %i\n",i);
-                                objects[i]->DeepEcho();
+                                if(objects[i]) objects[i]->DeepEcho();
+                                else           printf("            no object hooked yet (not configured)\n");
                         }
                 }

issm/trunk/src/c/objects/Loads/Numericalflux.cpp ¶

@@ -34 +34 @@
         int  i1,i2;
         int  j;
-        int  pos1,pos2;
+        int  pos1,pos2,pos3,pos4;
         int  num_nodes;
         int  num_elems;
@@ -77 +77 @@
 
                 /*2: Get the column where these ids are located in the index*/
+                pos1=pos2=pos3=pos4=UNDEF;
+                for(j=0;j<3;j++){
+                        if (iomodel->elements[3*(e1-1)+j]==i1) pos1=j+1;
+                        if (iomodel->elements[3*(e1-1)+j]==i2) pos2=j+1;
+                        if (iomodel->elements[3*(e2-1)+j]==i1) pos3=j+1;
+                        if (iomodel->elements[3*(e2-1)+j]==i2) pos4=j+1;
+                }
+                ISSMASSERT(pos1!=UNDEF && pos2!=UNDEF && pos3!=UNDEF && pos4!=UNDEF);
+
+                /*3: We have the id of the elements and the position of the vertices in the index
+                 * we can compute their dofs!*/
+                numericalflux_node_ids[0]=iomodel->nodecounter+3*(e1-1)+pos1;
+                numericalflux_node_ids[1]=iomodel->nodecounter+3*(e1-1)+pos2;
+                numericalflux_node_ids[2]=iomodel->nodecounter+3*(e2-1)+pos3;
+                numericalflux_node_ids[3]=iomodel->nodecounter+3*(e2-1)+pos4;
+        }
+        else{
+
+                /*2: Get the column where these ids are located in the index*/
                 pos1=pos2=UNDEF;
                 for(j=0;j<3;j++){
                         if (iomodel->elements[3*(e1-1)+j]==i1) pos1=j+1;
-                        if (iomodel->elements[3*(e2-1)+j]==i1) pos2=j+1;
+                        if (iomodel->elements[3*(e1-1)+j]==i2) pos2=j+1;
                 }
                 ISSMASSERT(pos1!=UNDEF && pos2!=UNDEF);
-
-                /*3: We have the id of the elements and the position of the vertices in the index
-                 * we can compute their dofs!*/
-                numericalflux_node_ids[0]=iomodel->nodecounter+3*(e1-1)+pos1;       //ex: 1 2 3
-                numericalflux_node_ids[1]=iomodel->nodecounter+3*(e1-1)+(pos1%3)+1; //ex: 2 3 1
-                numericalflux_node_ids[2]=iomodel->nodecounter+3*(e2-1)+pos2;           //ex: 1 2 3
-                numericalflux_node_ids[3]=iomodel->nodecounter+3*(e2-1)+((pos2+1)%3)+1; //ex: 3 1 2
-        }
-        else{
-
-                /*2: Get the column where these ids are located in the index*/
-                pos1==UNDEF;
-                for(j=0;j<3;j++){
-                        if (iomodel->elements[3*(e1-1)+j]==i1) pos1=j+1;
-                }
-                ISSMASSERT(pos1!=UNDEF);
 
                 /*3: We have the id of the elements and the position of the vertices in the index
                  * we can compute their dofs!*/
                 numericalflux_node_ids[0]=iomodel->nodecounter+3*(e1-1)+pos1;
-                numericalflux_node_ids[1]=iomodel->nodecounter+3*(e1-1)+(pos1%3)+1;
+                numericalflux_node_ids[1]=iomodel->nodecounter+3*(e1-1)+pos2;
         }
 
@@ -134 +137 @@
 /*FUNCTION Numericalflux::Echo {{{1*/
 void Numericalflux::Echo(void){
-        this->DeepEcho();
+        printf("Numericalflux:\n");
+        printf("   id: %i\n",id);
+        printf("   analysis_type: %s\n",EnumToString(analysis_type));
+        hnodes->Echo();
+        helement->Echo();
+        printf("   parameters: %p\n",parameters);
+        printf("   inputs: %p\n",inputs);
 }
 /*}}}*/
@@ -146 +155 @@
         helement->DeepEcho();
         printf("   parameters\n");
-        parameters->DeepEcho();
+        if(parameters)
+         parameters->DeepEcho();
+        else
+         printf("      NULL\n");
         printf("   inputs\n");
         inputs->DeepEcho();
@@ -395 +407 @@
 
         /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-        Tria*   tria=NULL;
-        Input*  vxaverage_input=NULL;
-        Input*  vyaverage_input=NULL;
+        Node  **nodes           = NULL;
+        Tria   *tria            = NULL;
+        Input  *vxaverage_input = NULL;
+        Input  *vyaverage_input = NULL;
 
         /*Retrieve parameters: */