Changeset 24137

Timestamp:

09/09/19 08:06:36 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: StabilizationParameterAnisotropic should not return a double

Location:

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

Files:

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

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

@@ -319 +319 @@
                 virtual Element*   SpawnTopElement(void)=0;
                 virtual IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa)=0;
-                virtual IssmDouble StabilizationParameterAnisotropic(IssmDouble* tau_parameter_anisotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy, IssmDouble hz, IssmDouble kappa)=0;         
+                virtual void       StabilizationParameterAnisotropic(IssmDouble* tau_parameter_anisotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy, IssmDouble hz, IssmDouble kappa)=0;         
                 virtual void        StrainRateparallel(void)=0;
                 virtual void        StrainRateperpendicular(void)=0;

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

@@ -3155 +3155 @@
 
         return tau_parameter;
-}
-IssmDouble Penta::StabilizationParameterAnisotropic(IssmDouble* tau_parameter_anisotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy, IssmDouble hz, IssmDouble kappa){/*{{{*/
+}/*}}}*/
+void Penta::StabilizationParameterAnisotropic(IssmDouble* tau_parameter_anisotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy, IssmDouble hz, IssmDouble kappa){/*{{{*/
         /*Compute stabilization parameter*/
         /*kappa=thermalconductivity/(rho_ice*heatcapacity) for thermal model*/
@@ -3167 +3167 @@
         normu=pow(pow(u,p)+pow(v,p)+pow(w,p),1./p);
         hk=sqrt(pow(hx,2)+pow(hy,2));
-        
+
         if(normu*hk/(C*2*kappa)<1){ 
                 tau_parameter_anisotropic[0]=pow(hk,2)/(C*2*2*kappa);
         }
         else tau_parameter_anisotropic[0]=hk/(2*normu);
-        
+
         /* compute tau for the vertical direction */
-        hk=hz;
-        if(normu*hk/(C*2*kappa)<1){ 
-                tau_parameter_anisotropic[1]=pow(hk,2)/(C*2*2*kappa);
-        }
-        else tau_parameter_anisotropic[1]=hk/(2*normu);
+        hk=hz;
+        if(normu*hk/(C*2*kappa)<1){ 
+                tau_parameter_anisotropic[1]=pow(hk,2)/(C*2*2*kappa);
+        }
+        else{
+                tau_parameter_anisotropic[1]=hk/(2*normu);
+        }
 }
 /*}}}*/

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

@@ -162 +162 @@
                 Tria*            SpawnTria(int index1,int index2,int index3);
                 IssmDouble     StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa);
-                IssmDouble     StabilizationParameterAnisotropic(IssmDouble* tau_parameter_anisotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy, IssmDouble hz, IssmDouble kappa);
+                void           StabilizationParameterAnisotropic(IssmDouble* tau_parameter_anisotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy, IssmDouble hz, IssmDouble kappa);
                 void           StressIntensityFactor();
                 void           StrainRateparallel();

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

@@ -138 +138 @@
                 Element*    SpawnTopElement(void){_error_("not implemented yet");};
                 IssmDouble  StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){_error_("not implemented yet");};
-                IssmDouble  StabilizationParameterAnisotropic(IssmDouble* tau_parameter_anisotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy,  IssmDouble hz, IssmDouble kappa){_error_("not implemented yet");};
+                void        StabilizationParameterAnisotropic(IssmDouble* tau_parameter_anisotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy,  IssmDouble hz, IssmDouble kappa){_error_("not implemented yet");};
                 void        StrainRateparallel(void){_error_("not implemented yet");};
                 void        StrainRateperpendicular(void){_error_("not implemented yet");};

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

@@ -147 +147 @@
                 Tria*       SpawnTria(int index1,int index2,int index3);
                 IssmDouble  StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){_error_("not implemented yet");};
-                IssmDouble  StabilizationParameterAnisotropic(IssmDouble* tau_parameter_anisotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy, IssmDouble hz, IssmDouble kappa){_error_("not implemented yet");};
+                void        StabilizationParameterAnisotropic(IssmDouble* tau_parameter_anisotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy, IssmDouble hz, IssmDouble kappa){_error_("not implemented yet");};
                 void        StrainRateparallel(void){_error_("not implemented yet");};
                 void        StrainRateperpendicular(void){_error_("not implemented yet");};

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

@@ -215 +215 @@
                 Seg*             SpawnSeg(int index1,int index2);
                 IssmDouble     StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){_error_("not implemented yet");};
-                IssmDouble     StabilizationParameterAnisotropic(IssmDouble* tau_parameter_ansiotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy, IssmDouble hz, IssmDouble kappa){_error_("not implemented yet");};
+                void           StabilizationParameterAnisotropic(IssmDouble* tau_parameter_ansiotropic, IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble hx, IssmDouble hy, IssmDouble hz, IssmDouble kappa){_error_("not implemented yet");};
                 void           UpdateConstraintsExtrudeFromBase(void);
                 void           UpdateConstraintsExtrudeFromTop(void);