Changeset 11371

Timestamp:

02/08/12 16:11:50 (13 years ago)

Author:

cborstad

Message:

ModelProcessorx updates for new damage variable

Location:

issm/trunk-jpl-damage/src/c/modules/ModelProcessorx

Files:

• Control/UpdateElementsAndMaterialsControl.cpp (modified) (2 diffs)
• CreateElementsVerticesAndMaterials.cpp (modified) (2 diffs)
• DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (1 diff)

issm/trunk-jpl-damage/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

@@ -48 +48 @@
                         case FrictionCoefficientEnum: iomodel->FetchData(1,FrictionCoefficientEnum); break;
                         case MaterialsRheologyBbarEnum:    iomodel->FetchData(1,MaterialsRheologyBEnum); break;
+                        case MaterialsRheologyZbarEnum:    iomodel->FetchData(1,MaterialsRheologyZEnum); break;
                         default: _error_("Control %s not implemented yet",EnumToStringx((int)iomodel->Data(InversionControlParametersEnum)[i]));
                 }
@@ -66 +67 @@
         
         /*Free data: */
-        iomodel->DeleteData(1+4+5,MeshElementsEnum,InversionControlParametersEnum,InversionCostFunctionsCoefficientsEnum,InversionMinParametersEnum,InversionMaxParametersEnum,BalancethicknessThickeningRateEnum,VxEnum,VyEnum,FrictionCoefficientEnum,MaterialsRheologyBEnum);
+        iomodel->DeleteData(1+4+6,MeshElementsEnum,InversionControlParametersEnum,InversionCostFunctionsCoefficientsEnum,InversionMinParametersEnum,InversionMaxParametersEnum,BalancethicknessThickeningRateEnum,VxEnum,VyEnum,FrictionCoefficientEnum,MaterialsRheologyBEnum,MaterialsRheologyZEnum);
 }

issm/trunk-jpl-damage/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

@@ -45 +45 @@
         
         /*Fetch data needed: */
-        iomodel->FetchData(4,MeshElementsEnum,MeshElementconnectivityEnum,MaterialsRheologyBEnum,MaterialsRheologyNEnum);
+        iomodel->FetchData(5,MeshElementsEnum,MeshElementconnectivityEnum,MaterialsRheologyBEnum,MaterialsRheologyNEnum,MaterialsRheologyZEnum);
         #ifdef _HAVE_THREED_
         if(dim==3)iomodel->FetchData(2,MeshUpperelementsEnum,MeshLowerelementsEnum);
@@ -67 +67 @@
         
         /*Free data: */
-        iomodel->DeleteData(9,MeshElementsEnum,MeshElementconnectivityEnum,MeshUpperelementsEnum,MeshLowerelementsEnum,
-                                MaterialsRheologyBEnum,MaterialsRheologyNEnum,InversionControlParametersEnum,InversionMinParametersEnum,InversionMaxParametersEnum);
+        iomodel->DeleteData(10,MeshElementsEnum,MeshElementconnectivityEnum,MeshUpperelementsEnum,MeshLowerelementsEnum,
+                                MaterialsRheologyBEnum,MaterialsRheologyNEnum,MaterialsRheologyZEnum,InversionControlParametersEnum,InversionMinParametersEnum,
+                                InversionMaxParametersEnum);
 
         /*Add new constrant material property tgo materials, at the end: */

issm/trunk-jpl-damage/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

@@ -59 +59 @@
         iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);
         iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum);
+        iomodel->FetchDataToInput(elements,MaterialsRheologyZEnum);
         iomodel->FetchDataToInput(elements,VxEnum);
         iomodel->FetchDataToInput(elements,VyEnum);