Changeset 4047 for issm/trunk/src/c/objects/Elements/Penta.cpp

Timestamp:

06/15/10 11:13:28 (15 years ago)

Author:

Eric.Larour

Message:

Starting cleanup of control_core.
Introduced gradient_core and adjoint_core solutions. Trying to get the gradient and the adjoint
inside the elements, instead of as node vectors.

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (8 diffs)

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

@@ -4555 +4555 @@
 /*}}}*/
 /*FUNCTION Penta::Gradj {{{1*/
-void  Penta::Gradj(Vec grad_g,int control_type){
+void  Penta::Gradj(int control_type){
 
         /*inputs: */
@@ -4567 +4567 @@
 
         if (control_type==DragCoefficientEnum){
-                GradjDrag( grad_g);
+                GradjDrag();
         }
         else if (control_type=RheologyBEnum){
-                GradjB( grad_g);
+                GradjB();
         }
         else ISSMERROR("%s%i","control type not supported yet: ",control_type);
@@ -4576 +4576 @@
 /*}}}*/
 /*FUNCTION Penta::GradjDrag {{{1*/
-void  Penta::GradjDrag(Vec grad_g){
+void  Penta::GradjDrag(void){
 
         Tria* tria=NULL;
+        TriaVertexInput* triavertexinput=NULL;
+        double gradient[6]={0,0,0,0,0,0};
 
         /*inputs: */
@@ -4586 +4588 @@
         int analysis_type,sub_analysis_type;
 
-        /*retrive parameters: */
+        /*retrieve parameters: */
         parameters->FindParam(&analysis_type,AnalysisTypeEnum);
         parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
@@ -4608 +4610 @@
                 /*MacAyeal or Pattyn*/
                 tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
-                tria->GradjDrag( grad_g);
-                delete tria;
-                return;
+                tria->GradjDrag();
         }
         else if (sub_analysis_type==StokesAnalysisEnum){
@@ -4616 +4616 @@
                 /*Stokes*/
                 tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
-                tria->GradjDragStokes( grad_g);
-                delete tria;
-                return;
+                tria->GradjDragStokes();
         }
         else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
+
+        /*Now, the tria  has a GradientEnum input. Take it, and make a PentaVertexInput out of it, then delete the tria: */
+        triavertexinput=tria->inputs->GetInput(GradientEnum);
+        for(i=0;i<3;i++)gradient[i]=triavertexinput->values[i];
+        this->inputs->AddInput(new PentaVertexInput(GradientEnum,&gradient[0]));
+        
+        delete tria;
+
 }
 /*}}}*/
 /*FUNCTION Penta::GradjB {{{1*/
-void  Penta::GradjB(Vec grad_g){
+void  Penta::GradjB(void){
 
         Tria* tria=NULL;
+        TriaVertexInput* triavertexinput=NULL;
+        double gradient[6]={0,0,0,0,0,0};
 
         /*inputs: */
@@ -4648 +4656 @@
                  * and compute gardj*/
                 tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria (lower face).
-                tria->GradjB(grad_g);
-                delete tria;
-                return;
+                tria->GradjB();
         }
         else{
                 /*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);
-                delete tria;
-                return;
-        }
+                tria->GradjB();
+        }
+        
+        /*Now, the tria  has a GradientEnum input. Take it, and make a PentaVertexInput out of it, then delete the tria: */
+        triavertexinput=tria->inputs->GetInput(GradientEnum);
+        for(i=0;i<3;i++)gradient[i]=triavertexinput->values[i];
+        this->inputs->AddInput(new PentaVertexInput(GradientEnum,&gradient[0]));
+        
+        delete tria;
+
 }
 /*}}}*/
@@ -5328 +5340 @@
 }
 /*}}}*/
+/*FUNCTION Penta::ScaleInput(int enum_type,double scale_factor){{{1*/
+void  Penta::ScaleInput(int enum_type,double scale_factor){
+
+        Input* input=NULL;
+
+        /*Make a copy of the original input: */
+        input=(Input*)this->inputs->GetInput(enum_type);
+
+        /*Scale: */
+        input->Scale(scale_factor);
+}
+/*}}}*/