Changeset 21282

Timestamp:

10/17/16 19:36:04 (8 years ago)

Author:

adhikari

Message:

minor

File:

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

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

@@ -3698 +3698 @@
         IssmDouble late,longe,re;
         IssmDouble lati,longi,ri;
-        IssmDouble rho_ice,rho_water,rho_earth;
+        IssmDouble rho_ice,rho_earth;
         IssmDouble minlong=400;
         IssmDouble maxlong=-20;
@@ -3715 +3715 @@
         bool store_green_functions=false;
 
+        /*Compute ice thickness change: */
+        Input*  deltathickness_input=inputs->GetInput(EsaDeltathicknessEnum); 
+        if (!deltathickness_input)_error_("delta thickness input needed to compute elastic adjustment!");
+        deltathickness_input->GetInputAverage(&I);
+                
         /*early return if we are not on the (ice) loading point: */ 
-        //if(!(this->inputs->Max(MaskIceLevelsetEnum)<0)) return; 
+        if(I==0) return; 
 
         /*recover material parameters: */
         rho_ice=matpar->GetMaterialParameter(MaterialsRhoIceEnum);
-        rho_water=matpar->GetMaterialParameter(MaterialsRhoFreshwaterEnum);
         rho_earth=matpar->GetMaterialParameter(MaterialsEarthDensityEnum);
 
@@ -3779 +3783 @@
         H_parameter->GetParameterValueByPointer(&H_elastic_precomputed,&M);
 
-        /*Compute ice thickness change: */
-        Input*  deltathickness_input=inputs->GetInput(EsaDeltathicknessEnum); 
-        if (!deltathickness_input)_error_("delta thickness input needed to compute elastic adjustment!");
-        deltathickness_input->GetInputAverage(&I);
-                
         /*initialize: */
         U_elastic=xNewZeroInit<IssmDouble>(gsize);