Changeset 7833

Timestamp:

04/12/11 08:08:02 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added penalties to prognostic

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (modified) (2 diffs)
• objects/Loads/Penpair.cpp (modified) (2 diffs)
• objects/Loads/Penpair.h (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

@@ -16 +16 @@
         int i;
         int element;
+        int penpair_ids[2];
+        int count=0;
 
         /*DataSet*/
@@ -54 +56 @@
         }
 
+        /*Create Penpair for penalties: */
+        IoModelFetchData(&iomodel->penalties,&iomodel->numpenalties,NULL,iomodel_handle,"penalties");
+
+        for(i=0;i<iomodel->numpenalties;i++){
+
+                if(iomodel->my_vertices[(int)iomodel->penalties[2*i+0]-1]){
+
+                        /*In debugging mode, check that the second node is in the same cpu*/
+                        _assert_(iomodel->my_vertices[(int)iomodel->penalties[2*i+1]-1]);
+
+                        /*Get node ids*/
+                        penpair_ids[0]=iomodel->nodecounter+(int)iomodel->penalties[2*i+0];
+                        penpair_ids[1]=iomodel->nodecounter+(int)iomodel->penalties[2*i+1];
+
+                        /*Create Load*/
+                        loads->AddObject(new Penpair(
+                                                        iomodel->loadcounter+count+1,
+                                                        &penpair_ids[0],
+                                                        PrognosticAnalysisEnum));
+                        count++;
+                }
+        }
+
+        /*free ressources: */
+        xfree((void**)&iomodel->penalties);
+
+
         /*Assign output pointer: */
         *ploads=loads;

issm/trunk/src/c/objects/Loads/Penpair.cpp

@@ -223 +223 @@
                 case DiagnosticHorizAnalysisEnum:
                         Ke=PenaltyCreateKMatrixDiagnosticHoriz(kmax);
+                        break;
+                case PrognosticAnalysisEnum:
+                        Ke=PenaltyCreateKMatrixPrognostic(kmax);
                         break;
                 default:
@@ -365 +368 @@
 }
 /*}}}1*/
+/*FUNCTION Penpair::PenaltyCreateKMatrixPrognostic {{{1*/
+ElementMatrix* Penpair::PenaltyCreateKMatrixPrognostic(double kmax){
+
+        const int numdof=NUMVERTICES*NDOF1;
+        double penalty_offset;
+
+        /*Initialize Element vector and return if necessary*/
+        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters);
+
+        /*recover parameters: */
+        parameters->FindParam(&penalty_offset,PenaltyOffsetEnum);
+
+        //Create elementary matrix: add penalty to 
+        Ke->values[0*numdof+0]=+kmax*pow((double)10.0,penalty_offset);
+        Ke->values[0*numdof+1]=-kmax*pow((double)10.0,penalty_offset);
+        Ke->values[1*numdof+0]=-kmax*pow((double)10.0,penalty_offset);
+        Ke->values[1*numdof+1]=+kmax*pow((double)10.0,penalty_offset);
+
+        /*Clean up and return*/
+        return Ke;
+}
+/*}}}1*/

issm/trunk/src/c/objects/Loads/Penpair.h

@@ -69 +69 @@
                 ElementMatrix* PenaltyCreateKMatrixDiagnosticMacAyealPattyn(double kmax);
                 ElementMatrix* PenaltyCreateKMatrixDiagnosticStokes(double kmax);
+                ElementMatrix* PenaltyCreateKMatrixPrognostic(double kmax);
                 /*}}}*/
 };