Changeset 17827

Timestamp:

04/23/14 09:04:02 (11 years ago)

Author:

jbondzio

Message:

CHG: overloaded ComputeStrainRate(), since used by module already

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.cpp (modified) (1 diff)
• Element.h (modified) (1 diff)
• Penta.cpp (modified) (1 diff)
• Penta.h (modified) (1 diff)
• Seg.h (modified) (1 diff)
• Tetra.h (modified) (1 diff)
• Tria.cpp (modified) (1 diff)
• Tria.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -818 +818 @@
                                 input=this->inputs->GetInput(output_enum);
                                 break;
+                        case StrainRatexxEnum:
+                        case StrainRatexyEnum:
+                        case StrainRatexzEnum:
+                        case StrainRateyyEnum:
+                        case StrainRateyzEnum:
+                        case StrainRatezzEnum:
+                                this->ComputeStrainRate();
+                                input=this->inputs->GetInput(output_enum);
+                                break;
                         case DeviatoricStressxxEnum: 
                         case DeviatoricStressxyEnum: 

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -202 +202 @@
                 virtual void   ComputeSigmaNN(void)=0;
                 virtual void   ComputeBasalStress(Vector<IssmDouble>* sigma_b)=0;
+                virtual void   ComputeStrainRate()=0;
                 virtual void   ComputeStrainRate(Vector<IssmDouble>* eps)=0;
                 virtual void   ComputeStressTensor(void)=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -277 +277 @@
 /*}}}*/
 /*FUNCTION Penta::ComputeStrainRate {{{*/
-void  Penta::ComputeStrainRate(Vector<IssmDouble>* eps){
+void  Penta::ComputeStrainRate(){
 
         IssmDouble      xyz_list[NUMVERTICES][3];

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -55 +55 @@
                 IssmDouble CharacteristicLength(void){_error_("not implemented yet");};
                 void   ComputeBasalStress(Vector<IssmDouble>* sigma_b);
-                void   ComputeStrainRate(Vector<IssmDouble>* eps);
+                void   ComputeStrainRate();
+                void   ComputeStrainRate(Vector<IssmDouble>* eps){_error_("not implemented yet");};
                 void   ComputeSigmaNN(){_error_("not implemented yet");};
                 void   ComputeStressTensor();

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -55 +55 @@
                 void        ComputeBasalStress(Vector<IssmDouble>* sigma_b){_error_("not implemented yet");};
                 void        ComputeSigmaNN(){_error_("not implemented yet");};
+                void        ComputeStrainRate(){_error_("not implemented yet");};
                 void        ComputeStrainRate(Vector<IssmDouble>* eps){_error_("not implemented yet");};
                 void        ComputeStressTensor(){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tetra.h

@@ -55 +55 @@
                 void        ComputeBasalStress(Vector<IssmDouble>* sigma_b){_error_("not implemented yet");};
                 void        ComputeSigmaNN(){_error_("not implemented yet");};
+                void        ComputeStrainRate(){_error_("not implemented yet");};
                 void        ComputeStrainRate(Vector<IssmDouble>* eps){_error_("not implemented yet");};
                 void        ComputeStressTensor(){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -203 +203 @@
 /*}}}*/
 /*FUNCTION Tria::ComputeStrainRate {{{*/
-void  Tria::ComputeStrainRate(Vector<IssmDouble>* eps){
+void  Tria::ComputeStrainRate(){
 
         IssmDouble      xyz_list[NUMVERTICES][3];

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -53 +53 @@
                 void        ComputeBasalStress(Vector<IssmDouble>* sigma_b);
                 void        ComputeSigmaNN();
-                void        ComputeStrainRate(Vector<IssmDouble>* eps);
+                void               ComputeStrainRate();
+                void               ComputeStrainRate(Vector<IssmDouble>* eps){_error_("not implemented yet");};
                 void        ComputeStressTensor();
                 void        ComputeDeviatoricStressTensor();