Changeset 24020

Timestamp:

06/17/19 01:01:48 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: working on basal stress

Location:

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

Files:

• 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.h

@@ -209 +209 @@
                 virtual void        CalvingRateLevermann(void)=0;
                 virtual IssmDouble CharacteristicLength(void)=0;
-                virtual void       ComputeBasalStress(Vector<IssmDouble>* sigma_b)=0;
+                virtual void       ComputeBasalStress(void){_error_("not implemented yet");};
                 virtual void       ComputeDeviatoricStressTensor(void)=0;
                 virtual void       ComputeSigmaNN(void)=0;

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

@@ -331 +331 @@
 }
 /*}}}*/
-void       Penta::ComputeBasalStress(Vector<IssmDouble>* sigma_b){/*{{{*/
-
+void       Penta::ComputeBasalStress(void){/*{{{*/
+
+        _error_("not implemented (needs to be redone)");
         int         i,j;
         int         dofv[3]={0,1,2};

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

@@ -51 +51 @@
                 void           CalvingRateLevermann();
                 IssmDouble     CharacteristicLength(void){_error_("not implemented yet");};
-                void           ComputeBasalStress(Vector<IssmDouble>* sigma_b);
+                void           ComputeBasalStress(void);
                 void           ComputeDeviatoricStressTensor();
                 void           ComputeEsaStrainAndVorticity(){_error_("not implemented yet!");};

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

@@ -45 +45 @@
                 void        CalvingRateLevermann(void){_error_("not implemented yet");};
                 IssmDouble  CharacteristicLength(void);
-                void        ComputeBasalStress(Vector<IssmDouble>* sigma_b){_error_("not implemented yet");};
                 void        ComputeDeviatoricStressTensor(){_error_("not implemented yet");};
                 void        ComputeEsaStrainAndVorticity(){_error_("not implemented yet!");};

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

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

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

@@ -489 +489 @@
 }
 /*}}}*/
-void       Tria::ComputeBasalStress(Vector<IssmDouble>* eps){/*{{{*/
+void       Tria::ComputeBasalStress(void){/*{{{*/
         _error_("Not Implemented yet");
 }

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

@@ -55 +55 @@
                 void                    CalvingRateLevermann();
                 IssmDouble  CharacteristicLength(void);
-                void        ComputeBasalStress(Vector<IssmDouble>* sigma_b);
+                void        ComputeBasalStress(void);
                 void        ComputeDeviatoricStressTensor();
                 void        ComputeEsaStrainAndVorticity();