Changeset 26461

Timestamp:

09/24/21 08:24:14 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added migration max to crevasse depth law

File:

• issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (modified) (5 diffs)

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

@@ -561 +561 @@
                 /*Intermediaries*/
                 IssmDouble  levelset,crevassedepth,bed,surface_crevasse,thickness,surface;
-                int         nflipped,local_nflipped;
                 IssmDouble* constraint_nodes = NULL;
 
@@ -573 +572 @@
       Vector<IssmDouble>* vec_constraint_nodes = vec_constraint_nodes=new Vector<IssmDouble>(localmasters,numnodes);
 
-      IssmDouble crevasse_threshold = femmodel->parameters->FindParam(CalvingCrevasseThresholdEnum);
+                IssmDouble crevasse_threshold = femmodel->parameters->FindParam(CalvingCrevasseThresholdEnum);
+                IssmDouble mig_max            = femmodel->parameters->FindParam(MigrationMaxEnum);
+                IssmDouble dt                 = femmodel->parameters->FindParam(TimesteppingTimeStepEnum);
+
 
                 for(Object* & object : femmodel->elements->objects){
@@ -611 +613 @@
       femmodel->GetLocalVectorWithClonesNodes(&constraint_nodes,vec_constraint_nodes);
 
-                nflipped=1;
+                int nflipped=1;
                 while(nflipped){
-                        local_nflipped=0;
+                        int local_nflipped=0;
                         for(Object* & object : femmodel->elements->objects){
                                 Element* element  = xDynamicCast<Element*>(object);
@@ -630 +632 @@
                                 for(int in=0;in<numnodes;in++){
                                         Node* node=element->GetNode(in);
-                                        if(constraint_nodes[node->Lid()]==1.){
+                                        if(constraint_nodes[node->Lid()]>0.){
                                                 isconnected = true;
                                                 break;
@@ -648 +650 @@
                                                 surface_input->GetInputValue(&surface,gauss);
 
-                  if((surface_crevasse>surface || crevassedepth>crevasse_threshold*thickness) && bed<0. && levelset>-300. && levelset<0. && constraint_nodes[node->Lid()]==0.){
+                  if((surface_crevasse>surface || crevassedepth>crevasse_threshold*thickness) && 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);