Changeset 15417 for issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

Timestamp:

07/03/13 15:43:42 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed PentaP1Input and created PentaInput for quadratic elements

File:

• issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

@@ -14 +14 @@
 #include "../Inputs/Inputs.h"
 #include "../Inputs/TriaInput.h"
-#include "../Inputs/PentaP1Input.h"
+#include "../Inputs/PentaInput.h"
 #include "../Inputs/ControlInput.h"
 #include "../Elements/Element.h"
@@ -571 +571 @@
                                         IssmDouble valuesp[6];
                                         for (int i=0;i<6;i++) valuesp[i]=vector[((Penta*)element)->vertices[i]->Sid()]; //use sid list, to index into serial oriented vector
-                                        this->inputs->AddInput(new PentaP1Input(name,valuesp));
+                                        this->inputs->AddInput(new PentaInput(name,valuesp,P1Enum));
                                         return;
                                 }
@@ -637 +637 @@
                                         IssmDouble valuesp[6];
                                         for (int i=0;i<6;i++) valuesp[i]=vector[((Penta*)element)->vertices[i]->Sid()]; //use sid list, to index into serial oriented vector
-                                        this->inputs->AddInput(new PentaP1Input(name,valuesp));
+                                        this->inputs->AddInput(new PentaInput(name,valuesp,P1Enum));
                                         return;
                                 }
@@ -751 +751 @@
                 if (iomodel->Data(MaterialsRheologyBEnum)) {
                         for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(MaterialsRheologyBEnum)[reCast<int,IssmDouble>(iomodel->Data(MeshElementsEnum)[num_vertices*index+i]-1)];
-                        this->inputs->AddInput(new PentaP1Input(MaterialsRheologyBEnum,nodeinputs));
+                        this->inputs->AddInput(new PentaInput(MaterialsRheologyBEnum,nodeinputs,P1Enum));
                 }
 
@@ -757 +757 @@
                 if (iomodel->Data(MaterialsRheologyNEnum)) {
                         for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(MaterialsRheologyNEnum)[index];
-                        this->inputs->AddInput(new PentaP1Input(MaterialsRheologyNEnum,nodeinputs));
+                        this->inputs->AddInput(new PentaInput(MaterialsRheologyNEnum,nodeinputs,P1Enum));
                 }
 
@@ -771 +771 @@
                                                         for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[reCast<int,IssmDouble>(iomodel->Data(MeshElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];
                                                         for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[reCast<int,IssmDouble>(iomodel->Data(MeshElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];
-                                                        this->inputs->AddInput(new ControlInput(MaterialsRheologyBEnum,PentaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1));
+                                                        this->inputs->AddInput(new ControlInput(MaterialsRheologyBEnum,PentaInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1));
                                                 }
                                                 break;