Changeset 4931 for issm/trunk/src/c/objects/Elements/Tria.cpp

Timestamp:

08/02/10 14:55:29 (15 years ago)

Author:

Mathieu Morlighem

Message:

Now Matice uses B2d in 2d and B in 3d. B2d is added to matice's inputs when penta spawns a tria

File:

• issm/trunk/src/c/objects/Elements/Tria.cpp (modified) (10 diffs)

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

@@ -14 +14 @@
 #include <string.h>
 #include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/shared.h"
 #include "../../Container/Container.h"
@@ -629 +628 @@
                 }
                 else if (control_type==RheologyBEnum){
-                        inputs->GetParameterDerivativeValue(&dB[0], &xyz_list[0][0], &gauss_l1l2l3[0],RheologyBEnum);
+                        inputs->GetParameterDerivativeValue(&dB[0], &xyz_list[0][0], &gauss_l1l2l3[0],RheologyB2dEnum);
                         Jelem+=cm_noisedmp*1/2*(pow(dB[0],2)+pow(dB[1],2))*Jdet*gauss_weight;
                 }
@@ -870 +869 @@
                 GradjDrag(gradient);
         }
-        else if (control_type==RheologyBEnum){
+        else if (control_type==RheologyB2dEnum){
                 GradjB(gradient);
         }
@@ -966 +965 @@
         adjointx_input=inputs->GetInput(AdjointxEnum);
         adjointy_input=inputs->GetInput(AdjointyEnum);
-        rheologyb_input=inputs->GetInput(RheologyBEnum);
+        rheologyb_input=inputs->GetInput(RheologyB2dEnum);
 
         /* Start  looping on the number of gaussian points: */
@@ -1231 +1230 @@
 
         /*Move input to Material if required (needed if control method) TO BE IMPROVED*/
-        if (YEnum==RheologyBEnum){
+        if (YEnum==RheologyBEnum || YEnum==RheologyB2dEnum){
                 this->matice->inputs->AddInput((Input*)yinput->copy());
         }
@@ -1287 +1286 @@
 /*}}}*/
 /*FUNCTION Tria::InputDepthAverageAtBase {{{1*/
-void  Tria::InputDepthAverageAtBase(int enum_type,int average_enum_type){
+void  Tria::InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum){
 
         /*New input*/
@@ -1294 +1293 @@
 
         /*copy input of enum_type*/
-        oldinput=this->inputs->GetInput(enum_type);
+        if (object_enum==ElementsEnum)
+         oldinput=(Input*)this->inputs->GetInput(enum_type);
+        else if (object_enum==MaterialsEnum)
+         oldinput=(Input*)this->matice->inputs->GetInput(enum_type);
+        else
+         ISSMERROR("object %s not supported yet",EnumAsString(object_enum));
         if(!oldinput)ISSMERROR("%s%s"," could not find old input with enum: ",EnumAsString(enum_type));
         newinput=(Input*)oldinput->copy();
@@ -1302 +1306 @@
 
         /*Add new input to current element*/
-        this->inputs->AddInput(newinput);
+        if (object_enum==ElementsEnum)
+         this->inputs->AddInput((Input*)newinput);
+        else if (object_enum==MaterialsEnum)
+         this->matice->inputs->AddInput((Input*)newinput);
+        else
+         ISSMERROR("object %s not supported yet",EnumAsString(object_enum));
 
 }
@@ -2126 +2135 @@
         if (iomodel->rheology_B) {
                 for(i=0;i<3;i++)nodeinputs[i]=iomodel->rheology_B[tria_vertex_ids[i]-1];
-                this->inputs->AddInput(new TriaVertexInput(RheologyBEnum,nodeinputs));
+                this->inputs->AddInput(new TriaVertexInput(RheologyB2dEnum,nodeinputs));
         }
         if (iomodel->control_parameter) {
@@ -6048 +6057 @@
                                 name==VyEnum ||
                                 name==RheologyBEnum ||
+                                name==RheologyB2dEnum ||
                                 name==RheologyNEnum ||
                                 name==FitEnum ||