Changeset 12274

Timestamp:

05/22/12 17:25:35 (13 years ago)

Author:

cborstad

Message:

progress toward damage in 3D plus a few typo fixes

Location:

issm/branches/trunk-jpl-damage/src/c

Files:

• modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (2 diffs)
• objects/Elements/Penta.cpp (modified) (8 diffs)
• objects/Elements/Tria.cpp (modified) (1 diff)

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

@@ -71 +71 @@
                                 InversionMaxParametersEnum,InversionThreshParametersEnum);
 
-        /*Add new constrant material property tgo materials, at the end: */
+        /*Add new constant material property to materials, at the end: */
         materials->AddObject(new Matpar(numberofelements+1,iomodel));//put it at the end of the materials
         
@@ -82 +82 @@
         for (i=0;i<numberofvertices;i++){
 
-                /*vertices and nodes (same number, as we are running continuous galerkin formulation: */
+                /*vertices and nodes (same number, as we are running continuous galerkin formulation): */
                 if(iomodel->my_vertices[i]){
                         

issm/branches/trunk-jpl-damage/src/c/objects/Elements/Penta.cpp

@@ -4475 +4475 @@
         Input* input=NULL;
 
-        if(enum_type==MaterialsRheologyBbarEnum){
+        if(enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsRheologyZbarEnum){
                 if(!IsOnBed()) return;
-                input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum);
+                input=(Input*)matice->inputs->GetInput(enum_type);
         }
         else{
@@ -4494 +4494 @@
         Input* input=NULL;
 
-        if(enum_type==MaterialsRheologyBbarEnum){
-                input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum);
+        if(enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsRheologyZbarEnum){
+                input=(Input*)matice->inputs->GetInput(enum_type);
         }
         else{
@@ -4513 +4513 @@
         Input* input=NULL;
 
-        if(enum_type==MaterialsRheologyBbarEnum){
-                input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum);
+        if(enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsRheologyZbarEnum){
+                input=(Input*)matice->inputs->GetInput(enum_type);
         }
         else{
@@ -5069 +5069 @@
         this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum);
 
+        /*Depth Average Z*/
+        this->InputDepthAverageAtBase(MaterialsRheologyZEnum,MaterialsRheologyZbarEnum,MaterialsEnum);
+
         /*Collapse element to the base*/
         Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria (lower face).
@@ -5086 +5089 @@
         /*Depth Average B*/
         this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum);
+
+        /*Depth Average Z*/
+        this->InputDepthAverageAtBase(MaterialsRheologyZEnum,MaterialsRheologyZbarEnum,MaterialsEnum);
 
         /*Collapse element to the base*/
@@ -5104 +5110 @@
         this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum);
 
+        /*Depth Average Z*/
+        this->InputDepthAverageAtBase(MaterialsRheologyZEnum,MaterialsRheologyZbarEnum,MaterialsEnum);
+
         /*Collapse element to the base*/
         Tria* tria=(Tria*)SpawnTria(0,1,2);
@@ -5126 +5135 @@
         for(int i=0;i<num_controls;i++){
 
-                if(control_type[i]==MaterialsRheologyBbarEnum){
+                if(control_type[i]==MaterialsRheologyBbarEnum || control_type[i]==MaterialsRheologyZbarEnum){
                         if (!IsOnBed()) goto cleanup_and_return;
-                        input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum); _assert_(input);
+                        input=(Input*)matice->inputs->GetInput(control_type[i]); _assert_(input);
                 }
                 else{
@@ -5140 +5149 @@
                 if (save_parameter) ((ControlInput*)input)->SaveValue();
 
-                if(control_type[i]==MaterialsRheologyBbarEnum){
-                        this->InputExtrude(MaterialsRheologyBEnum,MaterialsEnum);
+                if(control_type[i]==MaterialsRheologyBbarEnum || control_type[i]==MaterialsRheologyZbarEnum){
+                        this->InputExtrude(control_type[i],MaterialsEnum);
                 }
         }

issm/branches/trunk-jpl-damage/src/c/objects/Elements/Tria.cpp

@@ -3789 +3789 @@
         this->GetConnectivityList(&connectivity[0]);
 
-        /*Build frictoin element, needed later: */
+        /*Build friction element, needed later: */
         friction=new Friction("2d",inputs,matpar,analysis_type);