Changeset 4409

Timestamp:

07/06/10 10:30:10 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added call to depth averge inputs (vx and vy)

Location:

issm/trunk/src/c/solutions

Files:

• balancedthickness2_core.cpp (modified) (1 diff)
• balancedthickness_core.cpp (modified) (1 diff)
• prognostic2_core.cpp (modified) (1 diff)

issm/trunk/src/c/solutions/balancedthickness2_core.cpp

@@ -30 +30 @@
         InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
         InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
-        if(dim==3) InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
-
 
         _printf_("call computational core:\n");

issm/trunk/src/c/solutions/balancedthickness_core.cpp

@@ -30 +30 @@
         InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
         InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
-        if(dim==3) InputDepthAveragex(femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,VzEnum,VzAverageEnum);
 
         _printf_("call computational core:\n");

issm/trunk/src/c/solutions/prognostic2_core.cpp

@@ -25 +25 @@
 
         _printf_("depth averaging velocity...\n");
-        /*Where is it done?*/
+        InputDepthAveragex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,VxAverageEnum);
+        InputDepthAveragex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,VyAverageEnum);
 
         _printf_("call computational core:\n");