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

Timestamp:

09/06/11 16:53:02 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added material class

File:

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

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

@@ -530 +530 @@
         Input* input=NULL;
 
-        if(enum_type==RheologyBbarEnum){
+        if(enum_type==MaterialsRheologyBbarEnum){
                 if(!IsOnBed()) return;
-                input=(Input*)matice->inputs->GetInput(RheologyBEnum);
+                input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum);
         }
         else{
@@ -549 +549 @@
         Input* input=NULL;
 
-        if(enum_type==RheologyBbarEnum){
-                input=(Input*)matice->inputs->GetInput(RheologyBEnum);
+        if(enum_type==MaterialsRheologyBbarEnum){
+                input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum);
         }
         else{
@@ -568 +568 @@
         Input* input=NULL;
 
-        if(enum_type==RheologyBbarEnum){
-                input=(Input*)matice->inputs->GetInput(RheologyBEnum);
+        if(enum_type==MaterialsRheologyBbarEnum){
+                input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum);
         }
         else{
@@ -1224 +1224 @@
 
         /*Depth Averaging B*/
-        this->InputDepthAverageAtBase(RheologyBEnum,RheologyBbarEnum,MaterialsEnum);
+        this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum);
 
         /*Call Tria function*/
@@ -1232 +1232 @@
 
         /*Delete B averaged*/
-        this->matice->inputs->DeleteInput(RheologyBbarEnum);
+        this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum);
 
         /*clean up and return*/
@@ -4429 +4429 @@
                         break;
 
-                case RheologyBbarEnum:
+                case MaterialsRheologyBbarEnum:
                         inputs->GetParameterValue(&approximation,ApproximationEnum);
                         switch(approximation){
@@ -4669 +4669 @@
 
         /*Depth Average B*/
-        this->InputDepthAverageAtBase(RheologyBEnum,RheologyBbarEnum,MaterialsEnum);
+        this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum);
 
         /*Collapse element to the base*/
@@ -4677 +4677 @@
 
         /*delete Average B*/
-        this->matice->inputs->DeleteInput(RheologyBbarEnum);
+        this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum);
 
 } /*}}}*/
@@ -4687 +4687 @@
 
         /*Depth Average B*/
-        this->InputDepthAverageAtBase(RheologyBEnum,RheologyBbarEnum,MaterialsEnum);
+        this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum);
 
         /*Collapse element to the base*/
@@ -4695 +4695 @@
 
         /*delete Average B*/
-        this->matice->inputs->DeleteInput(RheologyBbarEnum);
+        this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum);
 } /*}}}*/
 /*FUNCTION Penta::GradjBbarStokes {{{1*/
@@ -4704 +4704 @@
 
         /*Depth Average B*/
-        this->InputDepthAverageAtBase(RheologyBEnum,RheologyBbarEnum,MaterialsEnum);
+        this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum);
 
         /*Collapse element to the base*/
@@ -4712 +4712 @@
 
         /*delete Average B*/
-        this->matice->inputs->DeleteInput(RheologyBbarEnum);
+        this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum);
 } /*}}}*/
 /*FUNCTION Penta::Sid {{{1*/
