Changeset 26796

Timestamp:

01/19/22 17:01:46 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: changing the order of steps when setting up N to 0

File:

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

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

@@ -546 +546 @@
         /*Force floating ice to have zero sheet thickness*/
         if(element->IsAllFloating()){
-                                for(int iv=0;iv<numvertices;iv++) h_new[iv] = 0.;
-                                }
+                for(int iv=0;iv<numvertices;iv++) h_new[iv] = 0.;
+        }
 
         element->AddInput(HydrologySheetThicknessEnum,h_new,P1Enum);
@@ -609 +609 @@
         }
 
-        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.;
-            }
+                for(int iv=0;iv<numnodes;iv++) N[iv] = 0.;
+        }
+
+        element->AddInput(EffectivePressureEnum,N,element->FiniteElement());
         
         /*Clean up and return*/