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

Timestamp:

08/23/11 09:17:20 (14 years ago)

Author:

Mathieu Morlighem

Message:

OK, seems to be the final fix

File:

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

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

@@ -5184 +5184 @@
 
         /*Control Inputs*/
-        if (control_analysis && iomodel->f(ControlTypeEnum)){
+        if (control_analysis && iomodel->IsLoaded(ControlTypeEnum)){
                 for(i=0;i<num_control_type;i++){
                         switch((int)iomodel->f(ControlTypeEnum)[i]){
                                 case DhdtEnum:
-                                        if (iomodel->f(DhdtEnum)){
+                                        if (iomodel->IsLoaded(DhdtEnum)){
                                                 for(j=0;j<6;j++)nodeinputs[j]=iomodel->f(DhdtEnum)[penta_vertex_ids[j]-1]/yts;
                                                 for(j=0;j<6;j++)cmmininputs[j]=iomodel->f(CmMinEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts;
@@ -5196 +5196 @@
                                         break;
                                 case VxEnum:
-                                        if (iomodel->f(VxEnum)){
+                                        if (iomodel->IsLoaded(VxEnum)){
                                                 for(j=0;j<6;j++)nodeinputs[j]=iomodel->f(VxEnum)[penta_vertex_ids[j]-1]/yts;
                                                 for(j=0;j<6;j++)cmmininputs[j]=iomodel->f(CmMinEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts;
@@ -5204 +5204 @@
                                         break;
                                 case VyEnum:
-                                        if (iomodel->f(VyEnum)){
+                                        if (iomodel->IsLoaded(VyEnum)){
                                                 for(j=0;j<6;j++)nodeinputs[j]=iomodel->f(VyEnum)[penta_vertex_ids[j]-1]/yts;
                                                 for(j=0;j<6;j++)cmmininputs[j]=iomodel->f(CmMinEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts;
@@ -5212 +5212 @@
                                         break;
                                 case DragCoefficientEnum:
-                                        if (iomodel->f(DragCoefficientEnum)){
+                                        if (iomodel->IsLoaded(DragCoefficientEnum)){
                                                 for(j=0;j<6;j++)nodeinputs[j]=iomodel->f(DragCoefficientEnum)[penta_vertex_ids[j]-1];
                                                 for(j=0;j<6;j++)cmmininputs[j]=iomodel->f(CmMinEnum)[(penta_vertex_ids[j]-1)*num_control_type+i];
@@ -5228 +5228 @@
 
         //Need to know the type of approximation for this element
-        if(iomodel->f(ElementsTypeEnum)){
+        if(iomodel->IsLoaded(ElementsTypeEnum)){
                 if (*(iomodel->f(ElementsTypeEnum)+index)==MacAyealApproximationEnum){
                         this->inputs->AddInput(new IntInput(ApproximationEnum,MacAyealApproximationEnum));
@@ -5259 +5259 @@
 
         /*DatasetInputs*/
-        if (iomodel->f(WeightsEnum)) {
+        if (iomodel->IsLoaded(WeightsEnum)) {
 
                 /*Create inputs and add to DataSetInput*/
@@ -7569 +7569 @@
                         /*default vx,vy and vz: either observation or 0 */
                         if(!iomodel->f(VxEnum)){
-                                if (iomodel->f(VxObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VxObsEnum)[penta_vertex_ids[i]-1]/yts;
+                                if (iomodel->IsLoaded(VxObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VxObsEnum)[penta_vertex_ids[i]-1]/yts;
                                 else                 for(i=0;i<6;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs));
@@ -7576 +7576 @@
                         }
                         if(!iomodel->f(VyEnum)){
-                                if (iomodel->f(VyObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VyObsEnum)[penta_vertex_ids[i]-1]/yts;
+                                if (iomodel->IsLoaded(VyObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VyObsEnum)[penta_vertex_ids[i]-1]/yts;
                                 else                 for(i=0;i<6;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs));
@@ -7583 +7583 @@
                         }
                         if(!iomodel->f(VzEnum)){
-                                if (iomodel->f(VzObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VzObsEnum)[penta_vertex_ids[i]-1]/yts;
+                                if (iomodel->IsLoaded(VzObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VzObsEnum)[penta_vertex_ids[i]-1]/yts;
                                 else                 for(i=0;i<6;i++)nodeinputs[i]=0;
                                 this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs));
@@ -7602 +7602 @@
                         if(*(iomodel->f(ElementsTypeEnum)+index)==PattynStokesApproximationEnum){
                                 /*Create VzPattyn and VzStokes Enums*/
-                                if(iomodel->f(VzEnum) && iomodel->f(NodeOnStokesEnum)){
+                                if(iomodel->IsLoaded(VzEnum) && iomodel->IsLoaded(NodeOnStokesEnum)){
                                         for(i=0;i<6;i++) nodeinputs[i]=iomodel->f(VzEnum)[penta_vertex_ids[i]-1]/yts*iomodel->f(NodeOnStokesEnum)[penta_vertex_ids[i]-1];
                                         this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs));
@@ -7616 +7616 @@
                         if(*(iomodel->f(ElementsTypeEnum)+index)==MacAyealStokesApproximationEnum){
                                 /*Create VzMacAyeal and VzStokes Enums*/
-                                if(iomodel->f(VzEnum) && iomodel->f(NodeOnStokesEnum)){
+                                if(iomodel->IsLoaded(VzEnum) && iomodel->IsLoaded(NodeOnStokesEnum)){
                                         for(i=0;i<6;i++) nodeinputs[i]=iomodel->f(VzEnum)[penta_vertex_ids[i]-1]/yts*iomodel->f(NodeOnStokesEnum)[penta_vertex_ids[i]-1];
                                         this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs));
@@ -7644 +7644 @@
                         this->inputs->AddInput(new PentaVertexInput(VyMeshEnum,nodeinputs));
                         this->inputs->AddInput(new PentaVertexInput(VzMeshEnum,nodeinputs));
-                        if (iomodel->f(TemperatureEnum) && iomodel->f(WaterfractionEnum)) {
+                        if (iomodel->IsLoaded(TemperatureEnum) && iomodel->IsLoaded(WaterfractionEnum)) {
                                 for(i=0;i<6;i++){
                                         if(iomodel->f(TemperatureEnum)[penta_vertex_ids[i]-1] < meltingpoint-beta*iomodel->f(PressureEnum)[penta_vertex_ids[i]-1]){