Changeset 6213 for issm/trunk/src/c/objects/Materials/Matice.cpp

Timestamp:

10/08/10 16:49:12 (14 years ago)

Author:

Mathieu Morlighem

Message:

Prepared ISSM for multivariable CM, Added modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

File:

• issm/trunk/src/c/objects/Materials/Matice.cpp (modified) (3 diffs)

issm/trunk/src/c/objects/Materials/Matice.cpp

@@ -57 +57 @@
 
                 /*Control Inputs*/
-                if (iomodel->control_analysis){
-                        switch(iomodel->control_type){
-                                case RheologyBbarEnum:
-                                        if (iomodel->rheology_B){
-                                                for(i=0;i<num_vertices;i++)nodeinputs[i]=iomodel->rheology_B[int(iomodel->elements[num_vertices*index+i]-1)];
-                                                this->inputs->AddInput(new ControlInput(RheologyBbarEnum,TriaVertexInputEnum,nodeinputs));
-                                        }
-                                        break;
-                                default:
-                                        /*Nothing*/;
+                if (iomodel->control_analysis && iomodel->control_type){
+                        for(i=0;i<iomodel->num_control_type;i++){
+                                switch((int)iomodel->control_type[i]){
+                                        case RheologyBbarEnum:
+                                                if (iomodel->rheology_B){
+                                                        for(i=0;i<num_vertices;i++)nodeinputs[i]=iomodel->rheology_B[int(iomodel->elements[num_vertices*index+i]-1)];
+                                                        this->inputs->AddInput(new ControlInput(RheologyBbarEnum,TriaVertexInputEnum,nodeinputs));
+                                                }
+                                                break;
+                                }
                         }
                 }
@@ -91 +91 @@
 
                 /*Control Inputs*/
-                if (iomodel->control_analysis){
-                        switch(iomodel->control_type){
-                                case RheologyBbarEnum:
-                                        if (iomodel->rheology_B){
-                                                for(i=0;i<num_vertices;i++)nodeinputs[i]=iomodel->rheology_B[int(iomodel->elements[num_vertices*index+i]-1)];
-                                                this->inputs->AddInput(new ControlInput(RheologyBEnum,PentaVertexInputEnum,nodeinputs));
-                                        }
-                                        break;
+                if (iomodel->control_analysis && iomodel->control_type){
+                        for(i=0;i<iomodel->num_control_type;i++){
+                                switch((int)iomodel->control_type[i]){
+                                        case RheologyBbarEnum:
+                                                if (iomodel->rheology_B){
+                                                        for(i=0;i<num_vertices;i++)nodeinputs[i]=iomodel->rheology_B[int(iomodel->elements[num_vertices*index+i]-1)];
+                                                        this->inputs->AddInput(new ControlInput(RheologyBEnum,PentaVertexInputEnum,nodeinputs));
+                                                }
+                                                break;
+                                }
                         }
                 }
@@ -246 +248 @@
 
         return matice;
+}
+/*}}}*/
+/*FUNCTION Matice::Update{{{1*/
+void Matice::Update(int index, IoModel* iomodel){
+
+        int i,j;
+
+        /*if 2d*/
+        if(iomodel->dim==2){
+
+                /*Intermediaries*/
+                const int num_vertices = 3; //Tria has 3 vertices
+                double    nodeinputs[num_vertices];
+
+                /*Control Inputs*/
+                if (iomodel->control_analysis && iomodel->control_type){
+                        for(i=0;i<iomodel->num_control_type;i++){
+                                switch((int)iomodel->control_type[i]){
+                                        case RheologyBbarEnum:
+                                                if (iomodel->rheology_B){
+                                                        for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->rheology_B[int(iomodel->elements[num_vertices*index+j]-1)];
+                                                        this->inputs->AddInput(new ControlInput(RheologyBbarEnum,TriaVertexInputEnum,nodeinputs));
+                                                }
+                                                break;
+                                }
+                        }
+                }
+        }
+
+        /*if 3d*/
+        else if(iomodel->dim==3){
+
+                /*Intermediaries*/
+                const int num_vertices = 6; //Penta has 6 vertices
+                double    nodeinputs[num_vertices];
+
+                /*Control Inputs*/
+                if (iomodel->control_analysis && iomodel->control_type){
+                        for(i=0;i<iomodel->num_control_type;i++){
+                                switch((int)iomodel->control_type[i]){
+                                        case RheologyBbarEnum:
+                                                if (iomodel->rheology_B){
+                                                        for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->rheology_B[int(iomodel->elements[num_vertices*index+j]-1)];
+                                                        this->inputs->AddInput(new ControlInput(RheologyBEnum,PentaVertexInputEnum,nodeinputs));
+                                                }
+                                                break;
+                                }
+                        }
+                }
+        }
+        else{
+                ISSMERROR(" Mesh type not supported yet!");
+        }
+
+        return;
 }
 /*}}}*/