Changeset 1197

Timestamp:

07/01/09 11:34:13 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added control method on B for Pattyn using MacAyeal's gradient

Location:

issm/trunk/src/c

Files:

• objects/Node.cpp (modified) (1 diff)
• objects/Penta.cpp (modified) (1 diff)
• parallel/GradJCompute.cpp (modified) (1 diff)

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

@@ -726 +726 @@
                         }
                 } //if (strcmp(field_name,"velocity")==0)
+                else if (strcmp(field_name,"gradj")==0){
+
+                        /* node data: */
+                        int          dof1;
+                        double       fieldel;
+
+                        //initilaize node and get dof1
+                        node=this;
+                        dof1=node->GetDofList1();
+
+                        /*get field for this base node: */
+                        fieldel=field_serial[dof1];
+
+                        //go throfieldn all nodes which sit on top of this node, until we reach the surface, 
+                        //and plfield  field in field
+                        for(;;){
+
+                                dof1=node->GetDofList1();
+                                VecSetValues(field,1,&dof1,&fieldel,INSERT_VALUES);
+                                printf("dof=%i\n",dof1);
+                                if(dof1>30){
+                                        printf("dof=%i\n",dof1);
+                                }
+
+                                if (node->IsOnSurface())break;
+                                /*get next node: */
+                                node=node->GetUpperNode();
+                        }
+                }
                 else if ( 
                                 (strcmp(field_name,"thickness")==0) ||

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

@@ -1255 +1255 @@
         }
         else{
-                throw ErrorException(__FUNCT__," not supported yet!");
+                /*B is a 2d field, use MacAyeal(2d) gradient even if it is Stokes or Pattyn*/
+                tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria (lower face).
+                tria->GradjB(grad_g,inputs,analysis_type,sub_analysis_type);
+                delete tria;
+                return;
         }
 }

issm/trunk/src/c/parallel/GradJCompute.cpp

@@ -82 +82 @@
 
         if (dim==3){
+                PetscSynchronizedPrintf(MPI_COMM_WORLD,"ok1\n");
+                PetscSynchronizedFlush(MPI_COMM_WORLD);
+
 
                 _printf_("%s\n","      extruding gradient...");
-                FieldExtrudex( grad_g, femmodel->elements,femmodel->nodes,femmodel->loads,femmodel->materials,"gradj",1);
+                FieldExtrudex( grad_g, femmodel->elements,femmodel->nodes,femmodel->loads,femmodel->materials,"gradj",0);
         }