Changeset 26795

Timestamp:

01/19/22 16:00:18 (3 years ago)

Author:

sehrenfe

Message:

CHG: zero N and sheet thickness on floating ice

File:

• issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp (modified) (4 diffs)

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

@@ -472 +472 @@
 
         /*Skip if water or ice shelf element*/
-        if(element->IsAllFloating()) return;
+        //if(element->IsAllFloating()) return;
 
         /*Intermediaries */
@@ -543 +543 @@
                 if(h_new[iv]<AEPS) h_new[iv] = AEPS;
         }
+        
+        /*Force floating ice to have zero sheet thickness*/
+        if(element->IsAllFloating()){
+                                for(int iv=0;iv<numvertices;iv++) h_new[iv] = 0.;
+                                }
 
         element->AddInput(HydrologySheetThicknessEnum,h_new,P1Enum);
@@ -561 +566 @@
 
         /*Skip if water or ice shelf element*/
-        if(element->IsAllFloating()) return;
+        //if(element->IsAllFloating()) return;
 
         /*Intermediary*/
@@ -606 +611 @@
         element->AddInput(EffectivePressureEnum,N,element->FiniteElement());
 
+   /*Force floating ice to have zero effective pressure*/
+   if(element->IsAllFloating()){
+            for(int iv=0;iv<numnodes;iv++) N[iv] = 0.;
+            }
+        
         /*Clean up and return*/
         delete gauss;