Changeset 18361

Timestamp:

08/11/14 09:36:32 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed Ulmin Ulmax, still diffusing

File:

• issm/trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp (modified) (2 diffs)

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

@@ -232 +232 @@
 
                 /*Compute Qis and Ris*/
-                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*(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]);
                 _assert_(Qi_plus  >= 0.);
                 _assert_(Qi_minus <= 0.);
@@ -389 +389 @@
         VecToMPISerial(&ml_serial  ,Ml_petsc,IssmComm::GetComm());
 
+        /*Push uL to elements*/
+        InputUpdateFromSolutionx(femmodel,u_serial);
+
         /*Anti diffusive fluxes*/
         Vec         Fbar            = NULL;