Changeset 17012

Timestamp:

12/05/13 16:19:47 (12 years ago)

Author:

bdef

Message:

BUG: fixing the update of eplthickness

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (2 diffs)
• cores/hydrology_core.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -59 +59 @@
         iomodel->FetchDataToInput(elements,HydrologydcEplInitialThicknessEnum);
         
+        elements->InputDuplicate(HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessEnum);
+
 }/*}}}*/
 void HydrologyDCEfficientAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/

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

@@ -4834 +4834 @@
         IssmDouble  n,A,dt,init_thick;
         IssmDouble  rho_water,rho_ice;
-        IssmDouble  gravity,latentheat,EPLgrad;
+        IssmDouble  gravity,latentheat,EPLgrad2;
         IssmDouble  EPL_N,epl_conductivity;
         IssmDouble  activeEpl[numdof],thickness[numdof];
@@ -4876 +4876 @@
                                         EPL_N=gravity*((rho_ice*ice_thickness[i])-(rho_water*(eplhead[i]-bed[i])));
                                         if(EPL_N<0.0)EPL_N=0.0;
-                                        /*Get then the square of th gradient of EPL heads*/
-                                        EPLgrad = (epl_slopeX[i]*epl_slopeX[i]+epl_slopeY[i]*epl_slopeY[i]);
+                                        /*Get then the square of the gradient of EPL heads*/
+                                        EPLgrad2 = (epl_slopeX[i]*epl_slopeX[i]+epl_slopeY[i]*epl_slopeY[i]);
                                         
                                         /*And proceed to the real thing*/
-                                        thickness[i] = old_thickness[i]*(1+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*EPLgrad-2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n)));
+                                        thickness[i] = old_thickness[i]*(1+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*EPLgrad2-2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n)));
+
                         }
                 }

issm/trunk-jpl/src/c/cores/hydrology_core.cpp

@@ -84 +84 @@
                         if (isefficientlayer){
                                 InputDuplicatex(femmodel,EplHeadEnum,EplHeadOldEnum);
-                                InputDuplicatex(femmodel,HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessEnum);
-                                InputDuplicatex(femmodel,HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessOldEnum);
+                                InputDuplicatex(femmodel,HydrologydcEplThicknessEnum,HydrologydcEplThicknessOldEnum);
                         }
                         

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

@@ -178 +178 @@
                                 solutionsequence_linear(femmodel);
 
+                                
                                 femmodel->HydrologyEPLThicknessx();