Changeset 18367

Timestamp:

08/12/14 15:00:14 (11 years ago)

Author:

srebuffi

Message:

CHG: reactivating local extrema

File:

• issm/trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp

@@ -248 +248 @@
                 //double Qi_plus  = ml_serial[row]/deltat*(3. - u[row]);
                 //double Qi_minus = ml_serial[row]/deltat*(2. - u[row]);
-                //double Qi_plus  = ml_serial[row]/deltat*(ulmax[row] - u[row]);
-                //double Qi_minus = ml_serial[row]/deltat*(ulmin[row] - u[row]);
-                double Qi_plus  = ml_serial[row]/deltat*(uLmax_global - u[row]);
-                double Qi_minus = ml_serial[row]/deltat*(uLmin_global - u[row]);
+                double Qi_plus  = ml_serial[row]/deltat*(ulmax[row] - u[row]);
+                double Qi_minus = ml_serial[row]/deltat*(ulmin[row] - u[row]);
+                //double Qi_plus  = ml_serial[row]/deltat*(uLmax_global - u[row]);
+                //double Qi_minus = ml_serial[row]/deltat*(uLmin_global - u[row]);
                 _assert_(Qi_plus  >= 0.);
                 _assert_(Qi_minus <= 0.);