source:
issm/oecreview/Archive/26740-27031/ISSM-27014-27015.diff@
27032
Last change on this file since 27032 was 27032, checked in by , 3 years ago | |
---|---|
File size: 2.0 KB |
-
TabularUnified ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp
681 681 b_input->GetInputValue(&bed,gauss); 682 682 sl_input->GetInputValue(&sealevel,gauss); 683 683 dis_input->GetInputValue(&distance,gauss); 684 if(thickness<min_thickness && bed<sealevel && distance<mig_max*dt){684 if(thickness<min_thickness && bed<sealevel && fabs(distance)<mig_max*dt){ 685 685 node->ApplyConstraint(0,+1.); 686 686 } 687 687 else { … … 719 719 b_input->GetInputValue(&bed,gauss); 720 720 sl_input->GetInputValue(&sealevel,gauss); 721 721 dis_input->GetInputValue(&distance,gauss); 722 if(thickness<min_thickness && bed<sealevel && distance<mig_max*dt){722 if(thickness<min_thickness && bed<sealevel && fabs(distance)<mig_max*dt){ 723 723 node->ApplyConstraint(0,+1.); 724 724 } 725 725 else { … … 760 760 dis_input->GetInputValue(&distance,gauss); 761 761 hab_fraction_input->GetInputValue(&hab_fraction,gauss); 762 762 763 if(thickness<((rho_water/rho_ice)*(1+hab_fraction)*-water_depth) && distance<mig_max*dt){763 if(thickness<((rho_water/rho_ice)*(1+hab_fraction)*-water_depth) && fabs(distance)<mig_max*dt){ 764 764 node->ApplyConstraint(0,+1.); 765 765 } 766 766 else { … … 862 862 thickness_input->GetInputValue(&thickness,gauss); 863 863 surface_input->GetInputValue(&surface,gauss); 864 864 865 /*FIXME: not sure about levelset<0. && levelset>-mig_max*dt! SHould maybe be distance<mig_max*dt*/865 /*FIXME: not sure about levelset<0. && fabs(levelset)>-mig_max*dt! SHould maybe be distance<mig_max*dt*/ 866 866 if((surface_crevasse>surface || crevassedepth>crevasse_threshold*thickness) && bed<0. && levelset<0. && levelset>-mig_max*dt && constraint_nodes[node->Lid()]==0.){ 867 867 local_nflipped++; 868 868 vec_constraint_nodes->SetValue(node->Pid(),1.0,INS_VAL);
Note:
See TracBrowser
for help on using the repository browser.