@@ -4785 +4785 @@
         for(int i=0;i<num_controls;i++){
 
-                if(control_type[i]==RheologyBbarEnum){
+                if(control_type[i]==MaterialsRheologyBbarEnum){
                         if (!IsOnBed()) goto cleanup_and_return;
-                        input=(Input*)matice->inputs->GetInput(RheologyBEnum); _assert_(input);
+                        input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum); _assert_(input);
                 }
                 else{
@@ -4799 +4799 @@
                 if (save_parameter) ((ControlInput*)input)->SaveValue();
 
-                if(control_type[i]==RheologyBbarEnum){
-                        this->InputExtrude(RheologyBEnum,MaterialsEnum);
+                if(control_type[i]==MaterialsRheologyBbarEnum){
+                        this->InputExtrude(MaterialsRheologyBEnum,MaterialsEnum);
                 }
         }
@@ -5096 +5096 @@
 
         /*Go through all the input objects, and find the one corresponding to enum_type, if it exists: */
-        if (enum_type==RheologyBbarEnum) input=this->matice->inputs->GetInput(RheologyBEnum);
+        if (enum_type==MaterialsRheologyBbarEnum) input=this->matice->inputs->GetInput(MaterialsRheologyBEnum);
         else input=this->inputs->GetInput(enum_type);
         //if (!input) _error_("Input %s not found in penta->inputs",EnumToStringx(enum_type)); why error out? if the requested input does not exist, we should still 
@@ -5204 +5204 @@
                                         }
                                         break;
-                                case RheologyBbarEnum:
+                                case MaterialsRheologyBbarEnum:
                                         /*Matice will take care of it*/ break;
                                 default:
@@ -6249 +6249 @@
                 /*Update Rheology only if converged (we must make sure that the temperature is below melting point
                  * otherwise the rheology could be negative*/
-                this->parameters->FindParam(&rheology_law,RheologyLawEnum);
+                this->parameters->FindParam(&rheology_law,MaterialsRheologyLawEnum);
                 switch(rheology_law){
                         case NoneEnum:
@@ -6257 +6257 @@
                                 B_average=Paterson((values[0]+values[1]+values[2]+values[3]+values[4]+values[5])/6.0);
                                 for(i=0;i<numdof;i++) B[i]=B_average;
-                                this->matice->inputs->AddInput(new PentaVertexInput(RheologyBEnum,B));
+                                this->matice->inputs->AddInput(new PentaVertexInput(MaterialsRheologyBEnum,B));
                                 break;
                         case ArrheniusEnum:
@@ -6265 +6265 @@
                                                         matice->GetN());
                                 for(i=0;i<numdof;i++) B[i]=B_average;
-                                this->matice->inputs->AddInput(new PentaVertexInput(RheologyBEnum,B));
+                                this->matice->inputs->AddInput(new PentaVertexInput(MaterialsRheologyBEnum,B));
                                 break;
                         default:
@@ -6324 +6324 @@
                 /*Update Rheology only if converged (we must make sure that the temperature is below melting point
                  * otherwise the rheology could be negative*/
-                this->parameters->FindParam(&rheology_law,RheologyLawEnum);
+                this->parameters->FindParam(&rheology_law,MaterialsRheologyLawEnum);
                 switch(rheology_law){
                         case NoneEnum:
@@ -6332 +6332 @@
                                 B_average=Paterson((temperatures[0]+temperatures[1]+temperatures[2]+temperatures[3]+temperatures[4]+temperatures[5])/6.0);
                                 for(i=0;i<numdof;i++) B[i]=B_average;
-                                this->matice->inputs->AddInput(new PentaVertexInput(RheologyBEnum,B));
+                                this->matice->inputs->AddInput(new PentaVertexInput(MaterialsRheologyBEnum,B));
                                 break;
                         case ArrheniusEnum:
@@ -6340 +6340 @@
                                                         matice->GetN());
                                 for(i=0;i<numdof;i++) B[i]=B_average;
-                                this->matice->inputs->AddInput(new PentaVertexInput(RheologyBEnum,B));
+                                this->matice->inputs->AddInput(new PentaVertexInput(MaterialsRheologyBEnum,B));
                                 break;
                         default:
@@ -7081 +7081 @@
 
         /*We have found the base under this. Call InputDepthAverageAtBase on it: */
-        base->InputDepthAverageAtBase(RheologyBEnum,RheologyBbarEnum,MaterialsEnum);
+        base->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum);
 
         /*Ok, base->matice now has the Bbar. Ask Bbar from this enum: */
@@ -7507 +7507 @@
         iomodel->Constant(&dakota_analysis,DakotaAnalysisEnum);
         iomodel->Constant(&isstokes,IsstokesEnum);
-        iomodel->Constant(&beta,BetaEnum);
-        iomodel->Constant(&heatcapacity,HeatcapacityEnum);
+        iomodel->Constant(&beta,MaterialsBetaEnum);
+        iomodel->Constant(&heatcapacity,MaterialsHeatcapacityEnum);
         iomodel->Constant(&referencetemperature,ConstantsReferencetemperatureEnum);
-        iomodel->Constant(&meltingpoint,MeltingpointEnum);
-        iomodel->Constant(&latentheat,LatentheatEnum);
-
+        iomodel->Constant(&meltingpoint,MaterialsMeltingpointEnum);
+        iomodel->Constant(&latentheat,MaterialsLatentheatEnum);
 
         /*Checks if debuging*/