Changeset 25541

Timestamp:

09/08/20 16:11:40 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: skip elements that don't have ice in CFL condition

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -2941 +2941 @@
 void FemModel::TimeAdaptx(IssmDouble* pdt){/*{{{*/
 
-        /*output: */
-        IssmDouble   dt;
-
         /*intermediary: */
-        IssmDouble   min_dt      = 0;
-        IssmDouble   node_min_dt = 0;
+        IssmDouble   min_dt      = 1.e+50;
+        IssmDouble   node_min_dt = 0.;
 
         /*Go through elements, and figure out the minimum of the time steps for each element (using CFL criterion): */
-        Element* element=(Element*)elements->GetObjectByOffset(0); min_dt=element->TimeAdapt();
-
-        for(Object* & object : this->elements->objects){
-                element = xDynamicCast<Element*>(object);
-                dt=element->TimeAdapt();
-                if(dt<min_dt)min_dt=dt;
+        for(Object* & object : this->elements->objects){
+                Element* element = xDynamicCast<Element*>(object);
+                if(element->IsIceInElement()){ /*verify if there is ice in the element*/
+                        IssmDouble dt=element->TimeAdapt();
+                        if(dt<min_dt)min_dt=dt;
+                }
         }
 
@@ -2971 +2968 @@
         /*Assign output pointers:*/
         *pdt=min_dt;
-}
-/*}}}*/
+}/*}}}*/
 void FemModel::TotalCalvingFluxLevelsetx(IssmDouble* pM, bool scaled){/*{{{*/