Changeset 16277

Timestamp:

10/01/13 08:16:42 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed hack

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (4 diffs)

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

@@ -4808 +4808 @@
 
         /*Intermediaries */
-        int        i,j;
-        int        analysis_type;
-        IssmDouble xyz_list[NUMVERTICES][3];
-        IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0};
-        IssmDouble Jdet2d,dt;
-        IssmDouble rho_ice,heatcapacity,geothermalflux_value;
-        IssmDouble basalfriction,alpha2,vx,vy;
-        IssmDouble basis[NUMVERTICES];
-        IssmDouble scalar;
-        Friction*  friction=NULL;
+        int         i,j;
+        int         analysis_type;
+        IssmDouble  xyz_list[NUMVERTICES][3];
+        IssmDouble  xyz_list_tria[NUMVERTICES2D][3]={0.0};
+        IssmDouble  Jdet2d,dt;
+        IssmDouble  rho_ice,heatcapacity,geothermalflux_value;
+        IssmDouble  basalfriction,alpha2,vx,vy;
+        IssmDouble  basis[NUMVERTICES];
+        IssmDouble  scalar;
+        Friction*   friction=NULL;
         GaussPenta* gauss=NULL;
 
@@ -4880 +4880 @@
         IssmDouble  B_average,s_average;
         int        *doflist = NULL;
-        IssmDouble  pressure[numdof];
+        bool        hack    = false;
 
         /*Get dof list: */
@@ -4888 +4888 @@
         for(i=0;i<numdof;i++){
                 values[i]=solution[doflist[i]];
-                GetInputListOnVertices(&pressure[0],PressureEnum);
-                if(values[i]>matpar->TMeltingPoint(pressure[i])) values[i]=matpar->TMeltingPoint(pressure[i]);
-                if(values[i]<matpar->TMeltingPoint(pressure[i])-50) values[i]=matpar->TMeltingPoint(pressure[i])-50;
 
                 /*Check solution*/
@@ -4897 +4894 @@
                 //if(values[i]>275)    _printf_("temperature > 275°K found in solution vector (Paterson's rheology associated is negative)\n");
         }
+
+        if(hack){
+                /*Force temperature between [Tpmp-50 Tpmp] to disable penalties*/
+                IssmDouble pressure[numdof];
+                GetInputListOnVertices(&pressure[0],PressureEnum);
+                if(values[i]>matpar->TMeltingPoint(pressure[i]))     values[i]=matpar->TMeltingPoint(pressure[i]);
+                if(values[i]<matpar->TMeltingPoint(pressure[i])-50.) values[i]=matpar->TMeltingPoint(pressure[i])-50.;
+        }
+
 
         /*Get all inputs and parameters*/