Changeset 16600 for issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp

Timestamp:

11/01/13 10:09:33 (11 years ago)

Author:

bdef

Message:

Adding a ZigZag lock for hydrology and framing the variable thickness of the EPL

File:

• issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp

@@ -640 +640 @@
 
         //   The penalty is stable if it doesn't change during two consecutive iterations.   
-        int        unstable        = 0;
+        int        unstable=0;
         int        new_active;
+        int        penalty_lock;
         IssmDouble pressure;
         IssmDouble h;
@@ -656 +657 @@
         element->GetInputValue(&h,node,SedimentHeadEnum);
         element->GetHydrologyDCInefficientHmax(&h_max,node);
+        parameters->FindParam(&penalty_lock,HydrologydcPenaltyLockEnum);
+
         if (h>h_max)
          new_active=1;
@@ -661 +664 @@
          new_active=0;
 
-        if(this->active==new_active)
-         unstable=0;
-        else
-         unstable=1;
-
+        if(this->active==new_active){
+                unstable=0;
+        }
+        else{
+                unstable=1;
+                if(penalty_lock)zigzag_counter++;
+        }
+
+        /*If penalty keeps zigzagging more than penalty_lock times: */
+        if(penalty_lock){
+                if(zigzag_counter>penalty_lock){
+                        unstable=0;
+                        active=1;
+                }
+        }
         /*Set penalty flag*/
         this->active=new_active;