BUG:add 1e-10 to comparing thickness with crevasse to avoid machine epsilon

Author: enigne

src/c/analyses/LevelsetAnalysis.cpp

@@ -922,7 +922,7 @@ void           LevelsetAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
 					thickness_input->GetInputValue(&thickness,gauss);
 					surface_input->GetInputValue(&surface,gauss);
 
-					if((surface_crevasse>surface || crevassedepth>crevasse_threshold*thickness) && bed<0.){
+					if((surface_crevasse>surface || crevassedepth>(crevasse_threshold*thickness)-1e-10) && bed<0.){
 						vec_constraint_nodes->SetValue(node->Pid(),1.0,INS_VAL);
 					}
 				}
@@ -972,7 +972,7 @@ void           LevelsetAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
 						surface_input->GetInputValue(&surface,gauss);
 
                   /*FIXME: not sure about levelset<0. && fabs(levelset)>-mig_max*dt! SHould maybe be distance<mig_max*dt*/
-                  if((surface_crevasse>surface || crevassedepth>crevasse_threshold*thickness) && bed<0. && levelset<0. && levelset>-mig_max*dt && constraint_nodes[node->Lid()]==0.){
+                  if((surface_crevasse>surface || crevassedepth>(crevasse_threshold*thickness-1e-10)) && bed<0. && levelset<0. && levelset>-mig_max*dt && constraint_nodes[node->Lid()]==0.){
 							local_nflipped++;
 							vec_constraint_nodes->SetValue(node->Pid(),1.0,INS_VAL);
 						}

src/c/classes/Elements/Tria.cpp

@@ -562,13 +562,13 @@ void       Tria::CalvingCrevasseDepth(){/*{{{*/
 			strainrateeffective_input->GetInputValue(&straineffective,&gauss);
 			n_input->GetInputValue(&n,&gauss);
 			B_input->GetInputValue(&B,&gauss);
-			if((straineffective <= 0.) || (thickness <= 0.) || (n<=0.)){
+			if((straineffective <= 0.) || (thickness <= 0.) ){
 				vH = 1e14;
 			}
 			else{
 				vH = 0.5*B/thickness*pow(straineffective, (1./n)-1);
 			}
-			Kmax = 1 - 4.0*vH*(s1+s2+min(s1,s2))/(rho_ice*constant_g*(rho_seawater-rho_ice)/rho_seawater);
+			Kmax = 1.0 - 4.0*vH*(s1+s2+min(s1,s2))/(rho_ice*constant_g*(rho_seawater-rho_ice)/rho_seawater);
 			if(Kmax<0.) Kmax = 0.0;
 		}
 		else{