source: issm/oecreview/Archive/26740-27031/ISSM-27014-27015.diff@ 27032

Last change on this file since 27032 was 27032, checked in by Mathieu Morlighem, 3 years ago

CHG: added 26740-27031
File size: 2.0 KB
RevLine 
[27032]1Index: ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 27014)
4+++ ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 27015)
5@@ -681,7 +681,7 @@
6 b_input->GetInputValue(&bed,gauss);
7 sl_input->GetInputValue(&sealevel,gauss);
8 dis_input->GetInputValue(&distance,gauss);
9- if(thickness<min_thickness && bed<sealevel && distance<mig_max*dt){
10+ if(thickness<min_thickness && bed<sealevel && fabs(distance)<mig_max*dt){
11 node->ApplyConstraint(0,+1.);
12 }
13 else {
14@@ -719,7 +719,7 @@
15 b_input->GetInputValue(&bed,gauss);
16 sl_input->GetInputValue(&sealevel,gauss);
17 dis_input->GetInputValue(&distance,gauss);
18- if(thickness<min_thickness && bed<sealevel && distance<mig_max*dt){
19+ if(thickness<min_thickness && bed<sealevel && fabs(distance)<mig_max*dt){
20 node->ApplyConstraint(0,+1.);
21 }
22 else {
23@@ -760,7 +760,7 @@
24 dis_input->GetInputValue(&distance,gauss);
25 hab_fraction_input->GetInputValue(&hab_fraction,gauss);
26
27- if(thickness<((rho_water/rho_ice)*(1+hab_fraction)*-water_depth) && distance<mig_max*dt){
28+ if(thickness<((rho_water/rho_ice)*(1+hab_fraction)*-water_depth) && fabs(distance)<mig_max*dt){
29 node->ApplyConstraint(0,+1.);
30 }
31 else {
32@@ -862,7 +862,7 @@
33 thickness_input->GetInputValue(&thickness,gauss);
34 surface_input->GetInputValue(&surface,gauss);
35
36- /*FIXME: not sure about levelset<0. && levelset>-mig_max*dt! SHould maybe be distance<mig_max*dt*/
37+ /*FIXME: not sure about levelset<0. && fabs(levelset)>-mig_max*dt! SHould maybe be distance<mig_max*dt*/
38 if((surface_crevasse>surface || crevassedepth>crevasse_threshold*thickness) && bed<0. && levelset<0. && levelset>-mig_max*dt && constraint_nodes[node->Lid()]==0.){
39 local_nflipped++;
40 vec_constraint_nodes->SetValue(node->Pid(),1.0,INS_VAL);
Note: See TracBrowser for help on using the repository browser.