Changeset 3770

Timestamp:

05/17/10 09:49:13 (15 years ago)

Author:

Eric.Larour

Message:

Starting serial solution migration

Location:

issm/trunk/src

Files:

• m/solutions/jpl/FemModelUpdateInputsFromVector.m (added)
• m/solutions/jpl/ModelUpdateInputsFromVector.m (added)
• m/solutions/jpl/diagnostic_core.m (modified) (3 diffs)
• mex/UpdateInputsFromVector/UpdateInputsFromVector.cpp (modified) (1 diff)

issm/trunk/src/m/solutions/jpl/diagnostic_core.m

@@ -25 +25 @@
 %for qmu analysis, be sure the velocity input we are starting from  is the one in the parameters: 
 if qmu_analysis,
-        UpdateInputsFromVector(models,m_dh.vx,VxEnum,VertexEnum);
-        UpdateInputsFromVector(models,m_dh.vy,VyEnum,VertexEnum);
-        UpdateInputsFromVector(models,m_dh.vz,VzEnum,VertexEnum);
+        ModelUpdateInputsFromVector(models,m_dh.vx,VxEnum,VertexEnum);
+        ModelUpdateInputsFromVector(models,m_dh.vy,VyEnum,VertexEnum);
+        ModelUpdateInputsFromVector(models,m_dh.vz,VzEnum,VertexEnum);
 end
 
@@ -35 +35 @@
 
 %Update:
-UpdateInputsFromVector(models,surfaceslopex,SurfaceSlopexEnum,VertexEnum);
-UpdateInputsFromVector(models,surfaceslopey,SurfaceSlopeyEnum,VertexEnum);
-UpdateInputsFromVector(models,bedslopex,BedSlopexEnum,VertexEnum);
-UpdateInputsFromVector(models,bedslopey,BedSlopeyEnum,VertexEnum);
-
-
+ModelUpdateInputsFromVector(models,surfaceslopex,SurfaceSlopexEnum,VertexEnum);
+ModelUpdateInputsFromVector(models,surfaceslopey,SurfaceSlopeyEnum,VertexEnum);
+ModelUpdateInputsFromVector(models,bedslopex,BedSlopexEnum,VertexEnum);
+ModelUpdateInputsFromVector(models,bedslopey,BedSlopeyEnum,VertexEnum);
 
 if ishutter,
@@ -73 +71 @@
         displaystring(verbose,'\n%s',['extruding horizontal velocities...']);
         u_g_horiz=FieldExtrude(m_dh.elements,m_dh.nodes,m_dh.vertices,m_dh.loads,m_dh.materials,m_dh.parameters,u_g,'velocity',1);
+
+        SplitSolutionVector(ug,numberofnodes,numberofdofspernode_dh,&vx,&vy);
+        model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
+        model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
+                
+
 
         displaystring(verbose,'\n%s',['computing vertical velocities...']);

issm/trunk/src/mex/UpdateInputsFromVector/UpdateInputsFromVector.cpp

@@ -71 +71 @@
 {
         _printf_("\n");
-        _printf_("   usage: [elements] = %s(elements,nodes,vertices,loads,materials,parameters,solution,analysis_type,sub_analysis_type);\n",__FUNCT__);
+        _printf_("   usage: [elements,nodes,vertices,loads,materials,parameters] = %s(elements,nodes,vertices,loads,materials,parameters,vector,name_enum,type_enum);\n",__FUNCT__);
         _printf_("\n");
 }