Changeset 23695

Timestamp:

02/05/19 11:10:17 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: make min thickness work in 3d

Location:

issm/trunk-jpl/src/c

Files:

• analyses/LevelsetAnalysis.cpp (modified) (4 diffs)
• modules/Calvingx/Calvingx.cpp (modified) (1 diff)

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

@@ -718 +718 @@
                                 gauss->GaussNode(element->GetElementType(),in);
                                 Node* node=element->GetNode(in);
+                                if(!node->IsActive()) continue;
+
                                 H_input->GetInputValue(&thickness,gauss);
                                 if(thickness<min_thickness){
@@ -755 +757 @@
                                 gauss->GaussNode(element->GetElementType(),in);
                                 Node* node=element->GetNode(in);
+                                if(!node->IsActive()) continue;
+
                                 H_input->GetInputValue(&thickness,gauss);
                                 bed_input->GetInputValue(&water_depth,gauss);
@@ -800 +804 @@
                                         gauss->GaussNode(element->GetElementType(),in);
                                         Node* node=element->GetNode(in);
+                                        if(!node->IsActive()) continue;
+
                                         crevassedepth_input->GetInputValue(&crevassedepth,gauss);
                                         bed_input->GetInputValue(&bed,gauss);
@@ -882 +888 @@
                                 gauss->GaussNode(element->GetElementType(),in);
                                 Node* node=element->GetNode(in);
+                                if(!node->IsActive()) continue;
 
                                 if(constraint_nodes[node->Sid()]>0.){

issm/trunk-jpl/src/c/modules/Calvingx/Calvingx.cpp

@@ -17 +17 @@
                 case DefaultCalvingEnum:
                 case CalvingMinthicknessEnum:
-                        break;
                 case CalvingHabEnum:
                         break;