Changeset 9277 for issm/trunk

Timestamp:

08/11/11 09:55:15 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added minus sign for hydrolic velocity

Location:

issm/trunk/src/c

Files:

• objects/Elements/Tria.cpp (modified) (1 diff)
• solvers/solver_nonlinear.cpp (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -408 +408 @@
 
                 /* Water velocity x and y components */
-                vx[iv]= pow(w,2)/(12 * mu_water)*(rho_ice*g*dsdx+(rho_water-rho_ice)*g*dbdx);
-                vy[iv]= pow(w,2)/(12 * mu_water)*(rho_ice*g*dsdy+(rho_water-rho_ice)*g*dbdy);
+                vx[iv]= - pow(w,2)/(12 * mu_water)*(rho_ice*g*dsdx+(rho_water-rho_ice)*g*dbdx);
+                vy[iv]= - pow(w,2)/(12 * mu_water)*(rho_ice*g*dsdy+(rho_water-rho_ice)*g*dbdy);
                 //vx[iv]=0.001;
                 //vy[iv]=0;

issm/trunk/src/c/solvers/solver_nonlinear.cpp

@@ -35 +35 @@
         femmodel->parameters->FindParam(&max_nonlinear_iterations,MaxNonlinearIterationsEnum);
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-        UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters);
+        //UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters);
 
         /*Were loads requested as output? : */