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

Timestamp:

08/24/11 12:10:50 (14 years ago)

Author:

Mathieu Morlighem

Message:

moved iomodel->f to iomodel->Data and iomodel->constants is now private (use iomodel->Constant)

File:

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

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

@@ -660 +660 @@
 
         /*Fetch parameters: */
-        iomodel->constants->FindParam(&dim,DimEnum);
-        iomodel->constants->FindParam(&control_analysis,ControlAnalysisEnum);
-        iomodel->constants->FindParam(&num_control_type,NumControlTypeEnum);
+        iomodel->Constant(&dim,DimEnum);
+        iomodel->Constant(&control_analysis,ControlAnalysisEnum);
+        iomodel->Constant(&num_control_type,NumControlTypeEnum);
 
         /*if 2d*/
@@ -674 +674 @@
 
                 /*Get B*/
-                if (iomodel->f(RheologyBEnum)) {
-                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->f(RheologyBEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+i]-1)];
+                if (iomodel->Data(RheologyBEnum)) {
+                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(RheologyBEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+i]-1)];
                         this->inputs->AddInput(new TriaVertexInput(RheologyBbarEnum,nodeinputs));
                 }
 
                 /*Get n*/
-                if (iomodel->f(RheologyNEnum)) {
-                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->f(RheologyNEnum)[index];
+                if (iomodel->Data(RheologyNEnum)) {
+                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(RheologyNEnum)[index];
                         this->inputs->AddInput(new TriaVertexInput(RheologyNEnum,nodeinputs));
                 }
 
                 /*Control Inputs*/
-                if (control_analysis && iomodel->f(ControlTypeEnum)){
+                if (control_analysis && iomodel->Data(ControlTypeEnum)){
                         for(i=0;i<num_control_type;i++){
-                                switch((int)iomodel->f(ControlTypeEnum)[i]){
+                                switch((int)iomodel->Data(ControlTypeEnum)[i]){
                                         case RheologyBbarEnum:
-                                                if (iomodel->f(RheologyBEnum)){
-                                                        _assert_(iomodel->f(RheologyBEnum));_assert_(iomodel->f(CmMinEnum)); _assert_(iomodel->f(CmMaxEnum)); 
-                                                        for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->f(RheologyBEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)];
-                                                        for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel->f(CmMinEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];
-                                                        for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel->f(CmMaxEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];
+                                                if (iomodel->Data(RheologyBEnum)){
+                                                        _assert_(iomodel->Data(RheologyBEnum));_assert_(iomodel->Data(CmMinEnum)); _assert_(iomodel->Data(CmMaxEnum)); 
+                                                        for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->Data(RheologyBEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)];
+                                                        for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel->Data(CmMinEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];
+                                                        for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel->Data(CmMaxEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];
                                                         this->inputs->AddInput(new ControlInput(RheologyBbarEnum,TriaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1));
                                                 }
@@ -713 +713 @@
 
                 /*Get B*/
-                if (iomodel->f(RheologyBEnum)) {
-                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->f(RheologyBEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+i]-1)];
+                if (iomodel->Data(RheologyBEnum)) {
+                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(RheologyBEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+i]-1)];
                         this->inputs->AddInput(new PentaVertexInput(RheologyBEnum,nodeinputs));
                 }
 
                 /*Get n*/
-                if (iomodel->f(RheologyNEnum)) {
-                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->f(RheologyNEnum)[index];
+                if (iomodel->Data(RheologyNEnum)) {
+                        for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(RheologyNEnum)[index];
                         this->inputs->AddInput(new PentaVertexInput(RheologyNEnum,nodeinputs));
                 }
 
                 /*Control Inputs*/
-                if (control_analysis && iomodel->f(ControlTypeEnum)){
+                if (control_analysis && iomodel->Data(ControlTypeEnum)){
                         for(i=0;i<num_control_type;i++){
-                                switch((int)iomodel->f(ControlTypeEnum)[i]){
+                                switch((int)iomodel->Data(ControlTypeEnum)[i]){
                                         case RheologyBbarEnum:
-                                                if (iomodel->f(RheologyBEnum)){
-                                                        _assert_(iomodel->f(RheologyBEnum));_assert_(iomodel->f(CmMinEnum)); _assert_(iomodel->f(CmMaxEnum)); 
-                                                        for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->f(RheologyBEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)];
-                                                        for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel->f(CmMinEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];
-                                                        for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel->f(CmMaxEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];
+                                                if (iomodel->Data(RheologyBEnum)){
+                                                        _assert_(iomodel->Data(RheologyBEnum));_assert_(iomodel->Data(CmMinEnum)); _assert_(iomodel->Data(CmMaxEnum)); 
+                                                        for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->Data(RheologyBEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)];
+                                                        for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel->Data(CmMinEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];
+                                                        for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel->Data(CmMaxEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];
                                                         this->inputs->AddInput(new ControlInput(RheologyBEnum,PentaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1));
                                                 }